From fb8f8e412c4fca1affde13632bd09866ae58da40 Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Tue, 24 Mar 2009 03:37:17 +0000
Subject: [PATCH]   Removed @Override annotation on annonymous inner classes as
 per issue #71

---
 .../astrid/activities/SyncPreferences.java    |  3 --
 .../astrid/activities/TagListSubActivity.java |  7 -----
 src/com/timsu/astrid/activities/TaskEdit.java | 13 ---------
 .../astrid/activities/TaskListAdapter.java    |  7 -----
 .../activities/TaskListSubActivity.java       | 28 -------------------
 .../activities/TaskModificationActivity.java  |  1 -
 .../TaskModificationTabbedActivity.java       |  1 -
 .../timsu/astrid/data/AbstractController.java |  3 --
 src/com/timsu/astrid/sync/RTMSyncService.java |  9 ------
 .../astrid/sync/SynchronizationService.java   |  3 --
 .../astrid/utilities/StartupReceiver.java     |  1 -
 .../astrid/widget/DateWithNullControlSet.java |  1 -
 .../astrid/widget/TimeDurationControlSet.java |  1 -
 13 files changed, 78 deletions(-)

diff --git a/src/com/timsu/astrid/activities/SyncPreferences.java b/src/com/timsu/astrid/activities/SyncPreferences.java
index 1244e125d..6a2d9e80a 100644
--- a/src/com/timsu/astrid/activities/SyncPreferences.java
+++ b/src/com/timsu/astrid/activities/SyncPreferences.java
@@ -51,7 +51,6 @@ public class SyncPreferences extends PreferenceActivity {
 
         Button syncButton = ((Button)findViewById(R.id.sync));
         syncButton.setOnClickListener(new View.OnClickListener() {
-            @Override
             public void onClick(View v) {
                 setResult(Constants.RESULT_SYNCHRONIZE);
                 finish();
@@ -59,12 +58,10 @@ public class SyncPreferences extends PreferenceActivity {
         });
 
         ((Button)findViewById(R.id.forget)).setOnClickListener(new View.OnClickListener() {
-            @Override
             public void onClick(View v) {
                 DialogUtilities.okCancelDialog(SyncPreferences.this,
                         getResources().getString(R.string.sync_forget_confirm),
                         new Dialog.OnClickListener() {
-                    @Override
                     public void onClick(DialogInterface dialog,
                             int which) {
                         Synchronizer.clearUserData(SyncPreferences.this);
diff --git a/src/com/timsu/astrid/activities/TagListSubActivity.java b/src/com/timsu/astrid/activities/TagListSubActivity.java
index c92a7c321..b214115d4 100644
--- a/src/com/timsu/astrid/activities/TagListSubActivity.java
+++ b/src/com/timsu/astrid/activities/TagListSubActivity.java
@@ -99,7 +99,6 @@ public class TagListSubActivity extends SubActivity {
 
         // time to go!
         new Thread(new Runnable() {
-            @Override
             public void run() {
                 fillData();
             }
@@ -144,7 +143,6 @@ public class TagListSubActivity extends SubActivity {
 
         // do sort
         Collections.sort(tagArray, new Comparator<TagModelForView>() {
-            @Override
             public int compare(TagModelForView arg0, TagModelForView arg1) {
                 return sortMode.compareTo(TagListSubActivity.this, arg0, arg1);
             }
@@ -170,7 +168,6 @@ public class TagListSubActivity extends SubActivity {
         }
 
         handler.post(new Runnable() {
-            @Override
             public void run() {
                 // set up our adapter
                 final TagListAdapter tagAdapter = new TagListAdapter(getParent(),
@@ -194,7 +191,6 @@ public class TagListSubActivity extends SubActivity {
                 tagArray.size(), tagArray.size()));
         final CharSequence finalTitle = title;
         handler.post(new Runnable() {
-            @Override
             public void run() {
                 setTitle(finalTitle);
             }
@@ -204,7 +200,6 @@ public class TagListSubActivity extends SubActivity {
 
         // list view listener
         listView.setOnItemClickListener(new OnItemClickListener() {
-            @Override
             public void onItemClick(AdapterView<?> parent, View view,
                     int position, long id) {
                 TagModelForView tag = (TagModelForView)view.getTag();
@@ -216,7 +211,6 @@ public class TagListSubActivity extends SubActivity {
         });
 
         listView.setOnCreateContextMenuListener(new OnCreateContextMenuListener() {
-            @Override
             public void onCreateContextMenu(ContextMenu menu, View v,
                     ContextMenuInfo menuInfo) {
                 AdapterContextMenuInfo adapterMenuInfo =
@@ -266,7 +260,6 @@ public class TagListSubActivity extends SubActivity {
             .setIcon(android.R.drawable.ic_dialog_alert)
             .setPositiveButton(android.R.string.ok,
                     new DialogInterface.OnClickListener() {
-                @Override
                 public void onClick(DialogInterface dialog, int which) {
                     getTagController().deleteTag(tagId);
                     fillData();
diff --git a/src/com/timsu/astrid/activities/TaskEdit.java b/src/com/timsu/astrid/activities/TaskEdit.java
index b5267f3bc..1a982a812 100644
--- a/src/com/timsu/astrid/activities/TaskEdit.java
+++ b/src/com/timsu/astrid/activities/TaskEdit.java
@@ -421,7 +421,6 @@ public class TaskEdit extends TaskModificationTabbedActivity<TaskModelForEdit> {
         });
 
         repeatValue.setOnClickListener(new View.OnClickListener() {
-            @Override
             public void onClick(View v) {
                 repeatValueClick();
             }
@@ -463,7 +462,6 @@ public class TaskEdit extends TaskModificationTabbedActivity<TaskModelForEdit> {
         ImageButton reminderRemoveButton;
         reminderRemoveButton = (ImageButton)alertItem.findViewById(R.id.button1);
         reminderRemoveButton.setOnClickListener(new View.OnClickListener() {
-            @Override
             public void onClick(View v) {
                 alertsContainer.removeView(alertItem);
             }
@@ -490,7 +488,6 @@ public class TaskEdit extends TaskModificationTabbedActivity<TaskModelForEdit> {
                     android.R.layout.simple_dropdown_item_1line, tags);
         textView.setAdapter(tagsAdapter);
         textView.addTextChangedListener(new TextWatcher() {
-            @Override
             public void onTextChanged(CharSequence s, int start, int before,
                     int count) {
                 if(start == 0 && tagsContainer.getChildAt(
@@ -499,12 +496,10 @@ public class TaskEdit extends TaskModificationTabbedActivity<TaskModelForEdit> {
                 }
             }
 
-            @Override
             public void afterTextChanged(Editable s) {
                 //
             }
 
-            @Override
             public void beforeTextChanged(CharSequence s, int start, int count,
                     int after) {
                 //
@@ -514,7 +509,6 @@ public class TaskEdit extends TaskModificationTabbedActivity<TaskModelForEdit> {
         ImageButton reminderRemoveButton;
         reminderRemoveButton = (ImageButton)tagItem.findViewById(R.id.button1);
         reminderRemoveButton.setOnClickListener(new View.OnClickListener() {
-            @Override
             public void onClick(View v) {
                 tagsContainer.removeView(tagItem);
             }
@@ -554,7 +548,6 @@ public class TaskEdit extends TaskModificationTabbedActivity<TaskModelForEdit> {
             .setIcon(android.R.drawable.ic_dialog_alert)
             .setPositiveButton(android.R.string.ok,
                     new DialogInterface.OnClickListener() {
-                @Override
                 public void onClick(DialogInterface dialog, int which) {
                     // tell the task list to update itself
                     TaskListSubActivity.shouldRefreshTaskList = true;
@@ -575,7 +568,6 @@ public class TaskEdit extends TaskModificationTabbedActivity<TaskModelForEdit> {
             repeatHelpShown = true;
 
         final Runnable openDialogRunnable = new Runnable() {
-            @Override
             public void run() {
                 repeatHelpShown = true;
 
@@ -584,7 +576,6 @@ public class TaskEdit extends TaskModificationTabbedActivity<TaskModelForEdit> {
                     dialogValue = 1;
 
                 new NumberPickerDialog(TaskEdit.this, new OnNumberPickedListener() {
-                    @Override
                     public void onNumberPicked(NumberPicker view, int number) {
                         setRepeatValue(number);
                     }
@@ -604,14 +595,12 @@ public class TaskEdit extends TaskModificationTabbedActivity<TaskModelForEdit> {
         .setIcon(android.R.drawable.ic_dialog_info)
         .setPositiveButton(android.R.string.ok,
                 new DialogInterface.OnClickListener() {
-            @Override
             public void onClick(DialogInterface dialog, int which) {
                 openDialogRunnable.run();
             }
         })
         .setNeutralButton(R.string.repeat_help_hide,
                 new DialogInterface.OnClickListener() {
-            @Override
             public void onClick(DialogInterface dialog, int which) {
                 Preferences.setShowRepeatHelp(TaskEdit.this, false);
                 openDialogRunnable.run();
@@ -814,7 +803,6 @@ public class TaskEdit extends TaskModificationTabbedActivity<TaskModelForEdit> {
                 button.setTextOff(r.getString(i.getLabelResource()));
                 button.setTextOn(r.getString(i.getLabelResource()));
                 button.setOnClickListener(new View.OnClickListener() {
-                    @Override
                     public void onClick(View v) {
                         setImportance((Importance)button.getTag());
                     }
@@ -866,7 +854,6 @@ public class TaskEdit extends TaskModificationTabbedActivity<TaskModelForEdit> {
 
             activatedCheckBox.setOnCheckedChangeListener(
                     new OnCheckedChangeListener() {
-                @Override
                 public void onCheckedChanged(CompoundButton buttonView,
                         boolean isChecked) {
                     taskBox.setEnabled(isChecked);
diff --git a/src/com/timsu/astrid/activities/TaskListAdapter.java b/src/com/timsu/astrid/activities/TaskListAdapter.java
index 18a955bf4..ea9a6521f 100644
--- a/src/com/timsu/astrid/activities/TaskListAdapter.java
+++ b/src/com/timsu/astrid/activities/TaskListAdapter.java
@@ -573,7 +573,6 @@ public class TaskListAdapter extends ArrayAdapter<TaskModelForList> {
 
         // clicking the check box
         progress.setOnClickListener(new View.OnClickListener() {
-            @Override
             public void onClick(View v) {
                 View parent = (View)v.getParent().getParent();
                 TaskModelForList task = (TaskModelForList)parent.getTag();
@@ -595,7 +594,6 @@ public class TaskListAdapter extends ArrayAdapter<TaskModelForList> {
 
         // clicking the text field
         view.setOnClickListener(new View.OnClickListener() {
-            @Override
             public void onClick(View v) {
                 TaskModelForList task = (TaskModelForList)v.getTag();
                 toggleExpanded(v, task);
@@ -604,7 +602,6 @@ public class TaskListAdapter extends ArrayAdapter<TaskModelForList> {
 
         // typing while selected something
         view.setOnKeyListener(new OnKeyListener() {
-        	@Override
         	public boolean onKey(View v, int keyCode, KeyEvent event) {
         		if(event.getAction() != KeyEvent.ACTION_UP)
         			return false;
@@ -623,7 +620,6 @@ public class TaskListAdapter extends ArrayAdapter<TaskModelForList> {
 
         // long-clicking the text field
         view.setOnCreateContextMenuListener(new OnCreateContextMenuListener() {
-            @Override
             public void onCreateContextMenu(ContextMenu menu, View v,
                     ContextMenuInfo menuInfo) {
                 TaskModelForList task = (TaskModelForList)v.getTag();
@@ -653,7 +649,6 @@ public class TaskListAdapter extends ArrayAdapter<TaskModelForList> {
         // clicking one of the expanded buttons
         Button editButton = (Button)view.findViewById(R.id.edit);
         editButton.setOnClickListener(new View.OnClickListener() {
-            @Override
             public void onClick(View v) {
                 View parent = (View)v.getParent().getParent().getParent().getParent();
                 TaskModelForList task = (TaskModelForList)parent.getTag();
@@ -663,7 +658,6 @@ public class TaskListAdapter extends ArrayAdapter<TaskModelForList> {
 
         Button toggleTimerButton = (Button)view.findViewById(R.id.timer);
         toggleTimerButton.setOnClickListener(new View.OnClickListener() {
-            @Override
             public void onClick(View v) {
                 View parent = (View)v.getParent().getParent().getParent().getParent();
                 TaskModelForList task = (TaskModelForList)parent.getTag();
@@ -697,7 +691,6 @@ public class TaskListAdapter extends ArrayAdapter<TaskModelForList> {
             .setIcon(android.R.drawable.ic_dialog_alert)
             .setPositiveButton(android.R.string.ok,
                     new DialogInterface.OnClickListener() {
-                @Override
                 public void onClick(DialogInterface dialog, int which) {
                     task.stopTimerAndUpdateElapsedTime();
                     hooks.taskController().saveTask(task);
diff --git a/src/com/timsu/astrid/activities/TaskListSubActivity.java b/src/com/timsu/astrid/activities/TaskListSubActivity.java
index 666cca7b8..4621ad463 100644
--- a/src/com/timsu/astrid/activities/TaskListSubActivity.java
+++ b/src/com/timsu/astrid/activities/TaskListSubActivity.java
@@ -177,10 +177,8 @@ public class TaskListSubActivity extends SubActivity {
         // declare the reload runnable, which is called when the task list
         // wants to reload itself
         reLoadRunnable = new Runnable() {
-            @Override
             public void run() {
                 handler.post(new Runnable() {
-                    @Override
                     public void run() {
                         loadingText.setText(getParent().getResources().getString(R.string.updating));
                     }
@@ -217,10 +215,8 @@ public class TaskListSubActivity extends SubActivity {
         // time to go! creates a thread that loads the task list, then
         // displays the reminder box if it is requested
         context.loadingThread = new Thread(new Runnable() {
-            @Override
             public void run() {
                 handler.post(new Runnable() {
-                    @Override
                     public void run() {
                         loadingText.setVisibility(View.VISIBLE);
                     }
@@ -233,7 +229,6 @@ public class TaskListSubActivity extends SubActivity {
                 if(variables != null && variables.containsKey(NOTIF_FLAGS_TOKEN) &&
                         context.selectedTask != null) {
                     handler.post(new Runnable() {
-                        @Override
                         public void run() {
                             long repeatInterval = 0;
                             int flags = 0;
@@ -260,7 +255,6 @@ public class TaskListSubActivity extends SubActivity {
         addButton = (Button)findViewById(R.id.addtask);
         addButton.setOnClickListener(new
                 View.OnClickListener() {
-            @Override
             public void onClick(View v) {
                 createTask(null);
             }
@@ -269,7 +263,6 @@ public class TaskListSubActivity extends SubActivity {
         layout = getView();
         layout.setOnCreateContextMenuListener(
                 new OnCreateContextMenuListener() {
-                    @Override
                     public void onCreateContextMenu(ContextMenu menu, View v,
                             ContextMenuInfo menuInfo) {
                         if(menu.hasVisibleItems())
@@ -412,7 +405,6 @@ public class TaskListSubActivity extends SubActivity {
 
         // no, i will ignore: quits application
         .setNegativeButton(R.string.notify_no, new DialogInterface.OnClickListener() {
-            @Override
             public void onClick(DialogInterface dialog, int which) {
                 TaskList.shouldCloseInstance = true;
                 closeActivity();
@@ -421,7 +413,6 @@ public class TaskListSubActivity extends SubActivity {
 
         // snooze: sets a new temporary alert, closes application
         .setNeutralButton(R.string.notify_snooze, new DialogInterface.OnClickListener() {
-            @Override
             public void onClick(DialogInterface dialog, int which) {
                 snoozeAlert(task, repeatInterval, flags);
             }
@@ -480,7 +471,6 @@ public class TaskListSubActivity extends SubActivity {
         int completedTasks = 0; // # of tasks on list that are done
 
         handler.post(new Runnable() {
-            @Override
             public void run() {
                 loadingText.setVisibility(View.VISIBLE);
             }
@@ -559,7 +549,6 @@ public class TaskListSubActivity extends SubActivity {
             // happens when you run out of memory usually
             Log.e("astrid", "Error loading task list", e);
             handler.post(new Runnable() {
-                @Override
                 public void run() {
                     if(!e.getMessage().contains("Couldn't init cursor window"))
                         return;
@@ -576,7 +565,6 @@ public class TaskListSubActivity extends SubActivity {
         int activeTasks = context.taskArray.size() - completedTasks;
         // sort task list
         Collections.sort(context.taskArray, new Comparator<TaskModelForList>() {
-            @Override
             public int compare(TaskModelForList arg0, TaskModelForList arg1) {
                 return sortMode.compareTo(arg0, arg1);
             }
@@ -589,7 +577,6 @@ public class TaskListSubActivity extends SubActivity {
         final int finalHidden = hiddenTasks;
 
         handler.post(new Runnable() {
-            @Override
             public void run() {
                 Resources r = getResources();
                 StringBuilder title = new StringBuilder().
@@ -618,7 +605,6 @@ public class TaskListSubActivity extends SubActivity {
     /** Sets up the interface after everything has been loaded */
     private void onTaskListLoaded() {
         handler.post(new Runnable() {
-            @Override
             public void run() {
                 // hide "add" button if we have too many tasks
                 int threshold = HIDE_ADD_BTN_PORTRAIT;
@@ -635,7 +621,6 @@ public class TaskListSubActivity extends SubActivity {
 
         // set up the title
         handler.post(new Runnable() {
-            @Override
             public void run() {
                 setTitle(context.windowTitle);
                 setUpListUI();
@@ -654,27 +639,22 @@ public class TaskListSubActivity extends SubActivity {
             this.myTaskArray = context.taskArray;
         }
 
-        @Override
         public TagController tagController() {
             return getTagController();
         }
 
-        @Override
         public String getTagsFor(TaskModelForList task) {
             return myTaskTags.get(task);
         }
 
-        @Override
         public ArrayList<TaskModelForList> getTaskArray() {
             return myTaskArray;
         }
 
-        @Override
         public TaskController taskController() {
             return getTaskController();
         }
 
-        @Override
         public void performItemClick(View v, int position) {
             listView.performItemClick(v, position, 0);
         }
@@ -683,17 +663,14 @@ public class TaskListSubActivity extends SubActivity {
             v.setOnTouchListener(getGestureListener());
         }
 
-        @Override
         public void editItem(TaskModelForList task) {
             editTask(task);
         }
 
-        @Override
         public void toggleTimerOnItem(TaskModelForList task) {
             toggleTimer(task);
         }
 
-        @Override
         public void setSelectedItem(TaskIdentifier taskId) {
             if(taskId == null) {
                 selectedTaskId = null;
@@ -724,7 +701,6 @@ public class TaskListSubActivity extends SubActivity {
 
         // filters context menu
         listView.setOnCreateContextMenuListener(new OnCreateContextMenuListener() {
-            @Override
             public void onCreateContextMenu(ContextMenu menu, View v,
                     ContextMenuInfo menuInfo) {
                 if(menu.hasVisibleItems())
@@ -840,7 +816,6 @@ public class TaskListSubActivity extends SubActivity {
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if(resultCode == Constants.RESULT_SYNCHRONIZE) {
             Synchronizer.synchronize(getParent(), false, new SynchronizerListener() {
-                @Override
                 public void onSynchronizerFinished(int numServicesSynced) {
                     if(numServicesSynced == 0) {
                         DialogUtilities.okDialog(getParent(), getResources().getString(
@@ -873,7 +848,6 @@ public class TaskListSubActivity extends SubActivity {
             .setIcon(android.R.drawable.ic_dialog_alert)
             .setPositiveButton(android.R.string.ok,
                     new DialogInterface.OnClickListener() {
-                @Override
                 public void onClick(DialogInterface dialog, int which) {
                     context.listAdapter.remove(task);
                     context.taskArray.remove(task);
@@ -961,7 +935,6 @@ public class TaskListSubActivity extends SubActivity {
     private void cleanOldTasks() {
         final Resources r = getResources();
         new NumberPickerDialog(getParent(), new OnNumberPickedListener() {
-            @Override
             public void onNumberPicked(NumberPicker view, int number) {
                 Date date = new Date(System.currentTimeMillis() - 24L*3600*1000*number);
                 int deleted = getTaskController().deleteCompletedTasksOlderThan(date);
@@ -1008,7 +981,6 @@ public class TaskListSubActivity extends SubActivity {
                         }
 
                         handler.post(new Runnable() {
-                            @Override
                             public void run() {
                                 Toast.makeText(getParent(), nagText, Toast.LENGTH_LONG).show();
                             }
diff --git a/src/com/timsu/astrid/activities/TaskModificationActivity.java b/src/com/timsu/astrid/activities/TaskModificationActivity.java
index 201c3820a..48223a632 100644
--- a/src/com/timsu/astrid/activities/TaskModificationActivity.java
+++ b/src/com/timsu/astrid/activities/TaskModificationActivity.java
@@ -69,7 +69,6 @@ public abstract class TaskModificationActivity<MODEL_TYPE extends
         DialogUtilities.okDialog(this,
                 r.getString(prefix) + " " +
                 e.getLocalizedMessage(), new DialogInterface.OnClickListener() {
-            @Override
             public void onClick(DialogInterface dialog, int which) {
                 finish();
             }
diff --git a/src/com/timsu/astrid/activities/TaskModificationTabbedActivity.java b/src/com/timsu/astrid/activities/TaskModificationTabbedActivity.java
index 4f6a187f8..026c81375 100644
--- a/src/com/timsu/astrid/activities/TaskModificationTabbedActivity.java
+++ b/src/com/timsu/astrid/activities/TaskModificationTabbedActivity.java
@@ -68,7 +68,6 @@ public abstract class TaskModificationTabbedActivity<MODEL_TYPE extends
         DialogUtilities.okDialog(this,
                 r.getString(prefix) + " " +
                 e.getLocalizedMessage(), new DialogInterface.OnClickListener() {
-            @Override
             public void onClick(DialogInterface dialog, int which) {
                 finish();
             }
diff --git a/src/com/timsu/astrid/data/AbstractController.java b/src/com/timsu/astrid/data/AbstractController.java
index fa14f2107..2747ecf9c 100644
--- a/src/com/timsu/astrid/data/AbstractController.java
+++ b/src/com/timsu/astrid/data/AbstractController.java
@@ -55,12 +55,10 @@ abstract public class AbstractController {
             this.cls = cls;
         }
 
-        @Override
         public boolean hasNext() {
             return !cursor.isLast();
         }
 
-        @Override
         public TYPE next() {
             try {
                 TYPE model = cls.getConstructor(Cursor.class).newInstance(cursor);
@@ -85,7 +83,6 @@ abstract public class AbstractController {
             return null;
         }
 
-        @Override
         public void remove() {
             throw new UnsupportedOperationException("Can't remove this way");
         }
diff --git a/src/com/timsu/astrid/sync/RTMSyncService.java b/src/com/timsu/astrid/sync/RTMSyncService.java
index a4fa551c8..c82444f73 100644
--- a/src/com/timsu/astrid/sync/RTMSyncService.java
+++ b/src/com/timsu/astrid/sync/RTMSyncService.java
@@ -81,12 +81,10 @@ public class RTMSyncService extends SynchronizationService {
             DialogUtilities.okCancelDialog(activity,
                     activity.getResources().getString(R.string.sync_rtm_notes),
             new Dialog.OnClickListener() {
-                        @Override
                         public void onClick(DialogInterface dialog, int which) {
                             authenticate(activity);
                         }
             }, new Dialog.OnClickListener() {
-                @Override
                 public void onClick(DialogInterface dialog, int which) {
                     if(progressDialog != null)
                         progressDialog.dismiss();
@@ -144,7 +142,6 @@ public class RTMSyncService extends SynchronizationService {
                 DialogUtilities.okCancelDialog(activity,
                         r.getString(R.string.sync_auth_request, "RTM"),
                         new DialogInterface.OnClickListener() {
-                    @Override
                     public void onClick(DialogInterface dialog, int which) {
                         TaskList.synchronizeNow = true;
                         Intent intent = new Intent(Intent.ACTION_VIEW,
@@ -173,7 +170,6 @@ public class RTMSyncService extends SynchronizationService {
 
     private void performSync(final Activity activity) {
         new Thread(new Runnable() {
-            @Override
             public void run() {
                 performSyncInNewThread(activity);
             }
@@ -235,7 +231,6 @@ public class RTMSyncService extends SynchronizationService {
                         addTasksToList(tasks, remoteChanges);
                     } catch (Exception e) {
                         syncHandler.post(new Runnable() {
-                            @Override
                             public void run() {
                                 DialogUtilities.okDialog(activity,
                                         "List '" + entry.getValue() +
@@ -457,7 +452,6 @@ public class RTMSyncService extends SynchronizationService {
         public RtmSyncHelper(String timeline) {
             this.timeline = timeline;
         }
-        @Override
         public String createTask(TaskModelForSync task) throws IOException {
             String listId = listNameToIdMap.get(INBOX_LIST_NAME.toLowerCase());
             RtmTaskSeries s = rtmService.tasks_add(timeline, listId,
@@ -465,13 +459,11 @@ public class RTMSyncService extends SynchronizationService {
             lastCreatedTask = new RtmId(listId, s).toString();
             return lastCreatedTask;
         }
-        @Override
         public void deleteTask(SyncMapping mapping) throws IOException {
             RtmId id = new RtmId(mapping.getRemoteId());
             rtmService.tasks_delete(timeline, id.listId, id.taskSeriesId,
                     id.taskId);
         }
-        @Override
         public void pushTask(TaskProxy task, TaskProxy remoteTask,
                 SyncMapping mapping) throws IOException {
 
@@ -481,7 +473,6 @@ public class RTMSyncService extends SynchronizationService {
 
             pushLocalTask(timeline, task, remoteTask, mapping);
         }
-        @Override
         public TaskProxy refetchTask(TaskProxy task) throws IOException {
             RtmId id = new RtmId(task.getRemoteId());
             RtmTaskSeries rtmTask = rtmService.tasks_getTask(id.taskSeriesId,
diff --git a/src/com/timsu/astrid/sync/SynchronizationService.java b/src/com/timsu/astrid/sync/SynchronizationService.java
index ef4367419..962d405fd 100644
--- a/src/com/timsu/astrid/sync/SynchronizationService.java
+++ b/src/com/timsu/astrid/sync/SynchronizationService.java
@@ -107,7 +107,6 @@ public abstract class SynchronizationService {
             messageToDisplay = message;
         }
         syncHandler.post(new Runnable() {
-            @Override
             public void run() {
                 if(progressDialog != null)
                     progressDialog.dismiss();
@@ -373,7 +372,6 @@ public abstract class SynchronizationService {
 
         syncController.clearUpdatedTaskList(getId());
         syncHandler.post(new Runnable() {
-            @Override
             public void run() {
                 stats.showDialog(activity, log.toString());
             }
@@ -473,7 +471,6 @@ public abstract class SynchronizationService {
                 return;
 
             Dialog.OnClickListener finishListener = new Dialog.OnClickListener() {
-                @Override
                 public void onClick(DialogInterface dialog,
                         int which) {
                     Synchronizer.continueSynchronization(activity);
diff --git a/src/com/timsu/astrid/utilities/StartupReceiver.java b/src/com/timsu/astrid/utilities/StartupReceiver.java
index 9b664091d..015436a7f 100644
--- a/src/com/timsu/astrid/utilities/StartupReceiver.java
+++ b/src/com/timsu/astrid/utilities/StartupReceiver.java
@@ -37,7 +37,6 @@ public class StartupReceiver extends BroadcastReceiver {
         final int finalVersion = version;
         if(justUpgraded) {
             new Thread(new Runnable() {
-                @Override
                 public void run() {
                     Notifications.scheduleAllAlarms(context);
 
diff --git a/src/com/timsu/astrid/widget/DateWithNullControlSet.java b/src/com/timsu/astrid/widget/DateWithNullControlSet.java
index bac7876db..4c4c91512 100644
--- a/src/com/timsu/astrid/widget/DateWithNullControlSet.java
+++ b/src/com/timsu/astrid/widget/DateWithNullControlSet.java
@@ -40,7 +40,6 @@ public class DateWithNullControlSet extends DateControlSet {
 
         activatedCheckBox.setOnCheckedChangeListener(
                 new OnCheckedChangeListener() {
-            @Override
             public void onCheckedChanged(CompoundButton buttonView,
                     boolean isChecked) {
                 dateButton.setEnabled(isChecked);
diff --git a/src/com/timsu/astrid/widget/TimeDurationControlSet.java b/src/com/timsu/astrid/widget/TimeDurationControlSet.java
index e871df7f2..2af7de32c 100644
--- a/src/com/timsu/astrid/widget/TimeDurationControlSet.java
+++ b/src/com/timsu/astrid/widget/TimeDurationControlSet.java
@@ -108,7 +108,6 @@ public class TimeDurationControlSet implements OnNNumberPickedListener,
         }
     }
 
-    @Override
     /** Called when NumberPicker activity is completed */
     public void onNumbersPicked(int[] values) {
         switch(type) {