diff --git a/astrid/src/androidTest/java/com/todoroo/astrid/backup/BackupServiceTests.java b/astrid/src/androidTest/java/com/todoroo/astrid/backup/BackupServiceTests.java index db3577fa7..2384fa596 100644 --- a/astrid/src/androidTest/java/com/todoroo/astrid/backup/BackupServiceTests.java +++ b/astrid/src/androidTest/java/com/todoroo/astrid/backup/BackupServiceTests.java @@ -28,8 +28,7 @@ public class BackupServiceTests extends DatabaseTestCase { File temporaryDirectory = null; - @Autowired - private TaskDao taskDao; + @Autowired private TaskDao taskDao; BackupDirectorySetting setting = new BackupDirectorySetting() { public File getBackupDirectory() { diff --git a/astrid/src/androidTest/java/com/todoroo/astrid/dao/MetadataDaoTests.java b/astrid/src/androidTest/java/com/todoroo/astrid/dao/MetadataDaoTests.java index 7fc5142bd..e50cf3c7a 100644 --- a/astrid/src/androidTest/java/com/todoroo/astrid/dao/MetadataDaoTests.java +++ b/astrid/src/androidTest/java/com/todoroo/astrid/dao/MetadataDaoTests.java @@ -16,11 +16,9 @@ import com.todoroo.astrid.test.DatabaseTestCase; public class MetadataDaoTests extends DatabaseTestCase { - @Autowired - MetadataDao metadataDao; + @Autowired MetadataDao metadataDao; - @Autowired - TaskDao taskDao; + @Autowired TaskDao taskDao; public static Property[] KEYS = new Property[] { Metadata.ID, Metadata.KEY }; diff --git a/astrid/src/androidTest/java/com/todoroo/astrid/dao/TaskDaoTests.java b/astrid/src/androidTest/java/com/todoroo/astrid/dao/TaskDaoTests.java index 192693e26..0e21062c2 100644 --- a/astrid/src/androidTest/java/com/todoroo/astrid/dao/TaskDaoTests.java +++ b/astrid/src/androidTest/java/com/todoroo/astrid/dao/TaskDaoTests.java @@ -22,8 +22,7 @@ public class TaskDaoTests extends DatabaseTestCase { public static Property[] TITLES = new Property[] { Task.ID, Task.TITLE }; - @Autowired - TaskDao taskDao; + @Autowired TaskDao taskDao; /** * Test basic task creation, fetch, and save diff --git a/astrid/src/androidTest/java/com/todoroo/astrid/reminders/NotificationTests.java b/astrid/src/androidTest/java/com/todoroo/astrid/reminders/NotificationTests.java index 69fd29711..c1ca74030 100644 --- a/astrid/src/androidTest/java/com/todoroo/astrid/reminders/NotificationTests.java +++ b/astrid/src/androidTest/java/com/todoroo/astrid/reminders/NotificationTests.java @@ -22,8 +22,7 @@ import static org.tasks.date.DateTimeUtils.newDate; public class NotificationTests extends DatabaseTestCase { - @Autowired - TaskDao taskDao; + @Autowired TaskDao taskDao; public class MutableBoolean { boolean value = false; diff --git a/astrid/src/androidTest/java/com/todoroo/astrid/repeats/NewRepeatTests.java b/astrid/src/androidTest/java/com/todoroo/astrid/repeats/NewRepeatTests.java index dc4061f6b..6ac0720fa 100644 --- a/astrid/src/androidTest/java/com/todoroo/astrid/repeats/NewRepeatTests.java +++ b/astrid/src/androidTest/java/com/todoroo/astrid/repeats/NewRepeatTests.java @@ -35,8 +35,7 @@ import static org.tasks.date.DateTimeUtils.newDate; public class NewRepeatTests extends DatabaseTestCase { - @Autowired - protected TaskDao taskDao; + @Autowired protected TaskDao taskDao; @Override protected void setUp() throws Exception { diff --git a/astrid/src/androidTest/java/com/todoroo/astrid/service/TitleParserTest.java b/astrid/src/androidTest/java/com/todoroo/astrid/service/TitleParserTest.java index a61992b80..03f2e94df 100644 --- a/astrid/src/androidTest/java/com/todoroo/astrid/service/TitleParserTest.java +++ b/astrid/src/androidTest/java/com/todoroo/astrid/service/TitleParserTest.java @@ -24,8 +24,7 @@ import static org.tasks.date.DateTimeUtils.newDate; public class TitleParserTest extends DatabaseTestCase { - @Autowired - TaskService taskService; + @Autowired TaskService taskService; @Override protected void setUp() throws Exception { diff --git a/astrid/src/androidTest/java/com/todoroo/astrid/sync/NewSyncTestCase.java b/astrid/src/androidTest/java/com/todoroo/astrid/sync/NewSyncTestCase.java index 059daa9a6..c80bd5e54 100644 --- a/astrid/src/androidTest/java/com/todoroo/astrid/sync/NewSyncTestCase.java +++ b/astrid/src/androidTest/java/com/todoroo/astrid/sync/NewSyncTestCase.java @@ -8,10 +8,8 @@ import com.todoroo.astrid.data.Task; import com.todoroo.astrid.test.DatabaseTestCase; public class NewSyncTestCase extends DatabaseTestCase { - @Autowired - protected TaskDao taskDao; - @Autowired - protected TagDataDao tagDataDao; + @Autowired protected TaskDao taskDao; + @Autowired protected TagDataDao tagDataDao; @Override protected void setUp() throws Exception { diff --git a/astrid/src/main/java/com/todoroo/astrid/actfm/TagCommentsFragment.java b/astrid/src/main/java/com/todoroo/astrid/actfm/TagCommentsFragment.java index 09fb6cee6..811db406f 100644 --- a/astrid/src/main/java/com/todoroo/astrid/actfm/TagCommentsFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/actfm/TagCommentsFragment.java @@ -24,8 +24,7 @@ public class TagCommentsFragment extends CommentsFragment { private TagData tagData; - @Autowired - private TagDataService tagDataService; + @Autowired private TagDataService tagDataService; public TagCommentsFragment() { super(); diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/AstridActivity.java b/astrid/src/main/java/com/todoroo/astrid/activity/AstridActivity.java index d397de3ac..565aa47b3 100644 --- a/astrid/src/main/java/com/todoroo/astrid/activity/AstridActivity.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/AstridActivity.java @@ -69,8 +69,7 @@ public class AstridActivity extends ActionBarActivity private final RepeatConfirmationReceiver repeatConfirmationReceiver = new RepeatConfirmationReceiver(); - @Autowired - private TaskDao taskDao; + @Autowired private TaskDao taskDao; public FilterListFragment getFilterListFragment() { return (FilterListFragment) getSupportFragmentManager() diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/ShareLinkActivity.java b/astrid/src/main/java/com/todoroo/astrid/activity/ShareLinkActivity.java index f213a8bee..f7fbfb9ac 100644 --- a/astrid/src/main/java/com/todoroo/astrid/activity/ShareLinkActivity.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/ShareLinkActivity.java @@ -19,8 +19,7 @@ import com.todoroo.astrid.ui.QuickAddBar; */ public final class ShareLinkActivity extends TaskListActivity { - @Autowired - private TaskService taskService; + @Autowired private TaskService taskService; private String subject; private boolean handled; diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java index 9e33b94b3..c71cd8ce2 100755 --- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java @@ -167,11 +167,9 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { public static final int TAB_VIEW_UPDATES = 0; - @Autowired - private TaskService taskService; + @Autowired private TaskService taskService; - @Autowired - private TaskAttachmentDao taskAttachmentDao; + @Autowired private TaskAttachmentDao taskAttachmentDao; // --- UI components diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java index 8e98e667c..77742d0be 100644 --- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListActivity.java @@ -56,8 +56,7 @@ import org.tasks.R; public class TaskListActivity extends AstridActivity implements OnPageChangeListener { - @Autowired - TagDataDao tagDataDao; + @Autowired TagDataDao tagDataDao; MenuDrawer menuDrawer; diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java index 236ec65d4..9428773e8 100644 --- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java @@ -142,8 +142,7 @@ public class TaskListFragment extends ListFragment implements OnSortSelectedList // --- instance variables - @Autowired - protected TaskService taskService; + @Autowired protected TaskService taskService; @Autowired UpgradeService upgradeService; diff --git a/astrid/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java b/astrid/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java index bb92e95bf..c11a0dc2a 100644 --- a/astrid/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java +++ b/astrid/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java @@ -62,11 +62,9 @@ public class FilterAdapter extends ArrayAdapter { // --- instance variables - @Autowired - private TaskService taskService; + @Autowired private TaskService taskService; - @Autowired - private FilterCounter filterCounter; + @Autowired private FilterCounter filterCounter; /** parent activity */ protected final Activity activity; diff --git a/astrid/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java b/astrid/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java index e79771af3..8ae283c8a 100644 --- a/astrid/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java +++ b/astrid/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java @@ -175,8 +175,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable { // --- instance variables - @Autowired - protected TaskService taskService; + @Autowired protected TaskService taskService; protected final Context context; protected final TaskListFragment fragment; diff --git a/astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlExporter.java b/astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlExporter.java index c71dcb2c8..0395c89c4 100644 --- a/astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlExporter.java +++ b/astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlExporter.java @@ -67,8 +67,7 @@ public class TasksXmlExporter { // --- implementation - @Autowired - TagDataService tagDataService; + @Autowired TagDataService tagDataService; // 3 is started on Version 4.6.10 private static final int FORMAT = 3; diff --git a/astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java b/astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java index 19db5890a..0f7e38e49 100644 --- a/astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java +++ b/astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java @@ -70,8 +70,7 @@ public class TasksXmlImporter { // --- implementation - @Autowired - TagDataService tagDataService; + @Autowired TagDataService tagDataService; private final Handler handler; private int taskCount; diff --git a/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java b/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java index 9918440e6..3e20e89a8 100644 --- a/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java +++ b/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java @@ -145,11 +145,9 @@ public class CustomFilterActivity extends ActionBarActivity { // --- activity - @Autowired - Database database; + @Autowired Database database; - @Autowired - StoreObjectDao storeObjectDao; + @Autowired StoreObjectDao storeObjectDao; @Override protected void onCreate(Bundle savedInstanceState) { diff --git a/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java b/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java index 686f253e6..6f14b7189 100644 --- a/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java +++ b/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java @@ -49,8 +49,7 @@ public final class CustomFilterExposer extends BroadcastReceiver implements Astr private static final String TOKEN_FILTER_ID = "id"; //$NON-NLS-1$ private static final String TOKEN_FILTER_NAME = "name"; //$NON-NLS-1$ - @Autowired - StoreObjectDao storeObjectDao; + @Autowired StoreObjectDao storeObjectDao; public CustomFilterExposer() { DependencyInjectionService.getInstance().inject(this); @@ -127,8 +126,7 @@ public final class CustomFilterExposer extends BroadcastReceiver implements Astr */ public static class DeleteActivity extends Activity { - @Autowired - StoreObjectDao storeObjectDao; + @Autowired StoreObjectDao storeObjectDao; @Override protected void onCreate(Bundle savedInstanceState) { diff --git a/astrid/src/main/java/com/todoroo/astrid/core/PluginServices.java b/astrid/src/main/java/com/todoroo/astrid/core/PluginServices.java index 9309f3851..8954fe7c9 100644 --- a/astrid/src/main/java/com/todoroo/astrid/core/PluginServices.java +++ b/astrid/src/main/java/com/todoroo/astrid/core/PluginServices.java @@ -20,14 +20,11 @@ import com.todoroo.astrid.service.TaskService; */ public final class PluginServices { - @Autowired - TaskService taskService; + @Autowired TaskService taskService; - @Autowired - Database database; + @Autowired Database database; - @Autowired - MetadataService metadataService; + @Autowired MetadataService metadataService; private static volatile PluginServices instance; diff --git a/astrid/src/main/java/com/todoroo/astrid/files/FilesControlSet.java b/astrid/src/main/java/com/todoroo/astrid/files/FilesControlSet.java index 0351afd4a..e4fc936d3 100644 --- a/astrid/src/main/java/com/todoroo/astrid/files/FilesControlSet.java +++ b/astrid/src/main/java/com/todoroo/astrid/files/FilesControlSet.java @@ -49,8 +49,7 @@ import java.util.ArrayList; public class FilesControlSet extends PopupControlSet { - @Autowired - private TaskAttachmentDao taskAttachmentDao; + @Autowired private TaskAttachmentDao taskAttachmentDao; private final ArrayList files = new ArrayList<>(); private final LinearLayout fileDisplayList; diff --git a/astrid/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmListCreator.java b/astrid/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmListCreator.java index fda660fd1..1d644ce78 100644 --- a/astrid/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmListCreator.java +++ b/astrid/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmListCreator.java @@ -29,8 +29,7 @@ public class CalendarAlarmListCreator extends Activity { public static final String TOKEN_LIST_NAME = "listName"; //$NON-NLS-1$ - @Autowired - private TagDataService tagDataService; + @Autowired private TagDataService tagDataService; private ArrayList names; private ArrayList emails; diff --git a/astrid/src/main/java/com/todoroo/astrid/gcal/CalendarReminderActivity.java b/astrid/src/main/java/com/todoroo/astrid/gcal/CalendarReminderActivity.java index f72dacbbb..68252d507 100644 --- a/astrid/src/main/java/com/todoroo/astrid/gcal/CalendarReminderActivity.java +++ b/astrid/src/main/java/com/todoroo/astrid/gcal/CalendarReminderActivity.java @@ -48,8 +48,7 @@ public class CalendarReminderActivity extends Activity { // Prompt user to ignore all missed calls after this many ignore presses private static final int IGNORE_PROMPT_COUNT = 3; - @Autowired - private TagDataService tagDataService; + @Autowired private TagDataService tagDataService; private String eventName; private long startTime; diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListService.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListService.java index 53933b2af..8100f9160 100644 --- a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListService.java +++ b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListService.java @@ -23,8 +23,7 @@ public class GtasksListService { public static final String LIST_NOT_FOUND = null; public static final StoreObject LIST_NOT_FOUND_OBJECT = null; - @Autowired - private StoreObjectDao storeObjectDao; + @Autowired private StoreObjectDao storeObjectDao; private StoreObject[] lists = null; diff --git a/astrid/src/main/java/com/todoroo/astrid/provider/Astrid2TaskProvider.java b/astrid/src/main/java/com/todoroo/astrid/provider/Astrid2TaskProvider.java index 60f82139b..64fdcad31 100644 --- a/astrid/src/main/java/com/todoroo/astrid/provider/Astrid2TaskProvider.java +++ b/astrid/src/main/java/com/todoroo/astrid/provider/Astrid2TaskProvider.java @@ -79,8 +79,7 @@ public class Astrid2TaskProvider extends ContentProvider { private static final String TAG_SEPARATOR = "|"; - @Autowired - private TaskService taskService; + @Autowired private TaskService taskService; private static Context ctx = null; diff --git a/astrid/src/main/java/com/todoroo/astrid/provider/Astrid3ContentProvider.java b/astrid/src/main/java/com/todoroo/astrid/provider/Astrid3ContentProvider.java index f3129fe84..508259a26 100644 --- a/astrid/src/main/java/com/todoroo/astrid/provider/Astrid3ContentProvider.java +++ b/astrid/src/main/java/com/todoroo/astrid/provider/Astrid3ContentProvider.java @@ -81,20 +81,15 @@ public class Astrid3ContentProvider extends ContentProvider { // --- instance variables - @Autowired - private Database database; + @Autowired private Database database; - @Autowired - private TaskDao taskDao; + @Autowired private TaskDao taskDao; - @Autowired - private MetadataDao metadataDao; + @Autowired private MetadataDao metadataDao; - @Autowired - private StoreObjectDao storeObjectDao; + @Autowired private StoreObjectDao storeObjectDao; - @Autowired - private UserActivityDao userActivityDao; + @Autowired private UserActivityDao userActivityDao; @Override public boolean onCreate() { diff --git a/astrid/src/main/java/com/todoroo/astrid/provider/SqlContentProvider.java b/astrid/src/main/java/com/todoroo/astrid/provider/SqlContentProvider.java index 7c4e94f0c..3c79e095d 100644 --- a/astrid/src/main/java/com/todoroo/astrid/provider/SqlContentProvider.java +++ b/astrid/src/main/java/com/todoroo/astrid/provider/SqlContentProvider.java @@ -40,8 +40,7 @@ public class SqlContentProvider extends ContentProvider { "sql", 0); } - @Autowired - private Database database; + @Autowired private Database database; @Override public boolean onCreate() { diff --git a/astrid/src/main/java/com/todoroo/astrid/reminders/Notifications.java b/astrid/src/main/java/com/todoroo/astrid/reminders/Notifications.java index 798ca53bd..49e1007e2 100644 --- a/astrid/src/main/java/com/todoroo/astrid/reminders/Notifications.java +++ b/astrid/src/main/java/com/todoroo/astrid/reminders/Notifications.java @@ -81,8 +81,7 @@ public class Notifications extends BroadcastReceiver { // --- instance variables - @Autowired - private TaskDao taskDao; + @Autowired private TaskDao taskDao; public static NotificationManager notificationManager = null; private static boolean forceNotificationManager = false; diff --git a/astrid/src/main/java/com/todoroo/astrid/reminders/ReminderDialog.java b/astrid/src/main/java/com/todoroo/astrid/reminders/ReminderDialog.java index d31fe7847..797c29ce9 100644 --- a/astrid/src/main/java/com/todoroo/astrid/reminders/ReminderDialog.java +++ b/astrid/src/main/java/com/todoroo/astrid/reminders/ReminderDialog.java @@ -37,8 +37,7 @@ import static org.tasks.date.DateTimeUtils.newDate; */ public class ReminderDialog extends Dialog { - @Autowired - private TaskService taskService; + @Autowired private TaskService taskService; public ReminderDialog(final AstridActivity activity, final long taskId, String title) { diff --git a/astrid/src/main/java/com/todoroo/astrid/reminders/ReminderSchedulingService.java b/astrid/src/main/java/com/todoroo/astrid/reminders/ReminderSchedulingService.java index bb13196c0..5bf000b8a 100644 --- a/astrid/src/main/java/com/todoroo/astrid/reminders/ReminderSchedulingService.java +++ b/astrid/src/main/java/com/todoroo/astrid/reminders/ReminderSchedulingService.java @@ -26,8 +26,7 @@ import org.tasks.scheduling.RefreshScheduler; */ public class ReminderSchedulingService extends Service { - @Autowired - private RefreshScheduler refreshScheduler; + @Autowired private RefreshScheduler refreshScheduler; public ReminderSchedulingService() { DependencyInjectionService.getInstance().inject(this); diff --git a/astrid/src/main/java/com/todoroo/astrid/reminders/ReminderService.java b/astrid/src/main/java/com/todoroo/astrid/reminders/ReminderService.java index 05df45cbe..619d5d2aa 100644 --- a/astrid/src/main/java/com/todoroo/astrid/reminders/ReminderService.java +++ b/astrid/src/main/java/com/todoroo/astrid/reminders/ReminderService.java @@ -74,8 +74,7 @@ public final class ReminderService { // --- instance variables - @Autowired - private TaskDao taskDao; + @Autowired private TaskDao taskDao; private AlarmScheduler scheduler = new ReminderAlarmScheduler(); diff --git a/astrid/src/main/java/com/todoroo/astrid/service/GlobalEventReceiver.java b/astrid/src/main/java/com/todoroo/astrid/service/GlobalEventReceiver.java index c3fb7797a..bc8b052e0 100644 --- a/astrid/src/main/java/com/todoroo/astrid/service/GlobalEventReceiver.java +++ b/astrid/src/main/java/com/todoroo/astrid/service/GlobalEventReceiver.java @@ -28,8 +28,7 @@ public final class GlobalEventReceiver extends BroadcastReceiver { AstridDependencyInjector.initialize(); } - @Autowired - private TaskService taskService; + @Autowired private TaskService taskService; @Override public void onReceive(Context context, Intent intent) { diff --git a/astrid/src/main/java/com/todoroo/astrid/service/UpgradeService.java b/astrid/src/main/java/com/todoroo/astrid/service/UpgradeService.java index 2298eb9bb..4784ecf61 100644 --- a/astrid/src/main/java/com/todoroo/astrid/service/UpgradeService.java +++ b/astrid/src/main/java/com/todoroo/astrid/service/UpgradeService.java @@ -44,8 +44,7 @@ public final class UpgradeService { } public static class UpgradeActivity extends Activity { - @Autowired - private TaskService taskService; + @Autowired private TaskService taskService; private ProgressDialog dialog; public static final String TOKEN_FROM_VERSION = "from_version"; //$NON-NLS-1$ diff --git a/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListUpdater.java b/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListUpdater.java index 2a49b4995..89f9bd676 100644 --- a/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListUpdater.java +++ b/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListUpdater.java @@ -21,8 +21,7 @@ import java.util.Set; public abstract class AstridOrderedListUpdater { - @Autowired - private TaskService taskService; + @Autowired private TaskService taskService; public AstridOrderedListUpdater() { DependencyInjectionService.getInstance().inject(this); diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java b/astrid/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java index e0c8ba332..9b97f91ca 100644 --- a/astrid/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java +++ b/astrid/src/main/java/com/todoroo/astrid/ui/EditTitleControlSet.java @@ -41,8 +41,7 @@ public class EditTitleControlSet extends TaskEditControlSet implements Importanc private boolean isRepeating; private int importanceValue; - @Autowired - private TaskService taskService; + @Autowired private TaskService taskService; public EditTitleControlSet(Activity activity, int layout, int editText) { super(activity, layout); diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/QuickAddBar.java b/astrid/src/main/java/com/todoroo/astrid/ui/QuickAddBar.java index c61c184fa..55029c59c 100644 --- a/astrid/src/main/java/com/todoroo/astrid/ui/QuickAddBar.java +++ b/astrid/src/main/java/com/todoroo/astrid/ui/QuickAddBar.java @@ -72,8 +72,7 @@ public class QuickAddBar extends LinearLayout { private RepeatControlSet repeatControl; private GCalControlSet gcalControl; - @Autowired - private TaskAttachmentDao taskAttachmentDao; + @Autowired private TaskAttachmentDao taskAttachmentDao; private VoiceRecognizer voiceRecognizer; diff --git a/astrid/src/main/java/com/todoroo/astrid/utility/SyncMetadataService.java b/astrid/src/main/java/com/todoroo/astrid/utility/SyncMetadataService.java index 0d9f1d57f..0e157f77a 100644 --- a/astrid/src/main/java/com/todoroo/astrid/utility/SyncMetadataService.java +++ b/astrid/src/main/java/com/todoroo/astrid/utility/SyncMetadataService.java @@ -27,10 +27,8 @@ abstract public class SyncMetadataService { // --- instance variables - @Autowired - protected TaskDao taskDao; - @Autowired - protected MetadataDao metadataDao; + @Autowired protected TaskDao taskDao; + @Autowired protected MetadataDao metadataDao; // --- abstract methods diff --git a/astrid/src/main/java/com/todoroo/astrid/widget/TasksWidget.java b/astrid/src/main/java/com/todoroo/astrid/widget/TasksWidget.java index 3baa75f8d..0ac3c53fa 100644 --- a/astrid/src/main/java/com/todoroo/astrid/widget/TasksWidget.java +++ b/astrid/src/main/java/com/todoroo/astrid/widget/TasksWidget.java @@ -37,8 +37,7 @@ public class TasksWidget extends AppWidgetProvider { AstridDependencyInjector.initialize(); } - @Autowired - private TaskService taskService; + @Autowired private TaskService taskService; public static final String COMPLETE_TASK = "COMPLETE_TASK"; public static final String EDIT_TASK = "EDIT_TASK"; diff --git a/astrid/src/main/java/com/todoroo/astrid/widget/WidgetUpdateService.java b/astrid/src/main/java/com/todoroo/astrid/widget/WidgetUpdateService.java index 3ea8834d0..ded3165d3 100644 --- a/astrid/src/main/java/com/todoroo/astrid/widget/WidgetUpdateService.java +++ b/astrid/src/main/java/com/todoroo/astrid/widget/WidgetUpdateService.java @@ -46,17 +46,13 @@ public class WidgetUpdateService extends Service { public static final String EXTRA_WIDGET_ID = "widget_id"; //$NON-NLS-1$ - @Autowired - Database database; + @Autowired Database database; - @Autowired - TaskService taskService; + @Autowired TaskService taskService; - @Autowired - TaskListMetadataDao taskListMetadataDao; + @Autowired TaskListMetadataDao taskListMetadataDao; - @Autowired - TagDataService tagDataService; + @Autowired TagDataService tagDataService; private final WidgetHelper widgetHelper = new WidgetHelper(); diff --git a/astrid/src/main/java/org/tasks/voice/VoiceCommandActivity.java b/astrid/src/main/java/org/tasks/voice/VoiceCommandActivity.java index 36cd69889..1905a48ca 100644 --- a/astrid/src/main/java/org/tasks/voice/VoiceCommandActivity.java +++ b/astrid/src/main/java/org/tasks/voice/VoiceCommandActivity.java @@ -15,8 +15,7 @@ import org.tasks.R; public class VoiceCommandActivity extends Activity { - @Autowired - TaskService taskService; + @Autowired TaskService taskService; public VoiceCommandActivity() { DependencyInjectionService.getInstance().inject(this); diff --git a/astrid/src/main/java/org/tasks/widget/ScrollableViewsFactory.java b/astrid/src/main/java/org/tasks/widget/ScrollableViewsFactory.java index 3eda3ac1c..09fa36f88 100644 --- a/astrid/src/main/java/org/tasks/widget/ScrollableViewsFactory.java +++ b/astrid/src/main/java/org/tasks/widget/ScrollableViewsFactory.java @@ -40,17 +40,13 @@ import org.tasks.R; @TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH) public class ScrollableViewsFactory implements RemoteViewsService.RemoteViewsFactory { - @Autowired - Database database; + @Autowired Database database; - @Autowired - TaskService taskService; + @Autowired TaskService taskService; - @Autowired - TaskListMetadataDao taskListMetadataDao; + @Autowired TaskListMetadataDao taskListMetadataDao; - @Autowired - TagDataService tagDataService; + @Autowired TagDataService tagDataService; private final Context context; private final Filter filter; diff --git a/astrid/src/main/java/org/tasks/widget/WidgetHelper.java b/astrid/src/main/java/org/tasks/widget/WidgetHelper.java index d5f625337..a5e5ab783 100644 --- a/astrid/src/main/java/org/tasks/widget/WidgetHelper.java +++ b/astrid/src/main/java/org/tasks/widget/WidgetHelper.java @@ -73,8 +73,7 @@ public class WidgetHelper { context.sendBroadcast(intent); } - @Autowired - TagDataService tagDataService; + @Autowired TagDataService tagDataService; public WidgetHelper() { DependencyInjectionService.getInstance().inject(this); diff --git a/astrid/src/test/java/com/todoroo/andlib/service/DependencyInjectionTest.java b/astrid/src/test/java/com/todoroo/andlib/service/DependencyInjectionTest.java index e7a9030d6..fc9e2080b 100644 --- a/astrid/src/test/java/com/todoroo/andlib/service/DependencyInjectionTest.java +++ b/astrid/src/test/java/com/todoroo/andlib/service/DependencyInjectionTest.java @@ -43,8 +43,7 @@ public class DependencyInjectionTest { // test various permissions Object test = new Object() { - @Autowired - public String foo; + @Autowired public String foo; @Override public String toString() { @@ -55,8 +54,7 @@ public class DependencyInjectionTest { assertEquals("bar", test.toString()); test = new Object() { - @Autowired - String foo; + @Autowired String foo; @Override public String toString() { @@ -67,8 +65,7 @@ public class DependencyInjectionTest { assertEquals("bar", test.toString()); test = new Object() { - @Autowired - protected String foo; + @Autowired protected String foo; @Override public String toString() { @@ -79,8 +76,7 @@ public class DependencyInjectionTest { assertEquals("bar", test.toString()); test = new Object() { - @Autowired - private String foo; + @Autowired private String foo; @Override public String toString() { @@ -127,8 +123,7 @@ public class DependencyInjectionTest { }); Object test = new Object() { - @Autowired - public String foo; + @Autowired public String foo; @Override public String toString() { @@ -139,8 +134,7 @@ public class DependencyInjectionTest { assertEquals("bar", test.toString()); test = new Object() { - @Autowired - public String forks; + @Autowired public String forks; @Override public String toString() { @@ -167,8 +161,7 @@ public class DependencyInjectionTest { ); Object test = new Object() { - @Autowired - public String foo; + @Autowired public String foo; @Override public String toString() { @@ -202,8 +195,7 @@ public class DependencyInjectionTest { ); Object test1 = new Object() { - @Autowired - public String foo; + @Autowired public String foo; @Override public String toString() { @@ -211,8 +203,7 @@ public class DependencyInjectionTest { } }; Object test2 = new Object() { - @Autowired - public String foo; + @Autowired public String foo; @Override public String toString() { @@ -226,13 +217,11 @@ public class DependencyInjectionTest { } public static class ParentInjectee { - @Autowired - protected String foo; + @Autowired protected String foo; } public static class ChildInjectee extends ParentInjectee { - @Autowired - protected String bar; + @Autowired protected String bar; } @Test diff --git a/astrid/src/test/java/com/todoroo/astrid/gtasks/GtasksDetailExposerTest.java b/astrid/src/test/java/com/todoroo/astrid/gtasks/GtasksDetailExposerTest.java index d7d6b0c29..6e8ea5f41 100644 --- a/astrid/src/test/java/com/todoroo/astrid/gtasks/GtasksDetailExposerTest.java +++ b/astrid/src/test/java/com/todoroo/astrid/gtasks/GtasksDetailExposerTest.java @@ -27,8 +27,7 @@ public class GtasksDetailExposerTest extends TodorooRobolectricTestCase { private Context context; private RobolectricGtasksPreferenceService gtasksPreferenceService; - @Autowired - private GtasksListService gtasksListService; + @Autowired private GtasksListService gtasksListService; @Override public void before() { diff --git a/astrid/src/test/java/com/todoroo/astrid/reminders/NotifyAtDeadlineTest.java b/astrid/src/test/java/com/todoroo/astrid/reminders/NotifyAtDeadlineTest.java index a6a9dffb0..0bfd1b206 100644 --- a/astrid/src/test/java/com/todoroo/astrid/reminders/NotifyAtDeadlineTest.java +++ b/astrid/src/test/java/com/todoroo/astrid/reminders/NotifyAtDeadlineTest.java @@ -30,8 +30,7 @@ public class NotifyAtDeadlineTest extends TodorooRobolectricTestCase { @SuppressLint("NewApi") private static final int MILLIS_PER_HOUR = (int) TimeUnit.HOURS.toMillis(1); - @Autowired - private TaskDao taskDao; + @Autowired private TaskDao taskDao; private ReminderService service; diff --git a/astrid/src/test/java/com/todoroo/astrid/reminders/ReminderServiceTest.java b/astrid/src/test/java/com/todoroo/astrid/reminders/ReminderServiceTest.java index e57f62517..cf70fb683 100644 --- a/astrid/src/test/java/com/todoroo/astrid/reminders/ReminderServiceTest.java +++ b/astrid/src/test/java/com/todoroo/astrid/reminders/ReminderServiceTest.java @@ -30,8 +30,7 @@ public class ReminderServiceTest extends TodorooRobolectricTestCase { ReminderService service; - @Autowired - TaskDao taskDao; + @Autowired TaskDao taskDao; @Override public void before() { diff --git a/astrid/src/test/java/com/todoroo/astrid/service/AstridDependencyInjectorTest.java b/astrid/src/test/java/com/todoroo/astrid/service/AstridDependencyInjectorTest.java index a0b5305c6..8fd3934e3 100644 --- a/astrid/src/test/java/com/todoroo/astrid/service/AstridDependencyInjectorTest.java +++ b/astrid/src/test/java/com/todoroo/astrid/service/AstridDependencyInjectorTest.java @@ -35,8 +35,7 @@ public class AstridDependencyInjectorTest { @Test public void testWithString() { Helper helper = new Helper() { - @Autowired - public String applicationName; + @Autowired public String applicationName; @Override public Object getObject() { @@ -52,8 +51,7 @@ public class AstridDependencyInjectorTest { public void testWithClass() { Helper helper = new Helper() { - @Autowired - public TaskService taskService; + @Autowired public TaskService taskService; @Override public Object getObject() { @@ -65,8 +63,7 @@ public class AstridDependencyInjectorTest { assertTrue(helper.getObject() instanceof TaskService); Helper helper2 = new Helper() { - @Autowired - public TaskService taskService; + @Autowired public TaskService taskService; @Override public Object getObject() { diff --git a/tests-sync/src/com/todoroo/astrid/sync/repeats/AbstractSyncRepeatTests.java b/tests-sync/src/com/todoroo/astrid/sync/repeats/AbstractSyncRepeatTests.java index 58651c5f9..f9efada4a 100644 --- a/tests-sync/src/com/todoroo/astrid/sync/repeats/AbstractSyncRepeatTests.java +++ b/tests-sync/src/com/todoroo/astrid/sync/repeats/AbstractSyncRepeatTests.java @@ -34,11 +34,9 @@ import com.todoroo.astrid.utility.Flags; abstract public class AbstractSyncRepeatTests extends DatabaseTestCase { - @Autowired - protected TaskDao taskDao; + @Autowired protected TaskDao taskDao; - @Autowired - protected MetadataDao metadataDao; + @Autowired protected MetadataDao metadataDao; @Override protected void setUp() throws Exception {