diff --git a/astrid/common-src/com/todoroo/andlib/widget/DateControlSet.java b/astrid/common-src/com/todoroo/andlib/widget/DateControlSet.java index cb4cdaba4..4a8dabf7a 100644 --- a/astrid/common-src/com/todoroo/andlib/widget/DateControlSet.java +++ b/astrid/common-src/com/todoroo/andlib/widget/DateControlSet.java @@ -22,8 +22,8 @@ package com.todoroo.andlib.widget; import java.text.Format; import java.util.Date; -import android.app.TimePickerDialog; import android.app.DatePickerDialog.OnDateSetListener; +import android.app.TimePickerDialog; import android.app.TimePickerDialog.OnTimeSetListener; import android.content.Context; import android.content.DialogInterface; diff --git a/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterActivity.java b/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterActivity.java index 6b55260f1..e0f9d73a1 100644 --- a/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterActivity.java +++ b/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterActivity.java @@ -1,10 +1,17 @@ package com.todoroo.astrid.core; -import java.util.*; +import java.util.ArrayList; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; import java.util.Map.Entry; import android.app.ListActivity; -import android.content.*; +import android.content.BroadcastReceiver; +import android.content.ContentValues; +import android.content.Context; +import android.content.Intent; import android.content.IntentFilter; import android.content.res.Resources; import android.database.Cursor; @@ -15,9 +22,9 @@ import android.text.Editable; import android.text.TextWatcher; import android.util.Log; import android.view.ContextMenu; +import android.view.ContextMenu.ContextMenuInfo; import android.view.MenuItem; import android.view.View; -import android.view.ContextMenu.ContextMenuInfo; import android.view.View.OnCreateContextMenuListener; import android.widget.Button; import android.widget.TextView; @@ -31,7 +38,12 @@ import com.todoroo.andlib.sql.Criterion; import com.todoroo.andlib.sql.Field; import com.todoroo.andlib.sql.Query; import com.todoroo.astrid.activity.TaskListActivity; -import com.todoroo.astrid.api.*; +import com.todoroo.astrid.api.AstridApiConstants; +import com.todoroo.astrid.api.CustomFilterCriterion; +import com.todoroo.astrid.api.Filter; +import com.todoroo.astrid.api.MultipleSelectCriterion; +import com.todoroo.astrid.api.PermaSql; +import com.todoroo.astrid.api.TextInputCriterion; import com.todoroo.astrid.dao.Database; import com.todoroo.astrid.dao.TaskDao.TaskCriteria; import com.todoroo.astrid.data.Task; diff --git a/astrid/plugin-src/com/todoroo/astrid/core/DefaultsPreferences.java b/astrid/plugin-src/com/todoroo/astrid/core/DefaultsPreferences.java index e2541f004..5205871f9 100644 --- a/astrid/plugin-src/com/todoroo/astrid/core/DefaultsPreferences.java +++ b/astrid/plugin-src/com/todoroo/astrid/core/DefaultsPreferences.java @@ -9,8 +9,8 @@ import android.preference.Preference; import com.timsu.astrid.R; import com.todoroo.andlib.utility.AndroidUtilities; -import com.todoroo.andlib.widget.TodorooPreferences; import com.todoroo.andlib.utility.Preferences; +import com.todoroo.andlib.widget.TodorooPreferences; /** * Displays the preference screen for users to edit their preferences diff --git a/astrid/plugin-src/com/todoroo/astrid/core/SavedFilter.java b/astrid/plugin-src/com/todoroo/astrid/core/SavedFilter.java index 8c4eea207..98003aadc 100644 --- a/astrid/plugin-src/com/todoroo/astrid/core/SavedFilter.java +++ b/astrid/plugin-src/com/todoroo/astrid/core/SavedFilter.java @@ -3,8 +3,8 @@ package com.todoroo.astrid.core; import android.content.ContentValues; import android.text.TextUtils; -import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.data.Property.StringProperty; +import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.sql.Query; import com.todoroo.andlib.utility.AndroidUtilities; import com.todoroo.astrid.api.Filter; diff --git a/astrid/plugin-src/com/todoroo/astrid/gcal/GCalControlSet.java b/astrid/plugin-src/com/todoroo/astrid/gcal/GCalControlSet.java index 3331aa29a..855702021 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gcal/GCalControlSet.java +++ b/astrid/plugin-src/com/todoroo/astrid/gcal/GCalControlSet.java @@ -20,7 +20,6 @@ import android.widget.CompoundButton.OnCheckedChangeListener; import android.widget.Spinner; import android.widget.Toast; -import com.todoroo.astrid.service.StatisticsService; import com.timsu.astrid.R; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.DependencyInjectionService; @@ -29,6 +28,7 @@ import com.todoroo.andlib.utility.DateUtilities; import com.todoroo.astrid.activity.TaskEditActivity.TaskEditControlSet; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.gcal.Calendars.CalendarResult; +import com.todoroo.astrid.service.StatisticsService; /** * Control Set for managing repeats diff --git a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderPreferences.java b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderPreferences.java index dc528f3b9..e7ee0c402 100644 --- a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderPreferences.java +++ b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderPreferences.java @@ -8,8 +8,8 @@ import android.preference.Preference; import com.timsu.astrid.R; import com.todoroo.andlib.utility.AndroidUtilities; -import com.todoroo.andlib.widget.TodorooPreferences; import com.todoroo.andlib.utility.Preferences; +import com.todoroo.andlib.widget.TodorooPreferences; /** * Displays the preference screen for users to edit their preferences diff --git a/astrid/rmilk-src/org/weloveastrid/rmilk/MilkFilterExposer.java b/astrid/rmilk-src/org/weloveastrid/rmilk/MilkFilterExposer.java index 598213e27..5f50da81a 100644 --- a/astrid/rmilk-src/org/weloveastrid/rmilk/MilkFilterExposer.java +++ b/astrid/rmilk-src/org/weloveastrid/rmilk/MilkFilterExposer.java @@ -25,9 +25,9 @@ import com.todoroo.astrid.api.FilterCategory; import com.todoroo.astrid.api.FilterListHeader; import com.todoroo.astrid.api.FilterListItem; import com.todoroo.astrid.data.Metadata; +import com.todoroo.astrid.data.MetadataApiDao.MetadataCriteria; import com.todoroo.astrid.data.StoreObject; import com.todoroo.astrid.data.Task; -import com.todoroo.astrid.data.MetadataApiDao.MetadataCriteria; import com.todoroo.astrid.data.TaskApiDao.TaskCriteria; /** diff --git a/astrid/rmilk-src/org/weloveastrid/rmilk/sync/MilkSyncProvider.java b/astrid/rmilk-src/org/weloveastrid/rmilk/sync/MilkSyncProvider.java index 2b9b9bf94..ba3fbf974 100644 --- a/astrid/rmilk-src/org/weloveastrid/rmilk/sync/MilkSyncProvider.java +++ b/astrid/rmilk-src/org/weloveastrid/rmilk/sync/MilkSyncProvider.java @@ -13,21 +13,21 @@ import java.util.List; import org.weloveastrid.rmilk.MilkBackgroundService; import org.weloveastrid.rmilk.MilkDependencyInjector; import org.weloveastrid.rmilk.MilkLoginActivity; +import org.weloveastrid.rmilk.MilkLoginActivity.SyncLoginCallback; import org.weloveastrid.rmilk.MilkPreferences; import org.weloveastrid.rmilk.MilkUtilities; -import org.weloveastrid.rmilk.MilkLoginActivity.SyncLoginCallback; import org.weloveastrid.rmilk.api.ApplicationInfo; import org.weloveastrid.rmilk.api.ServiceImpl; import org.weloveastrid.rmilk.api.ServiceInternalException; +import org.weloveastrid.rmilk.api.data.RtmAuth.Perms; import org.weloveastrid.rmilk.api.data.RtmList; import org.weloveastrid.rmilk.api.data.RtmLists; import org.weloveastrid.rmilk.api.data.RtmTask; +import org.weloveastrid.rmilk.api.data.RtmTask.Priority; import org.weloveastrid.rmilk.api.data.RtmTaskList; import org.weloveastrid.rmilk.api.data.RtmTaskNote; import org.weloveastrid.rmilk.api.data.RtmTaskSeries; import org.weloveastrid.rmilk.api.data.RtmTasks; -import org.weloveastrid.rmilk.api.data.RtmAuth.Perms; -import org.weloveastrid.rmilk.api.data.RtmTask.Priority; import org.weloveastrid.rmilk.data.MilkListService; import org.weloveastrid.rmilk.data.MilkMetadataService; import org.weloveastrid.rmilk.data.MilkNoteHelper; diff --git a/astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java b/astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java index 766b7295a..c76c3a480 100644 --- a/astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java +++ b/astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java @@ -29,6 +29,7 @@ import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.andlib.service.ExceptionService; import com.todoroo.andlib.sql.Query; import com.todoroo.andlib.utility.DateUtilities; +import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.alarms.AlarmFields; import com.todoroo.astrid.backup.TasksXmlImporter; import com.todoroo.astrid.dao.Database; @@ -42,7 +43,6 @@ import com.todoroo.astrid.legacy.LegacyRepeatInfo; import com.todoroo.astrid.legacy.LegacyTaskModel; import com.todoroo.astrid.legacy.TransitionalAlarm; import com.todoroo.astrid.tags.TagService; -import com.todoroo.andlib.utility.Preferences; @SuppressWarnings("deprecation") public class Astrid2To3UpgradeHelper { diff --git a/astrid/src/com/todoroo/astrid/service/AstridDependencyInjector.java b/astrid/src/com/todoroo/astrid/service/AstridDependencyInjector.java index 9caac97b6..74236a7f4 100644 --- a/astrid/src/com/todoroo/astrid/service/AstridDependencyInjector.java +++ b/astrid/src/com/todoroo/astrid/service/AstridDependencyInjector.java @@ -5,9 +5,9 @@ package com.todoroo.astrid.service; import com.todoroo.andlib.service.AbstractDependencyInjector; import com.todoroo.andlib.service.DependencyInjectionService; -import com.todoroo.andlib.service.HttpRestClient; import com.todoroo.andlib.service.ExceptionService.AndroidLogReporter; import com.todoroo.andlib.service.ExceptionService.ErrorReporter; +import com.todoroo.andlib.service.HttpRestClient; import com.todoroo.astrid.dao.Database; import com.todoroo.astrid.dao.MetadataDao; import com.todoroo.astrid.dao.StoreObjectDao; diff --git a/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java b/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java index fe46aed0e..b3684b87b 100644 --- a/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java +++ b/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java @@ -16,8 +16,8 @@ import android.content.pm.PackageManager.NameNotFoundException; import android.text.TextUtils; import com.timsu.astrid.R; -import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.data.Property.StringProperty; +import com.todoroo.andlib.data.TodorooCursor; import com.todoroo.andlib.service.Autowired; import com.todoroo.andlib.service.ContextManager; import com.todoroo.andlib.service.DependencyInjectionService; diff --git a/astrid/src/com/todoroo/astrid/ui/CalendarDialog.java b/astrid/src/com/todoroo/astrid/ui/CalendarDialog.java index a5fb8da4a..db999cd36 100644 --- a/astrid/src/com/todoroo/astrid/ui/CalendarDialog.java +++ b/astrid/src/com/todoroo/astrid/ui/CalendarDialog.java @@ -5,9 +5,9 @@ import java.util.Date; import android.app.Dialog; import android.content.Context; import android.view.View; -import android.view.Window; import android.view.View.OnClickListener; import android.view.ViewGroup.LayoutParams; +import android.view.Window; import android.widget.Button; import com.timsu.astrid.R; diff --git a/astrid/src/com/todoroo/astrid/ui/NNumberPickerDialog.java b/astrid/src/com/todoroo/astrid/ui/NNumberPickerDialog.java index 3ac68cca8..c8ba2c338 100644 --- a/astrid/src/com/todoroo/astrid/ui/NNumberPickerDialog.java +++ b/astrid/src/com/todoroo/astrid/ui/NNumberPickerDialog.java @@ -29,9 +29,9 @@ import android.content.DialogInterface.OnClickListener; import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; +import android.widget.FrameLayout.LayoutParams; import android.widget.LinearLayout; import android.widget.TextView; -import android.widget.FrameLayout.LayoutParams; import com.timsu.astrid.R;