From b87bce24be72796673b3bd4479e2af2fae4acf0d Mon Sep 17 00:00:00 2001 From: Tim Su Date: Wed, 22 Jun 2011 02:32:03 -0700 Subject: [PATCH] Added initialize for AstridDependencyService as indicated by warnings --- astrid/plugin-src/com/timsu/astrid/C2DMReceiver.java | 5 +++++ .../com/todoroo/astrid/actfm/ActFmSyncActionExposer.java | 5 +++++ .../com/todoroo/astrid/actfm/EditPeopleActivity.java | 7 ++++++- .../com/todoroo/astrid/actfm/EditPeopleExposer.java | 5 +++++ .../com/todoroo/astrid/notes/EditNoteExposer.java | 5 +++++ 5 files changed, 26 insertions(+), 1 deletion(-) diff --git a/astrid/plugin-src/com/timsu/astrid/C2DMReceiver.java b/astrid/plugin-src/com/timsu/astrid/C2DMReceiver.java index 3f69986f0..ac4c35e96 100644 --- a/astrid/plugin-src/com/timsu/astrid/C2DMReceiver.java +++ b/astrid/plugin-src/com/timsu/astrid/C2DMReceiver.java @@ -32,6 +32,7 @@ import com.todoroo.astrid.dao.UpdateDao; import com.todoroo.astrid.data.TagData; import com.todoroo.astrid.data.Update; import com.todoroo.astrid.reminders.Notifications; +import com.todoroo.astrid.service.AstridDependencyInjector; import com.todoroo.astrid.service.TagDataService; import com.todoroo.astrid.tags.TagFilterExposer; import com.todoroo.astrid.utility.Constants; @@ -49,6 +50,10 @@ public class C2DMReceiver extends BroadcastReceiver { @Autowired TagDataService tagDataService; @Autowired UpdateDao updateDao; + static { + AstridDependencyInjector.initialize(); + } + @Override public void onReceive(Context context, final Intent intent) { ContextManager.setContext(context); diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmSyncActionExposer.java b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmSyncActionExposer.java index 2bfd7a4e9..d3a0c0cd8 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmSyncActionExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmSyncActionExposer.java @@ -15,6 +15,7 @@ import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.astrid.actfm.sync.ActFmPreferenceService; import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.api.SyncAction; +import com.todoroo.astrid.service.AstridDependencyInjector; /** * Exposes sync action @@ -24,6 +25,10 @@ public class ActFmSyncActionExposer extends BroadcastReceiver { @Autowired ActFmPreferenceService actFmPreferenceService; + static { + AstridDependencyInjector.initialize(); + } + @Override public void onReceive(Context context, Intent intent) { ContextManager.setContext(context); diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleActivity.java index 7ebeed39f..21fd084a6 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleActivity.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleActivity.java @@ -42,6 +42,7 @@ import com.todoroo.astrid.dao.MetadataDao.MetadataCriteria; import com.todoroo.astrid.data.Metadata; import com.todoroo.astrid.data.TagData; import com.todoroo.astrid.data.Task; +import com.todoroo.astrid.service.AstridDependencyInjector; import com.todoroo.astrid.service.MetadataService; import com.todoroo.astrid.service.StatisticsService; import com.todoroo.astrid.service.TagDataService; @@ -86,6 +87,10 @@ public class EditPeopleActivity extends Activity { private final ArrayList spinnerValues = new ArrayList(); + static { + AstridDependencyInjector.initialize(); + } + public EditPeopleActivity() { DependencyInjectionService.getInstance().inject(this); } @@ -573,4 +578,4 @@ public class EditPeopleActivity extends Activity { super.onActivityResult(requestCode, resultCode, data); } -} \ No newline at end of file +} diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleExposer.java b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleExposer.java index b009b22ec..be4d310b1 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleExposer.java @@ -14,6 +14,7 @@ import com.todoroo.astrid.actfm.sync.ActFmPreferenceService; import com.todoroo.astrid.api.AstridApiConstants; import com.todoroo.astrid.api.TaskAction; import com.todoroo.astrid.api.TaskDecoration; +import com.todoroo.astrid.service.AstridDependencyInjector; /** * Exposes {@link TaskDecoration} for timers @@ -25,6 +26,10 @@ public class EditPeopleExposer extends BroadcastReceiver { private static final String ACTION = "com.todoroo.astrid.EDIT_PEOPLE"; //$NON-NLS-1$ + static { + AstridDependencyInjector.initialize(); + } + @Override public void onReceive(Context context, Intent intent) { ContextManager.setContext(context); diff --git a/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteExposer.java b/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteExposer.java index 3bcac2705..ead1b9c59 100644 --- a/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteExposer.java @@ -18,6 +18,7 @@ import com.todoroo.astrid.api.TaskAction; import com.todoroo.astrid.api.TaskDecoration; import com.todoroo.astrid.core.PluginServices; import com.todoroo.astrid.data.Task; +import com.todoroo.astrid.service.AstridDependencyInjector; /** * Exposes {@link TaskDecoration} for timers @@ -31,6 +32,10 @@ public class EditNoteExposer extends BroadcastReceiver { @Autowired ActFmPreferenceService actFmPreferenceService; + static { + AstridDependencyInjector.initialize(); + } + @Override public void onReceive(Context context, Intent intent) { ContextManager.setContext(context);