Format @Autowired for easier searching

pull/143/head
Alex Baker 10 years ago
parent 255093d50b
commit 82ecf5545b

@ -28,8 +28,7 @@ public class BackupServiceTests extends DatabaseTestCase {
File temporaryDirectory = null; File temporaryDirectory = null;
@Autowired @Autowired private TaskDao taskDao;
private TaskDao taskDao;
BackupDirectorySetting setting = new BackupDirectorySetting() { BackupDirectorySetting setting = new BackupDirectorySetting() {
public File getBackupDirectory() { public File getBackupDirectory() {

@ -16,11 +16,9 @@ import com.todoroo.astrid.test.DatabaseTestCase;
public class MetadataDaoTests extends DatabaseTestCase { public class MetadataDaoTests extends DatabaseTestCase {
@Autowired @Autowired MetadataDao metadataDao;
MetadataDao metadataDao;
@Autowired @Autowired TaskDao taskDao;
TaskDao taskDao;
public static Property<?>[] KEYS = new Property<?>[] { Metadata.ID, public static Property<?>[] KEYS = new Property<?>[] { Metadata.ID,
Metadata.KEY }; Metadata.KEY };

@ -22,8 +22,7 @@ public class TaskDaoTests extends DatabaseTestCase {
public static Property<?>[] TITLES = new Property<?>[] { Task.ID, public static Property<?>[] TITLES = new Property<?>[] { Task.ID,
Task.TITLE }; Task.TITLE };
@Autowired @Autowired TaskDao taskDao;
TaskDao taskDao;
/** /**
* Test basic task creation, fetch, and save * Test basic task creation, fetch, and save

@ -22,8 +22,7 @@ import static org.tasks.date.DateTimeUtils.newDate;
public class NotificationTests extends DatabaseTestCase { public class NotificationTests extends DatabaseTestCase {
@Autowired @Autowired TaskDao taskDao;
TaskDao taskDao;
public class MutableBoolean { public class MutableBoolean {
boolean value = false; boolean value = false;

@ -35,8 +35,7 @@ import static org.tasks.date.DateTimeUtils.newDate;
public class NewRepeatTests<REMOTE_MODEL> extends DatabaseTestCase { public class NewRepeatTests<REMOTE_MODEL> extends DatabaseTestCase {
@Autowired @Autowired protected TaskDao taskDao;
protected TaskDao taskDao;
@Override @Override
protected void setUp() throws Exception { protected void setUp() throws Exception {

@ -24,8 +24,7 @@ import static org.tasks.date.DateTimeUtils.newDate;
public class TitleParserTest extends DatabaseTestCase { public class TitleParserTest extends DatabaseTestCase {
@Autowired @Autowired TaskService taskService;
TaskService taskService;
@Override @Override
protected void setUp() throws Exception { protected void setUp() throws Exception {

@ -8,10 +8,8 @@ import com.todoroo.astrid.data.Task;
import com.todoroo.astrid.test.DatabaseTestCase; import com.todoroo.astrid.test.DatabaseTestCase;
public class NewSyncTestCase extends DatabaseTestCase { public class NewSyncTestCase extends DatabaseTestCase {
@Autowired @Autowired protected TaskDao taskDao;
protected TaskDao taskDao; @Autowired protected TagDataDao tagDataDao;
@Autowired
protected TagDataDao tagDataDao;
@Override @Override
protected void setUp() throws Exception { protected void setUp() throws Exception {

@ -24,8 +24,7 @@ public class TagCommentsFragment extends CommentsFragment {
private TagData tagData; private TagData tagData;
@Autowired @Autowired private TagDataService tagDataService;
private TagDataService tagDataService;
public TagCommentsFragment() { public TagCommentsFragment() {
super(); super();

@ -69,8 +69,7 @@ public class AstridActivity extends ActionBarActivity
private final RepeatConfirmationReceiver repeatConfirmationReceiver = new RepeatConfirmationReceiver(); private final RepeatConfirmationReceiver repeatConfirmationReceiver = new RepeatConfirmationReceiver();
@Autowired @Autowired private TaskDao taskDao;
private TaskDao taskDao;
public FilterListFragment getFilterListFragment() { public FilterListFragment getFilterListFragment() {
return (FilterListFragment) getSupportFragmentManager() return (FilterListFragment) getSupportFragmentManager()

@ -19,8 +19,7 @@ import com.todoroo.astrid.ui.QuickAddBar;
*/ */
public final class ShareLinkActivity extends TaskListActivity { public final class ShareLinkActivity extends TaskListActivity {
@Autowired @Autowired private TaskService taskService;
private TaskService taskService;
private String subject; private String subject;
private boolean handled; private boolean handled;

@ -167,11 +167,9 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
public static final int TAB_VIEW_UPDATES = 0; public static final int TAB_VIEW_UPDATES = 0;
@Autowired @Autowired private TaskService taskService;
private TaskService taskService;
@Autowired @Autowired private TaskAttachmentDao taskAttachmentDao;
private TaskAttachmentDao taskAttachmentDao;
// --- UI components // --- UI components

@ -56,8 +56,7 @@ import org.tasks.R;
public class TaskListActivity extends AstridActivity implements OnPageChangeListener { public class TaskListActivity extends AstridActivity implements OnPageChangeListener {
@Autowired @Autowired TagDataDao tagDataDao;
TagDataDao tagDataDao;
MenuDrawer menuDrawer; MenuDrawer menuDrawer;

@ -142,8 +142,7 @@ public class TaskListFragment extends ListFragment implements OnSortSelectedList
// --- instance variables // --- instance variables
@Autowired @Autowired protected TaskService taskService;
protected TaskService taskService;
@Autowired UpgradeService upgradeService; @Autowired UpgradeService upgradeService;

@ -62,11 +62,9 @@ public class FilterAdapter extends ArrayAdapter<Filter> {
// --- instance variables // --- instance variables
@Autowired @Autowired private TaskService taskService;
private TaskService taskService;
@Autowired @Autowired private FilterCounter filterCounter;
private FilterCounter filterCounter;
/** parent activity */ /** parent activity */
protected final Activity activity; protected final Activity activity;

@ -175,8 +175,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
// --- instance variables // --- instance variables
@Autowired @Autowired protected TaskService taskService;
protected TaskService taskService;
protected final Context context; protected final Context context;
protected final TaskListFragment fragment; protected final TaskListFragment fragment;

@ -67,8 +67,7 @@ public class TasksXmlExporter {
// --- implementation // --- implementation
@Autowired @Autowired TagDataService tagDataService;
TagDataService tagDataService;
// 3 is started on Version 4.6.10 // 3 is started on Version 4.6.10
private static final int FORMAT = 3; private static final int FORMAT = 3;

@ -70,8 +70,7 @@ public class TasksXmlImporter {
// --- implementation // --- implementation
@Autowired @Autowired TagDataService tagDataService;
TagDataService tagDataService;
private final Handler handler; private final Handler handler;
private int taskCount; private int taskCount;

@ -145,11 +145,9 @@ public class CustomFilterActivity extends ActionBarActivity {
// --- activity // --- activity
@Autowired @Autowired Database database;
Database database;
@Autowired @Autowired StoreObjectDao storeObjectDao;
StoreObjectDao storeObjectDao;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {

@ -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_ID = "id"; //$NON-NLS-1$
private static final String TOKEN_FILTER_NAME = "name"; //$NON-NLS-1$ private static final String TOKEN_FILTER_NAME = "name"; //$NON-NLS-1$
@Autowired @Autowired StoreObjectDao storeObjectDao;
StoreObjectDao storeObjectDao;
public CustomFilterExposer() { public CustomFilterExposer() {
DependencyInjectionService.getInstance().inject(this); DependencyInjectionService.getInstance().inject(this);
@ -127,8 +126,7 @@ public final class CustomFilterExposer extends BroadcastReceiver implements Astr
*/ */
public static class DeleteActivity extends Activity { public static class DeleteActivity extends Activity {
@Autowired @Autowired StoreObjectDao storeObjectDao;
StoreObjectDao storeObjectDao;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {

@ -20,14 +20,11 @@ import com.todoroo.astrid.service.TaskService;
*/ */
public final class PluginServices { public final class PluginServices {
@Autowired @Autowired TaskService taskService;
TaskService taskService;
@Autowired @Autowired Database database;
Database database;
@Autowired @Autowired MetadataService metadataService;
MetadataService metadataService;
private static volatile PluginServices instance; private static volatile PluginServices instance;

@ -49,8 +49,7 @@ import java.util.ArrayList;
public class FilesControlSet extends PopupControlSet { public class FilesControlSet extends PopupControlSet {
@Autowired @Autowired private TaskAttachmentDao taskAttachmentDao;
private TaskAttachmentDao taskAttachmentDao;
private final ArrayList<TaskAttachment> files = new ArrayList<>(); private final ArrayList<TaskAttachment> files = new ArrayList<>();
private final LinearLayout fileDisplayList; private final LinearLayout fileDisplayList;

@ -29,8 +29,7 @@ public class CalendarAlarmListCreator extends Activity {
public static final String TOKEN_LIST_NAME = "listName"; //$NON-NLS-1$ public static final String TOKEN_LIST_NAME = "listName"; //$NON-NLS-1$
@Autowired @Autowired private TagDataService tagDataService;
private TagDataService tagDataService;
private ArrayList<String> names; private ArrayList<String> names;
private ArrayList<String> emails; private ArrayList<String> emails;

@ -48,8 +48,7 @@ public class CalendarReminderActivity extends Activity {
// Prompt user to ignore all missed calls after this many ignore presses // Prompt user to ignore all missed calls after this many ignore presses
private static final int IGNORE_PROMPT_COUNT = 3; private static final int IGNORE_PROMPT_COUNT = 3;
@Autowired @Autowired private TagDataService tagDataService;
private TagDataService tagDataService;
private String eventName; private String eventName;
private long startTime; private long startTime;

@ -23,8 +23,7 @@ public class GtasksListService {
public static final String LIST_NOT_FOUND = null; public static final String LIST_NOT_FOUND = null;
public static final StoreObject LIST_NOT_FOUND_OBJECT = null; public static final StoreObject LIST_NOT_FOUND_OBJECT = null;
@Autowired @Autowired private StoreObjectDao storeObjectDao;
private StoreObjectDao storeObjectDao;
private StoreObject[] lists = null; private StoreObject[] lists = null;

@ -79,8 +79,7 @@ public class Astrid2TaskProvider extends ContentProvider {
private static final String TAG_SEPARATOR = "|"; private static final String TAG_SEPARATOR = "|";
@Autowired @Autowired private TaskService taskService;
private TaskService taskService;
private static Context ctx = null; private static Context ctx = null;

@ -81,20 +81,15 @@ public class Astrid3ContentProvider extends ContentProvider {
// --- instance variables // --- instance variables
@Autowired @Autowired private Database database;
private Database database;
@Autowired @Autowired private TaskDao taskDao;
private TaskDao taskDao;
@Autowired @Autowired private MetadataDao metadataDao;
private MetadataDao metadataDao;
@Autowired @Autowired private StoreObjectDao storeObjectDao;
private StoreObjectDao storeObjectDao;
@Autowired @Autowired private UserActivityDao userActivityDao;
private UserActivityDao userActivityDao;
@Override @Override
public boolean onCreate() { public boolean onCreate() {

@ -40,8 +40,7 @@ public class SqlContentProvider extends ContentProvider {
"sql", 0); "sql", 0);
} }
@Autowired @Autowired private Database database;
private Database database;
@Override @Override
public boolean onCreate() { public boolean onCreate() {

@ -81,8 +81,7 @@ public class Notifications extends BroadcastReceiver {
// --- instance variables // --- instance variables
@Autowired @Autowired private TaskDao taskDao;
private TaskDao taskDao;
public static NotificationManager notificationManager = null; public static NotificationManager notificationManager = null;
private static boolean forceNotificationManager = false; private static boolean forceNotificationManager = false;

@ -37,8 +37,7 @@ import static org.tasks.date.DateTimeUtils.newDate;
*/ */
public class ReminderDialog extends Dialog { public class ReminderDialog extends Dialog {
@Autowired @Autowired private TaskService taskService;
private TaskService taskService;
public ReminderDialog(final AstridActivity activity, final long taskId, public ReminderDialog(final AstridActivity activity, final long taskId,
String title) { String title) {

@ -26,8 +26,7 @@ import org.tasks.scheduling.RefreshScheduler;
*/ */
public class ReminderSchedulingService extends Service { public class ReminderSchedulingService extends Service {
@Autowired @Autowired private RefreshScheduler refreshScheduler;
private RefreshScheduler refreshScheduler;
public ReminderSchedulingService() { public ReminderSchedulingService() {
DependencyInjectionService.getInstance().inject(this); DependencyInjectionService.getInstance().inject(this);

@ -74,8 +74,7 @@ public final class ReminderService {
// --- instance variables // --- instance variables
@Autowired @Autowired private TaskDao taskDao;
private TaskDao taskDao;
private AlarmScheduler scheduler = new ReminderAlarmScheduler(); private AlarmScheduler scheduler = new ReminderAlarmScheduler();

@ -28,8 +28,7 @@ public final class GlobalEventReceiver extends BroadcastReceiver {
AstridDependencyInjector.initialize(); AstridDependencyInjector.initialize();
} }
@Autowired @Autowired private TaskService taskService;
private TaskService taskService;
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {

@ -44,8 +44,7 @@ public final class UpgradeService {
} }
public static class UpgradeActivity extends Activity { public static class UpgradeActivity extends Activity {
@Autowired @Autowired private TaskService taskService;
private TaskService taskService;
private ProgressDialog dialog; private ProgressDialog dialog;
public static final String TOKEN_FROM_VERSION = "from_version"; //$NON-NLS-1$ public static final String TOKEN_FROM_VERSION = "from_version"; //$NON-NLS-1$

@ -21,8 +21,7 @@ import java.util.Set;
public abstract class AstridOrderedListUpdater<LIST> { public abstract class AstridOrderedListUpdater<LIST> {
@Autowired @Autowired private TaskService taskService;
private TaskService taskService;
public AstridOrderedListUpdater() { public AstridOrderedListUpdater() {
DependencyInjectionService.getInstance().inject(this); DependencyInjectionService.getInstance().inject(this);

@ -41,8 +41,7 @@ public class EditTitleControlSet extends TaskEditControlSet implements Importanc
private boolean isRepeating; private boolean isRepeating;
private int importanceValue; private int importanceValue;
@Autowired @Autowired private TaskService taskService;
private TaskService taskService;
public EditTitleControlSet(Activity activity, int layout, int editText) { public EditTitleControlSet(Activity activity, int layout, int editText) {
super(activity, layout); super(activity, layout);

@ -72,8 +72,7 @@ public class QuickAddBar extends LinearLayout {
private RepeatControlSet repeatControl; private RepeatControlSet repeatControl;
private GCalControlSet gcalControl; private GCalControlSet gcalControl;
@Autowired @Autowired private TaskAttachmentDao taskAttachmentDao;
private TaskAttachmentDao taskAttachmentDao;
private VoiceRecognizer voiceRecognizer; private VoiceRecognizer voiceRecognizer;

@ -27,10 +27,8 @@ abstract public class SyncMetadataService<TYPE extends SyncContainer> {
// --- instance variables // --- instance variables
@Autowired @Autowired protected TaskDao taskDao;
protected TaskDao taskDao; @Autowired protected MetadataDao metadataDao;
@Autowired
protected MetadataDao metadataDao;
// --- abstract methods // --- abstract methods

@ -37,8 +37,7 @@ public class TasksWidget extends AppWidgetProvider {
AstridDependencyInjector.initialize(); AstridDependencyInjector.initialize();
} }
@Autowired @Autowired private TaskService taskService;
private TaskService taskService;
public static final String COMPLETE_TASK = "COMPLETE_TASK"; public static final String COMPLETE_TASK = "COMPLETE_TASK";
public static final String EDIT_TASK = "EDIT_TASK"; public static final String EDIT_TASK = "EDIT_TASK";

@ -46,17 +46,13 @@ public class WidgetUpdateService extends Service {
public static final String EXTRA_WIDGET_ID = "widget_id"; //$NON-NLS-1$ public static final String EXTRA_WIDGET_ID = "widget_id"; //$NON-NLS-1$
@Autowired @Autowired Database database;
Database database;
@Autowired @Autowired TaskService taskService;
TaskService taskService;
@Autowired @Autowired TaskListMetadataDao taskListMetadataDao;
TaskListMetadataDao taskListMetadataDao;
@Autowired @Autowired TagDataService tagDataService;
TagDataService tagDataService;
private final WidgetHelper widgetHelper = new WidgetHelper(); private final WidgetHelper widgetHelper = new WidgetHelper();

@ -15,8 +15,7 @@ import org.tasks.R;
public class VoiceCommandActivity extends Activity { public class VoiceCommandActivity extends Activity {
@Autowired @Autowired TaskService taskService;
TaskService taskService;
public VoiceCommandActivity() { public VoiceCommandActivity() {
DependencyInjectionService.getInstance().inject(this); DependencyInjectionService.getInstance().inject(this);

@ -40,17 +40,13 @@ import org.tasks.R;
@TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH) @TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH)
public class ScrollableViewsFactory implements RemoteViewsService.RemoteViewsFactory { public class ScrollableViewsFactory implements RemoteViewsService.RemoteViewsFactory {
@Autowired @Autowired Database database;
Database database;
@Autowired @Autowired TaskService taskService;
TaskService taskService;
@Autowired @Autowired TaskListMetadataDao taskListMetadataDao;
TaskListMetadataDao taskListMetadataDao;
@Autowired @Autowired TagDataService tagDataService;
TagDataService tagDataService;
private final Context context; private final Context context;
private final Filter filter; private final Filter filter;

@ -73,8 +73,7 @@ public class WidgetHelper {
context.sendBroadcast(intent); context.sendBroadcast(intent);
} }
@Autowired @Autowired TagDataService tagDataService;
TagDataService tagDataService;
public WidgetHelper() { public WidgetHelper() {
DependencyInjectionService.getInstance().inject(this); DependencyInjectionService.getInstance().inject(this);

@ -43,8 +43,7 @@ public class DependencyInjectionTest {
// test various permissions // test various permissions
Object test = new Object() { Object test = new Object() {
@Autowired @Autowired public String foo;
public String foo;
@Override @Override
public String toString() { public String toString() {
@ -55,8 +54,7 @@ public class DependencyInjectionTest {
assertEquals("bar", test.toString()); assertEquals("bar", test.toString());
test = new Object() { test = new Object() {
@Autowired @Autowired String foo;
String foo;
@Override @Override
public String toString() { public String toString() {
@ -67,8 +65,7 @@ public class DependencyInjectionTest {
assertEquals("bar", test.toString()); assertEquals("bar", test.toString());
test = new Object() { test = new Object() {
@Autowired @Autowired protected String foo;
protected String foo;
@Override @Override
public String toString() { public String toString() {
@ -79,8 +76,7 @@ public class DependencyInjectionTest {
assertEquals("bar", test.toString()); assertEquals("bar", test.toString());
test = new Object() { test = new Object() {
@Autowired @Autowired private String foo;
private String foo;
@Override @Override
public String toString() { public String toString() {
@ -127,8 +123,7 @@ public class DependencyInjectionTest {
}); });
Object test = new Object() { Object test = new Object() {
@Autowired @Autowired public String foo;
public String foo;
@Override @Override
public String toString() { public String toString() {
@ -139,8 +134,7 @@ public class DependencyInjectionTest {
assertEquals("bar", test.toString()); assertEquals("bar", test.toString());
test = new Object() { test = new Object() {
@Autowired @Autowired public String forks;
public String forks;
@Override @Override
public String toString() { public String toString() {
@ -167,8 +161,7 @@ public class DependencyInjectionTest {
); );
Object test = new Object() { Object test = new Object() {
@Autowired @Autowired public String foo;
public String foo;
@Override @Override
public String toString() { public String toString() {
@ -202,8 +195,7 @@ public class DependencyInjectionTest {
); );
Object test1 = new Object() { Object test1 = new Object() {
@Autowired @Autowired public String foo;
public String foo;
@Override @Override
public String toString() { public String toString() {
@ -211,8 +203,7 @@ public class DependencyInjectionTest {
} }
}; };
Object test2 = new Object() { Object test2 = new Object() {
@Autowired @Autowired public String foo;
public String foo;
@Override @Override
public String toString() { public String toString() {
@ -226,13 +217,11 @@ public class DependencyInjectionTest {
} }
public static class ParentInjectee { public static class ParentInjectee {
@Autowired @Autowired protected String foo;
protected String foo;
} }
public static class ChildInjectee extends ParentInjectee { public static class ChildInjectee extends ParentInjectee {
@Autowired @Autowired protected String bar;
protected String bar;
} }
@Test @Test

@ -27,8 +27,7 @@ public class GtasksDetailExposerTest extends TodorooRobolectricTestCase {
private Context context; private Context context;
private RobolectricGtasksPreferenceService gtasksPreferenceService; private RobolectricGtasksPreferenceService gtasksPreferenceService;
@Autowired @Autowired private GtasksListService gtasksListService;
private GtasksListService gtasksListService;
@Override @Override
public void before() { public void before() {

@ -30,8 +30,7 @@ public class NotifyAtDeadlineTest extends TodorooRobolectricTestCase {
@SuppressLint("NewApi") @SuppressLint("NewApi")
private static final int MILLIS_PER_HOUR = (int) TimeUnit.HOURS.toMillis(1); private static final int MILLIS_PER_HOUR = (int) TimeUnit.HOURS.toMillis(1);
@Autowired @Autowired private TaskDao taskDao;
private TaskDao taskDao;
private ReminderService service; private ReminderService service;

@ -30,8 +30,7 @@ public class ReminderServiceTest extends TodorooRobolectricTestCase {
ReminderService service; ReminderService service;
@Autowired @Autowired TaskDao taskDao;
TaskDao taskDao;
@Override @Override
public void before() { public void before() {

@ -35,8 +35,7 @@ public class AstridDependencyInjectorTest {
@Test @Test
public void testWithString() { public void testWithString() {
Helper helper = new Helper() { Helper helper = new Helper() {
@Autowired @Autowired public String applicationName;
public String applicationName;
@Override @Override
public Object getObject() { public Object getObject() {
@ -52,8 +51,7 @@ public class AstridDependencyInjectorTest {
public void testWithClass() { public void testWithClass() {
Helper helper = new Helper() { Helper helper = new Helper() {
@Autowired @Autowired public TaskService taskService;
public TaskService taskService;
@Override @Override
public Object getObject() { public Object getObject() {
@ -65,8 +63,7 @@ public class AstridDependencyInjectorTest {
assertTrue(helper.getObject() instanceof TaskService); assertTrue(helper.getObject() instanceof TaskService);
Helper helper2 = new Helper() { Helper helper2 = new Helper() {
@Autowired @Autowired public TaskService taskService;
public TaskService taskService;
@Override @Override
public Object getObject() { public Object getObject() {

@ -34,11 +34,9 @@ import com.todoroo.astrid.utility.Flags;
abstract public class AbstractSyncRepeatTests<REMOTE_MODEL> extends DatabaseTestCase { abstract public class AbstractSyncRepeatTests<REMOTE_MODEL> extends DatabaseTestCase {
@Autowired @Autowired protected TaskDao taskDao;
protected TaskDao taskDao;
@Autowired @Autowired protected MetadataDao metadataDao;
protected MetadataDao metadataDao;
@Override @Override
protected void setUp() throws Exception { protected void setUp() throws Exception {

Loading…
Cancel
Save