Add missing @Override annotations

api/src/com/todoroo/andlib/data/AbstractDatabase.java

@@ -356,18 +356,22 @@ abstract public class AbstractDatabase {
      */
     public static class SqlConstructorVisitor implements PropertyVisitor<String, Void> {
 
+        @Override
         public String visitDouble(Property<Double> property, Void data) {
             return String.format("%s REAL", property.getColumnName());
         }
 
+        @Override
         public String visitInteger(Property<Integer> property, Void data) {
             return String.format("%s INTEGER", property.getColumnName());
         }
 
+        @Override
         public String visitLong(Property<Long> property, Void data) {
             return String.format("%s INTEGER", property.getColumnName());
         }
 
+        @Override
         public String visitString(Property<String> property, Void data) {
             return String.format("%s TEXT", property.getColumnName());
         }

api/src/com/todoroo/andlib/data/AbstractModel.java

@@ -505,21 +505,25 @@ public abstract class AbstractModel implements Parcelable, Cloneable {
             }
         }
 
+        @Override
         public Void visitDouble(Property<Double> property, Object value) {
             store.put(property.getColumnName(), (Double) value);
             return null;
         }
 
+        @Override
         public Void visitInteger(Property<Integer> property, Object value) {
             store.put(property.getColumnName(), (Integer) value);
             return null;
         }
 
+        @Override
         public Void visitLong(Property<Long> property, Object value) {
             store.put(property.getColumnName(), (Long) value);
             return null;
         }
 
+        @Override
         public Void visitString(Property<String> property, Object value) {
             store.put(property.getColumnName(), (String) value);
             return null;
@@ -531,6 +535,7 @@ public abstract class AbstractModel implements Parcelable, Cloneable {
     /**
      * {@inheritDoc}
      */
+    @Override
     public int describeContents() {
         return 0;
     }
@@ -538,6 +543,7 @@ public abstract class AbstractModel implements Parcelable, Cloneable {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void writeToParcel(Parcel dest, int flags) {
         dest.writeParcelable(setValues, 0);
         dest.writeParcelable(values, 0);
@@ -566,6 +572,7 @@ public abstract class AbstractModel implements Parcelable, Cloneable {
         /**
          * {@inheritDoc}
          */
+        @Override
         public TYPE createFromParcel(Parcel source) {
             TYPE model;
             try {
@@ -583,6 +590,7 @@ public abstract class AbstractModel implements Parcelable, Cloneable {
         /**
          * {@inheritDoc}
          */
+        @Override
         public TYPE[] newArray(int size) {
             return (TYPE[]) Array.newInstance(cls, size);
         };

api/src/com/todoroo/andlib/data/TodorooCursor.java

@@ -98,6 +98,7 @@ public class TodorooCursor<TYPE extends AbstractModel> extends CursorWrapper {
      */
     public static class CursorReadingVisitor implements PropertyVisitor<Object, TodorooCursor<?>> {
 
+        @Override
         public Object visitDouble(Property<Double> property,
                 TodorooCursor<?> cursor) {
             int column = columnIndex(property, cursor);
@@ -107,6 +108,7 @@ public class TodorooCursor<TYPE extends AbstractModel> extends CursorWrapper {
             return cursor.getDouble(column);
         }
 
+        @Override
         public Object visitInteger(Property<Integer> property,
                 TodorooCursor<?> cursor) {
             int column = columnIndex(property, cursor);
@@ -116,6 +118,7 @@ public class TodorooCursor<TYPE extends AbstractModel> extends CursorWrapper {
             return cursor.getInt(column);
         }
 
+        @Override
         public Object visitLong(Property<Long> property, TodorooCursor<?> cursor) {
             int column = columnIndex(property, cursor);
             if(property.checkFlag(Property.PROP_FLAG_NULLABLE) && cursor.isNull(column)) {
@@ -124,6 +127,7 @@ public class TodorooCursor<TYPE extends AbstractModel> extends CursorWrapper {
             return cursor.getLong(column);
         }
 
+        @Override
         public Object visitString(Property<String> property,
                 TodorooCursor<?> cursor) {
             int column = columnIndex(property, cursor);

api/src/com/todoroo/andlib/service/ExceptionService.java

@@ -75,6 +75,7 @@ public class ExceptionService {
             }
 
             ((Activity)context).runOnUiThread(new Runnable() {
+                @Override
                 public void run() {
                     try {
                         new AlertDialog.Builder(context)
@@ -117,6 +118,7 @@ public class ExceptionService {
          * @param name
          * @param error
          */
+        @Override
         public void handleError(String name, Throwable error) {
             String tag = null;
             if(ContextManager.getContext() != null) {
@@ -160,6 +162,7 @@ public class ExceptionService {
             DependencyInjectionService.getInstance().inject(this);
         }
 
+        @Override
         public void uncaughtException(Thread thread, Throwable ex) {
             if(exceptionService != null) {
                 exceptionService.reportError("uncaught", ex); //$NON-NLS-1$

api/src/com/todoroo/andlib/service/HttpRestClient.java

@@ -104,6 +104,7 @@ public class HttpRestClient implements RestClient {
     @SuppressWarnings("nls")
     protected void actsAsGzippable(DefaultHttpClient client) {
         client.addRequestInterceptor(new HttpRequestInterceptor() {
+            @Override
             public void process(
                     final HttpRequest request,
                     final HttpContext context) throws HttpException, IOException {
@@ -115,6 +116,7 @@ public class HttpRestClient implements RestClient {
         });
 
         client.addResponseInterceptor(new HttpResponseInterceptor() {
+            @Override
             public void process(
                     final HttpResponse response,
                     final HttpContext context) throws HttpException, IOException {
@@ -192,6 +194,7 @@ public class HttpRestClient implements RestClient {
      * @return response, or null if there was no response
      * @throws IOException
      */
+    @Override
     public synchronized String get(String url) throws IOException {
         if(debug) {
             Log.d("http-rest-client-get", url); //$NON-NLS-1$
@@ -219,6 +222,7 @@ public class HttpRestClient implements RestClient {
      *            url-encoded data
      * @throws IOException
      */
+    @Override
     public synchronized String post(String url, HttpEntity data, Header... headers) throws IOException {
         if(debug) {
             Log.d("http-rest-client-post", url + " | " + data); //$NON-NLS-1$ //$NON-NLS-2$

api/src/com/todoroo/andlib/service/NotificationManager.java

@@ -36,14 +36,17 @@ public interface NotificationManager {
                 context.getSystemService(Context.NOTIFICATION_SERVICE);
         }
 
+        @Override
         public void cancel(int id) {
             nm.cancel(id);
         }
 
+        @Override
         public void cancelAll() {
             nm.cancelAll();
         }
 
+        @Override
         public void notify(int id, Notification notification) {
             nm.notify(id, notification);
         }

api/src/com/todoroo/andlib/utility/AndroidUtilities.java

@@ -78,6 +78,7 @@ public class AndroidUtilities {
         final int inputType = editor.getInputType();
         editor.setInputType(InputType.TYPE_NULL);
         editor.setOnTouchListener(new OnTouchListener() {
+            @Override
             public boolean onTouch(View v, MotionEvent event) {
                 editor.setInputType(inputType);
                 editor.setOnTouchListener(null);
@@ -346,6 +347,7 @@ public class AndroidUtilities {
 
         ContentValues result = new ContentValues();
         fromSerialized(string, result, new SerializedPut<ContentValues>() {
+            @Override
             public void put(ContentValues object, String key, char type, String value) throws NumberFormatException {
                 switch(type) {
                 case 'i':
@@ -381,6 +383,7 @@ public class AndroidUtilities {
 
         Bundle result = new Bundle();
         fromSerialized(string, result, new SerializedPut<Bundle>() {
+            @Override
             public void put(Bundle object, String key, char type, String value) throws NumberFormatException {
                 switch(type) {
                 case 'i':
@@ -582,6 +585,7 @@ public class AndroidUtilities {
      */
     public static void sortFilesByDateDesc(File[] files) {
         Arrays.sort(files, new Comparator<File>() {
+            @Override
             public int compare(File o1, File o2) {
                 return Long.valueOf(o2.lastModified()).compareTo(Long.valueOf(o1.lastModified()));
             }

api/src/com/todoroo/andlib/utility/DialogUtilities.java

@@ -34,6 +34,7 @@ public class DialogUtilities {
         }
 
         tryOnUiThread(activity, new Runnable() {
+            @Override
             public void run() {
                 new AlertDialog.Builder(activity)
                 .setTitle(R.string.DLG_question_title)
@@ -82,6 +83,7 @@ public class DialogUtilities {
         }
 
         tryOnUiThread(activity, new Runnable() {
+            @Override
             public void run() {
                 new AlertDialog.Builder(activity)
                 .setTitle(R.string.DLG_information_title)
@@ -108,6 +110,7 @@ public class DialogUtilities {
         }
 
         tryOnUiThread(activity, new Runnable() {
+            @Override
             public void run() {
                 new AlertDialog.Builder(activity)
                 .setTitle(title)
@@ -165,6 +168,7 @@ public class DialogUtilities {
         }
 
         tryOnUiThread(activity, new Runnable() {
+            @Override
             public void run() {
                 new AlertDialog.Builder(activity)
                 .setTitle(R.string.DLG_confirm_title)
@@ -225,6 +229,7 @@ public class DialogUtilities {
             return;
         }
         tryOnUiThread(activity, new Runnable() {
+            @Override
             public void run() {
                 try {
                     dialog.dismiss();

api/src/com/todoroo/andlib/utility/TodorooPreferenceActivity.java

@@ -82,6 +82,7 @@ abstract public class TodorooPreferenceActivity extends PreferenceActivity {
 
             if (preference.getOnPreferenceChangeListener() == null) {
                 preference.setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
+                    @Override
                     public boolean onPreferenceChange(Preference myPreference, Object newValue) {
                         updatePreferences(myPreference, newValue);
                         return true;

api/src/com/todoroo/astrid/api/Addon.java

@@ -58,6 +58,7 @@ public class Addon implements Parcelable {
     /**
      * {@inheritDoc}
      */
+    @Override
     public int describeContents() {
         return 0;
     }
@@ -65,6 +66,7 @@ public class Addon implements Parcelable {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void writeToParcel(Parcel dest, int flags) {
         dest.writeString(addon);
         dest.writeString(title);
@@ -79,6 +81,7 @@ public class Addon implements Parcelable {
         /**
          * {@inheritDoc}
          */
+        @Override
         public Addon createFromParcel(Parcel source) {
             return new Addon(source.readString(), source.readString(),
                     source.readString(), source.readString());
@@ -87,6 +90,7 @@ public class Addon implements Parcelable {
         /**
          * {@inheritDoc}
          */
+        @Override
         public Addon[] newArray(int size) {
             return new Addon[size];
         };

api/src/com/todoroo/astrid/api/Filter.java

@@ -141,6 +141,7 @@ public class Filter extends FilterListItem {
     /**
      * {@inheritDoc}
      */
+    @Override
     public int describeContents() {
         return 0;
     }
@@ -211,6 +212,7 @@ public class Filter extends FilterListItem {
         /**
          * {@inheritDoc}
          */
+        @Override
         public Filter createFromParcel(Parcel source) {
             Filter item = new Filter();
             item.readFromParcel(source);
@@ -220,6 +222,7 @@ public class Filter extends FilterListItem {
         /**
          * {@inheritDoc}
          */
+        @Override
         public Filter[] newArray(int size) {
             return new Filter[size];
         }

api/src/com/todoroo/astrid/api/FilterCategory.java

@@ -49,6 +49,7 @@ public class FilterCategory extends FilterListItem {
     /**
      * {@inheritDoc}
      */
+    @Override
     public int describeContents() {
         return 0;
     }
@@ -70,6 +71,7 @@ public class FilterCategory extends FilterListItem {
         /**
          * {@inheritDoc}
          */
+        @Override
         public FilterCategory createFromParcel(Parcel source) {
             FilterCategory item = new FilterCategory();
             item.readFromParcel(source);
@@ -91,6 +93,7 @@ public class FilterCategory extends FilterListItem {
         /**
          * {@inheritDoc}
          */
+        @Override
         public FilterCategory[] newArray(int size) {
             return new FilterCategory[size];
         }

api/src/com/todoroo/astrid/api/FilterCategoryWithNewButton.java

@@ -78,6 +78,7 @@ public class FilterCategoryWithNewButton extends FilterCategory {
         /**
          * {@inheritDoc}
          */
+        @Override
         public FilterCategoryWithNewButton createFromParcel(Parcel source) {
             FilterCategoryWithNewButton item = new FilterCategoryWithNewButton();
             item.readFromParcel(source);
@@ -102,6 +103,7 @@ public class FilterCategoryWithNewButton extends FilterCategory {
         /**
          * {@inheritDoc}
          */
+        @Override
         public FilterCategoryWithNewButton[] newArray(int size) {
             return new FilterCategoryWithNewButton[size];
         }

api/src/com/todoroo/astrid/api/FilterListHeader.java

@@ -38,6 +38,7 @@ public class FilterListHeader extends FilterListItem {
 
     // --- parcelable
 
+    @Override
     public int describeContents() {
         return 0;
     }
@@ -49,12 +50,14 @@ public class FilterListHeader extends FilterListItem {
 
     public static final Parcelable.Creator<FilterListHeader> CREATOR = new Parcelable.Creator<FilterListHeader>() {
 
+        @Override
         public FilterListHeader createFromParcel(Parcel source) {
             FilterListHeader item = new FilterListHeader();
             item.readFromParcel(source);
             return item;
         }
 
+        @Override
         public FilterListHeader[] newArray(int size) {
             return new FilterListHeader[size];
         }

api/src/com/todoroo/astrid/api/FilterListItem.java

@@ -51,6 +51,7 @@ abstract public class FilterListItem implements Parcelable {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void writeToParcel(Parcel dest, int flags) {
         dest.writeString(listingTitle);
         dest.writeParcelable(listingIcon, 0);

api/src/com/todoroo/astrid/api/FilterWithCustomIntent.java

@@ -93,6 +93,7 @@ public class FilterWithCustomIntent extends Filter {
         /**
          * {@inheritDoc}
          */
+        @Override
         public FilterWithCustomIntent createFromParcel(Parcel source) {
             FilterWithCustomIntent item = new FilterWithCustomIntent();
             item.readFromParcel(source);
@@ -102,6 +103,7 @@ public class FilterWithCustomIntent extends Filter {
         /**
          * {@inheritDoc}
          */
+        @Override
         public FilterWithCustomIntent[] newArray(int size) {
             return new FilterWithCustomIntent[size];
         }

api/src/com/todoroo/astrid/api/FilterWithUpdate.java

@@ -74,6 +74,7 @@ public class FilterWithUpdate extends FilterWithCustomIntent {
         /**
          * {@inheritDoc}
          */
+        @Override
         public FilterWithUpdate createFromParcel(Parcel source) {
             FilterWithUpdate item = new FilterWithUpdate();
             item.readFromParcel(source);
@@ -83,6 +84,7 @@ public class FilterWithUpdate extends FilterWithCustomIntent {
         /**
          * {@inheritDoc}
          */
+        @Override
         public FilterWithUpdate[] newArray(int size) {
             return new FilterWithUpdate[size];
         }

api/src/com/todoroo/astrid/api/IntentFilter.java

@@ -48,6 +48,7 @@ public final class IntentFilter extends FilterListItem implements Parcelable {
     /**
      * {@inheritDoc}
      */
+    @Override
     public int describeContents() {
         return 0;
     }
@@ -69,6 +70,7 @@ public final class IntentFilter extends FilterListItem implements Parcelable {
         /**
          * {@inheritDoc}
          */
+        @Override
         public IntentFilter createFromParcel(Parcel source) {
             IntentFilter item = new IntentFilter((PendingIntent) source.readParcelable(
                     PendingIntent.class.getClassLoader()));
@@ -79,6 +81,7 @@ public final class IntentFilter extends FilterListItem implements Parcelable {
         /**
          * {@inheritDoc}
          */
+        @Override
         public IntentFilter[] newArray(int size) {
             return new IntentFilter[size];
         }

api/src/com/todoroo/astrid/api/MultipleSelectCriterion.java

@@ -63,6 +63,7 @@ public class MultipleSelectCriterion extends CustomFilterCriterion implements Pa
     /**
      * {@inheritDoc}
      */
+    @Override
     public int describeContents() {
         return 0;
     }
@@ -70,6 +71,7 @@ public class MultipleSelectCriterion extends CustomFilterCriterion implements Pa
     /**
      * {@inheritDoc}
      */
+    @Override
     public void writeToParcel(Parcel dest, int flags) {
         dest.writeStringArray(entryTitles);
         dest.writeStringArray(entryValues);
@@ -84,6 +86,7 @@ public class MultipleSelectCriterion extends CustomFilterCriterion implements Pa
         /**
          * {@inheritDoc}
          */
+        @Override
         public MultipleSelectCriterion createFromParcel(Parcel source) {
             MultipleSelectCriterion item = new MultipleSelectCriterion();
             item.entryTitles = source.createStringArray();
@@ -95,6 +98,7 @@ public class MultipleSelectCriterion extends CustomFilterCriterion implements Pa
         /**
          * {@inheritDoc}
          */
+        @Override
         public MultipleSelectCriterion[] newArray(int size) {
             return new MultipleSelectCriterion[size];
         }

api/src/com/todoroo/astrid/api/SyncAction.java

@@ -73,6 +73,7 @@ public class SyncAction implements Parcelable {
     /**
      * {@inheritDoc}
      */
+    @Override
     public int describeContents() {
         return 0;
     }
@@ -80,6 +81,7 @@ public class SyncAction implements Parcelable {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void writeToParcel(Parcel dest, int flags) {
         dest.writeString(label);
         dest.writeParcelable(intent, 0);
@@ -92,6 +94,7 @@ public class SyncAction implements Parcelable {
         /**
          * {@inheritDoc}
          */
+        @Override
         public SyncAction createFromParcel(Parcel source) {
             return new SyncAction(source.readString(), (PendingIntent)source.readParcelable(
                     PendingIntent.class.getClassLoader()));
@@ -100,6 +103,7 @@ public class SyncAction implements Parcelable {
         /**
          * {@inheritDoc}
          */
+        @Override
         public SyncAction[] newArray(int size) {
             return new SyncAction[size];
         };

api/src/com/todoroo/astrid/api/TaskDecoration.java

@@ -61,6 +61,7 @@ public final class TaskDecoration implements Parcelable {
     /**
      * {@inheritDoc}
      */
+    @Override
     public int describeContents() {
         return 0;
     }
@@ -68,6 +69,7 @@ public final class TaskDecoration implements Parcelable {
     /**
      * {@inheritDoc}
      */
+    @Override
     public void writeToParcel(Parcel dest, int flags) {
         dest.writeParcelable(decoration, 0);
         dest.writeInt(position);
@@ -81,6 +83,7 @@ public final class TaskDecoration implements Parcelable {
         /**
          * {@inheritDoc}
          */
+        @Override
         public TaskDecoration createFromParcel(Parcel source) {
             return new TaskDecoration((RemoteViews)source.readParcelable(
                     RemoteViews.class.getClassLoader()),
@@ -90,6 +93,7 @@ public final class TaskDecoration implements Parcelable {
         /**
          * {@inheritDoc}
          */
+        @Override
         public TaskDecoration[] newArray(int size) {
             return new TaskDecoration[size];
         };

api/src/com/todoroo/astrid/api/TextInputCriterion.java

@@ -64,6 +64,7 @@ public class TextInputCriterion extends CustomFilterCriterion implements Parcela
     /**
      * {@inheritDoc}
      */
+    @Override
     public int describeContents() {
         return 0;
     }
@@ -71,6 +72,7 @@ public class TextInputCriterion extends CustomFilterCriterion implements Parcela
     /**
      * {@inheritDoc}
      */
+    @Override
     public void writeToParcel(Parcel dest, int flags) {
         dest.writeString(prompt);
         dest.writeString(hint);
@@ -85,6 +87,7 @@ public class TextInputCriterion extends CustomFilterCriterion implements Parcela
         /**
          * {@inheritDoc}
          */
+        @Override
         public TextInputCriterion createFromParcel(Parcel source) {
             TextInputCriterion item = new TextInputCriterion();
             item.prompt = source.readString();
@@ -96,6 +99,7 @@ public class TextInputCriterion extends CustomFilterCriterion implements Parcela
         /**
          * {@inheritDoc}
          */
+        @Override
         public TextInputCriterion[] newArray(int size) {
             return new TextInputCriterion[size];
         }

api/src/com/todoroo/astrid/core/SearchFilter.java

@@ -40,6 +40,7 @@ public class SearchFilter extends FilterListItem {
     /**
      * {@inheritDoc}
      */
+    @Override
     public int describeContents() {
         return 0;
     }
@@ -60,6 +61,7 @@ public class SearchFilter extends FilterListItem {
         /**
          * {@inheritDoc}
          */
+        @Override
         public SearchFilter createFromParcel(Parcel source) {
             SearchFilter item = new SearchFilter();
             item.readFromParcel(source);
@@ -69,6 +71,7 @@ public class SearchFilter extends FilterListItem {
         /**
          * {@inheritDoc}
          */
+        @Override
         public SearchFilter[] newArray(int size) {
             return new SearchFilter[size];
         }

api/src/com/todoroo/astrid/sync/SyncProvider.java

@@ -185,6 +185,7 @@ public abstract class SyncProvider<TYPE extends SyncContainer> {
 
             // start next step in background thread
             new Thread(new Runnable() {
+                @Override
                 public void run() {
                     try {
                         initiateBackground();
@@ -274,6 +275,7 @@ public abstract class SyncProvider<TYPE extends SyncContainer> {
                 }
                 return SENTINEL;
             }
+            @Override
             public int compare(TYPE o1, TYPE o2) {
                 int comparison = check(o1, o2, Task.DELETION_DATE);
                 if(comparison != SENTINEL) {

api/src/com/todoroo/astrid/sync/SyncProviderPreferences.java

@@ -170,6 +170,7 @@ abstract public class SyncProviderPreferences extends TodorooPreferenceActivity
             preference.setSummary(r.getString(R.string.sync_SPr_status_subtitle, status));
 
             preference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+                @Override
                 public boolean onPreferenceClick(Preference p) {
                     startSync();
                     return true;
@@ -224,6 +225,7 @@ abstract public class SyncProviderPreferences extends TodorooPreferenceActivity
         else if (r.getString(R.string.sync_SPr_forget_key).equals(preference.getKey())) {
             boolean loggedIn = getUtilities().isLoggedIn();
             preference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+                @Override
                 public boolean onPreferenceClick(Preference p) {
                     DialogUtilities.okCancelDialog(SyncProviderPreferences.this,
                             r.getString(R.string.sync_forget_confirm), new OnClickListener() {

astrid/common-src/com/commonsware/cwac/tlv/TouchListView.java

@@ -417,7 +417,8 @@ public class TouchListView extends ErrorCatchingListView {
 	}
 
 	private final Runnable longPressRunnable = new Runnable() {
-	    public void run() {
+	    @Override
+        public void run() {
 	        AndroidUtilities.sleepDeep(1000L);
 	        if(Thread.currentThread().isInterrupted()) {
                 return;
@@ -426,7 +427,8 @@ public class TouchListView extends ErrorCatchingListView {
 	        if(mDragView != null && mDragPos == mFirstDragPos &&
                     Math.abs(mDragCurrentX - mDragStartX) < 10) {
 	            post(new Runnable() {
-	                public void run() {
+	                @Override
+                    public void run() {
 	                    stopDragging(null);
 	                    mClickListener.onLongClick(mOriginalView);
 	                    invalidate();

astrid/common-src/com/localytics/android/ExceptionHandler.java

@@ -15,6 +15,7 @@ import android.util.Log;
  */
 /* package */final class ExceptionHandler implements Thread.UncaughtExceptionHandler
 {
+    @Override
     public void uncaughtException(final Thread thread, final Throwable throwable)
     {
         /*

astrid/common-src/com/localytics/android/LocalyticsSession.java

@@ -1745,6 +1745,7 @@ public final class LocalyticsSession
             {
                 mProvider.runBatchTransaction(new Runnable()
                 {
+                    @Override
                     public void run()
                     {
                         preUploadBuildBlobs();
@@ -1885,6 +1886,7 @@ public final class LocalyticsSession
                             {
                                 mProvider.runBatchTransaction(new Runnable()
                                 {
+                                    @Override
                                     public void run()
                                     {
                                         deleteBlobsAndSessions(mProvider);

astrid/plugin-src/com/todoroo/astrid/actfm/ActFmGoogleAuthActivity.java

@@ -102,6 +102,7 @@ public class ActFmGoogleAuthActivity extends ListActivity {
 
     private void getAuthToken(final Account a, final ProgressDialog pd) {
         AccountManagerCallback<Bundle> callback = new AccountManagerCallback<Bundle>() {
+            @Override
             public void run(final AccountManagerFuture<Bundle> future) {
                 new Thread() {
                     @Override

astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java

@@ -407,6 +407,7 @@ public class ActFmLoginActivity extends SherlockFragmentActivity {
     };
 
     protected final OnClickListener signInListener = new OnClickListener() {
+        @Override
         public void onClick(View v) {
             final LinearLayout body = new LinearLayout(ActFmLoginActivity.this);
             body.setOrientation(LinearLayout.VERTICAL);
@@ -602,6 +603,7 @@ public class ActFmLoginActivity extends SherlockFragmentActivity {
                         constructOutstandingTables();
                     }
                     runOnUiThread(new Runnable() {
+                        @Override
                         public void run() {
                             DialogUtilities.dismissDialog(ActFmLoginActivity.this, progressDialog);
                             progressDialog = null;
@@ -612,6 +614,7 @@ public class ActFmLoginActivity extends SherlockFragmentActivity {
                     handleError(e);
                 } finally {
                     runOnUiThread(new Runnable() {
+                        @Override
                         public void run() {
                             if (progressDialog != null) {
                                 DialogUtilities.dismissDialog(ActFmLoginActivity.this, progressDialog);
@@ -813,6 +816,7 @@ public class ActFmLoginActivity extends SherlockFragmentActivity {
                 if (!TaskListMetadata.taskIdsIsEmpty(taskIds)) {
                     Node root = AstridOrderedListUpdater.buildTreeModel(taskIds, null);
                     SubtasksHelper.remapTree(root, uuidTaskMap, new TreeRemapHelper<String>() {
+                        @Override
                         public String getKeyFromOldUuid(String uuid) {
                             return uuid; // Old uuids are the keys
                         }

astrid/plugin-src/com/todoroo/astrid/actfm/ActFmPreferences.java

@@ -173,6 +173,7 @@ public class ActFmPreferences extends SyncProviderPreferences {
             }
         } else if (r.getString(R.string.sync_SPr_forget_key).equals(preference.getKey())) {
             preference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+                @Override
                 public boolean onPreferenceClick(Preference p) {
                     DialogUtilities.okCancelDialog(ActFmPreferences.this,
                             r.getString(R.string.sync_forget_confirm), new OnClickListener() {

astrid/plugin-src/com/todoroo/astrid/actfm/CommentsFragment.java

@@ -301,6 +301,7 @@ public abstract class CommentsFragment extends SherlockListFragment {
             footerView.setText(R.string.TEA_load_more);
             footerView.setBackgroundColor(Color.alpha(0));
             footerView.setOnClickListener(new View.OnClickListener() {
+                @Override
                 public void onClick(View v) {
                     int historyCount = 0;
                     Cursor c = updateAdapter.getCursor();

astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java

@@ -410,6 +410,7 @@ public class TagViewFragment extends TaskListFragment {
                                             R.string.actfm_tag_not_authorized_leave_list,
                                             android.R.drawable.ic_dialog_alert,
                                             new DialogInterface.OnClickListener() {
+                                                @Override
                                                 public void onClick(DialogInterface dialog, int which) {
                                                     String oldUuid = tagData.getUuid();
                                                     tagData.setValue(TagData.DELETION_DATE, DateUtilities.now());

astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java

@@ -97,6 +97,7 @@ public class ActFmSyncV2Provider extends SyncV2Provider {
             final SyncResultCallback callback) {
 
         new Thread(new Runnable() {
+            @Override
             public void run() {
 
                 updateUserStatus();

astrid/plugin-src/com/todoroo/astrid/alarms/AlarmControlSet.java

@@ -137,6 +137,7 @@ public final class AlarmControlSet extends TaskEditControlSet {
         ImageButton reminderRemoveButton;
         reminderRemoveButton = (ImageButton)alertItem.findViewById(R.id.button1);
         reminderRemoveButton.setOnClickListener(new View.OnClickListener() {
+            @Override
             public void onClick(View v) {
                 alertsContainer.removeView(alertItem);
             }

astrid/plugin-src/com/todoroo/astrid/backup/BackupPreferences.java

@@ -125,6 +125,7 @@ public class BackupPreferences extends TodorooPreferenceActivity {
                 subtitle = r.getString(R.string.backup_status_failed_subtitle);
                 statusColor = Color.rgb(100, 0, 0);
                 preference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+                    @Override
                     public boolean onPreferenceClick(Preference p) {
                         DialogUtilities.okDialog(BackupPreferences.this, error, null);
                         return true;

astrid/plugin-src/com/todoroo/astrid/backup/BackupService.java

@@ -160,6 +160,7 @@ public class BackupService extends Service {
     }
 
     private BackupDirectorySetting backupDirectorySetting = new BackupDirectorySetting() {
+        @Override
         public File getBackupDirectory() {
             return BackupConstants.defaultExportDirectory();
         }

astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlExporter.java

@@ -82,6 +82,7 @@ public class TasksXmlExporter {
 
     private void setProgress(final int taskNumber, final int total) {
         handler.post(new Runnable() {
+            @Override
             public void run() {
                 progressDialog.setMax(total);
                 progressDialog.setProgress(taskNumber);

astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlImporter.java

@@ -84,6 +84,7 @@ public class TasksXmlImporter {
 
     private void setProgressMessage(final String message) {
         handler.post(new Runnable() {
+            @Override
             public void run() {
                 progressDialog.setMessage(message);
             }
@@ -188,6 +189,7 @@ public class TasksXmlImporter {
         builder.setMessage(message);
         builder.setPositiveButton(context.getString(android.R.string.ok),
                 new DialogInterface.OnClickListener() {
+                    @Override
                     public void onClick(DialogInterface dialog, int id) {
                         dialog.dismiss();
                         if (runAfterImport != null) {

astrid/plugin-src/com/todoroo/astrid/core/CustomFilterActivity.java

@@ -545,6 +545,7 @@ public class CustomFilterActivity extends SherlockFragmentActivity {
             final CriterionInstance instance = new CriterionInstance();
             instance.criterion = criterion;
             adapter.showOptionsFor(instance, new Runnable() {
+                @Override
                 public void run() {
                     adapter.add(instance);
                     updateList();

astrid/plugin-src/com/todoroo/astrid/core/OldTaskPreferences.java

@@ -65,6 +65,7 @@ public class OldTaskPreferences extends TodorooPreferenceActivity {
         // Extended prefs
         Preference preference = screen.findPreference(getString(R.string.EPr_manage_delete_completed));
         preference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+            @Override
             public boolean onPreferenceClick(Preference p) {
                 showDeleteCompletedDialog();
                 return true;
@@ -82,6 +83,7 @@ public class OldTaskPreferences extends TodorooPreferenceActivity {
 
         preference = screen.findPreference(getString(R.string.EPr_manage_purge_deleted));
         preference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+            @Override
             public boolean onPreferenceClick(Preference p) {
                 showPurgeDeletedDialog();
                 return true;
@@ -90,6 +92,7 @@ public class OldTaskPreferences extends TodorooPreferenceActivity {
 
         preference = screen.findPreference(getString(R.string.EPr_manage_delete_completed_gcal));
         preference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+            @Override
             public boolean onPreferenceClick(Preference p) {
                 showDeleteCompletedEventsDialog();
                 return true;
@@ -98,6 +101,7 @@ public class OldTaskPreferences extends TodorooPreferenceActivity {
 
         preference = screen.findPreference(getString(R.string.EPr_manage_delete_all_gcal));
         preference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+            @Override
             public boolean onPreferenceClick(Preference p) {
                 showDeleteAllEventsDialog();
                 return true;
@@ -106,6 +110,7 @@ public class OldTaskPreferences extends TodorooPreferenceActivity {
 
         preference= screen.findPreference(getString(R.string.EPr_manage_clear_all));
         preference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+            @Override
             public boolean onPreferenceClick(Preference p) {
                 showClearDataDialog();
                 return true;

astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListFragment.java

@@ -164,6 +164,7 @@ public class GtasksListFragment extends SubtasksListFragment {
                 Activity activity = getActivity();
                 if (activity != null) {
                     activity.runOnUiThread(new Runnable() {
+                        @Override
                         public void run() {
                             loadTaskListContent(true);
                         }

astrid/plugin-src/com/todoroo/astrid/gtasks/auth/AccountChooser.java

@@ -77,6 +77,7 @@ public class AccountChooser {
     builder.setCancelable(false);
     builder.setPositiveButton(android.R.string.ok,
         new DialogInterface.OnClickListener() {
+      @Override
       public void onClick(DialogInterface dialog, int which) {
         selectedAccount = accounts[selectedAccountIndex];
         handler.handleAccountSelected(selectedAccount);
@@ -84,6 +85,7 @@ public class AccountChooser {
     });
     builder.setNegativeButton(android.R.string.cancel,
         new DialogInterface.OnClickListener() {
+      @Override
       public void onClick(DialogInterface dialog, int which) {
         handler.handleAccountSelected(null);
       }
@@ -112,6 +114,7 @@ public class AccountChooser {
     builder.setCancelable(true);
     builder.setNegativeButton(android.R.string.ok,
         new DialogInterface.OnClickListener() {
+          @Override
           public void onClick(DialogInterface dialog, int which) {
             handler.handleAccountSelected(null);
           }

astrid/plugin-src/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java

@@ -116,6 +116,7 @@ public class GtasksLoginActivity extends ListActivity {
 
     private void getAuthToken(Account a, final ProgressDialog pd) {
         AccountManagerCallback<Bundle> callback = new AccountManagerCallback<Bundle>() {
+            @Override
             public void run(final AccountManagerFuture<Bundle> future) {
                 new Thread() {
                     @Override

astrid/plugin-src/com/todoroo/astrid/gtasks/auth/ModernAuthManager.java

@@ -89,6 +89,7 @@ public class ModernAuthManager implements AuthManager {
    *        has been successfully fetched and is available via
    *        {@link #getAuthToken()}
    */
+  @Override
   @SuppressWarnings("nls")
   public void doLogin(final Runnable runnable, Object o) {
     this.whenFinished = runnable;
@@ -98,6 +99,7 @@ public class ModernAuthManager implements AuthManager {
     Account account = (Account) o;
     accountManager.getAuthToken(account, service, true,
             new AccountManagerCallback<Bundle>() {
+        @Override
         public void run(AccountManagerFuture<Bundle> future) {
           try {
             Bundle result = future.getResult();
@@ -147,6 +149,7 @@ public class ModernAuthManager implements AuthManager {
    *         the auth token, or False if there was an error or the request was
    *         canceled
    */
+  @Override
   @SuppressWarnings("nls")
   public boolean authResult(int resultCode, Intent results) {
     if (results != null) {
@@ -167,6 +170,7 @@ public class ModernAuthManager implements AuthManager {
    * @return The current auth token or null if no auth token has been
    *         fetched
    */
+  @Override
   public String getAuthToken() {
     return authToken;
   }
@@ -179,10 +183,12 @@ public class ModernAuthManager implements AuthManager {
    * @param runnable A {@link Runnable} to execute when a new auth token
    *        is successfully fetched
    */
+  @Override
   public void invalidateAndRefresh(final Runnable runnable) {
     this.whenFinished = runnable;
 
     activity.runOnUiThread(new Runnable() {
+      @Override
       public void run() {
         accountManager.invalidateAuthToken("com.google", authToken); //$NON-NLS-1$
         new AccountChooser().chooseAccount(activity,

astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java

@@ -104,6 +104,7 @@ public final class GtasksSyncService {
         new OperationPushThread(operationQueue).start();
 
         taskDao.addListener(new ModelUpdateListener<Task>() {
+            @Override
             public void onModelUpdated(final Task model, boolean outstandingEntries) {
                 if(model.checkAndClearTransitory(SyncFlags.GTASKS_SUPPRESS_SYNC)) {
                     return;

astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java

@@ -155,6 +155,7 @@ public class GtasksSyncV2Provider extends SyncV2Provider {
         gtasksPreferenceService.recordSyncStart();
 
         new Thread(new Runnable() {
+            @Override
             public void run() {
                 callback.incrementProgress(50);
                 String authToken = getValidatedAuthToken();
@@ -240,6 +241,7 @@ public class GtasksSyncV2Provider extends SyncV2Provider {
         callback.incrementMax(100);
 
         new Thread(new Runnable() {
+            @Override
             public void run() {
                 callback.incrementProgress(50);
                 try {

astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java

@@ -404,6 +404,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
             loadMore.setTextColor(activity.getResources().getColor(R.color.task_edit_deadline_gray));
             loadMore.setBackgroundColor(Color.alpha(0));
             loadMore.setOnClickListener(new View.OnClickListener() {
+                @Override
                 public void onClick(View v) {
                     // Perform action on click
                     commentItems += 10;

astrid/plugin-src/com/todoroo/astrid/people/PersonViewFragment.java

@@ -227,6 +227,7 @@ public class PersonViewFragment extends TaskListFragment {
                     Activity activity = getActivity();
                     if (activity != null) {
                         activity.runOnUiThread(new Runnable() {
+                            @Override
                             public void run() {
                                 reloadUserData();
                                 refresh();

astrid/plugin-src/com/todoroo/astrid/reminders/ReminderDebugContextActions.java

@@ -28,6 +28,7 @@ public class ReminderDebugContextActions {
             return null;
         }
 
+        @Override
         public void invoke(Task task) {
             AlarmScheduler original = ReminderService.getInstance().getScheduler();
             ReminderService.getInstance().setScheduler(new AlarmScheduler() {
@@ -52,6 +53,7 @@ public class ReminderDebugContextActions {
 
     public static class MakeNotification implements TaskContextActionExposer {
 
+        @Override
         public Object getLabel(Task task) {
             if (Constants.DEBUG) {
                 return "when alarm?"; //$NON-NLS-1$
@@ -59,6 +61,7 @@ public class ReminderDebugContextActions {
             return null;
         }
 
+        @Override
         public void invoke(Task task) {
             new Notifications().showTaskNotification(task.getId(),
                         ReminderService.TYPE_SNOOZE, "test reminder");

astrid/plugin-src/com/todoroo/astrid/reminders/ReminderService.java

@@ -467,6 +467,7 @@ public final class ReminderService  {
          * @param type
          * @param flags
          */
+        @Override
         @SuppressWarnings("nls")
         public void createAlarm(Task task, long time, int type) {
             if(task.getId() == Task.NO_ID) {

astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java

@@ -306,6 +306,7 @@ public class RepeatControlSet extends PopupControlSet {
 
         // set up listeners
         value.setOnClickListener(new View.OnClickListener() {
+            @Override
             public void onClick(View v) {
                 repeatValueClick();
             }

astrid/plugin-src/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java

@@ -80,6 +80,7 @@ public class AstridOrderedListFragmentHelper<LIST> implements OrderedListFragmen
         return tlv;
     }
 
+    @Override
     public void setUpUiComponents() {
         TypedValue tv = new TypedValue();
         getActivity().getTheme().resolveAttribute(R.attr.asThemeTextColor, tv, false);
@@ -112,6 +113,7 @@ public class AstridOrderedListFragmentHelper<LIST> implements OrderedListFragmen
         Preferences.setInt(AstridPreferences.P_SUBTASKS_HELP, 1);
     }
 
+    @Override
     public void beforeSetUpTaskList(Filter filter) {
         updater.initialize(list, filter);
     }
@@ -188,6 +190,7 @@ public class AstridOrderedListFragmentHelper<LIST> implements OrderedListFragmen
         }
     };
 
+    @Override
     public TaskAdapter createTaskAdapter(TodorooCursor<Task> cursor,
             AtomicReference<String> sqlQueryTemplate) {
 
@@ -318,6 +321,7 @@ public class AstridOrderedListFragmentHelper<LIST> implements OrderedListFragmen
         this.list = list;
     }
 
+    @Override
     public void onCreateTask(Task task) {
         updater.onCreateTask(list, getFilter(), task.getUuid());
         fragment.reconstructCursor();
@@ -325,6 +329,7 @@ public class AstridOrderedListFragmentHelper<LIST> implements OrderedListFragmen
         fragment.selectCustomId(task.getId());
     }
 
+    @Override
     public void onDeleteTask(Task task) {
         updater.onDeleteTask(list, getFilter(), task.getUuid());
         taskAdapter.notifyDataSetInvalidated();

astrid/plugin-src/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java

@@ -84,6 +84,7 @@ public class OrderedMetadataListFragmentHelper<LIST> implements OrderedListFragm
         return tlv;
     }
 
+    @Override
     public void setUpUiComponents() {
         TypedValue tv = new TypedValue();
         getActivity().getTheme().resolveAttribute(R.attr.asThemeTextColor, tv, false);
@@ -116,10 +117,12 @@ public class OrderedMetadataListFragmentHelper<LIST> implements OrderedListFragm
         Preferences.setInt(AstridPreferences.P_SUBTASKS_HELP, 1);
     }
 
+    @Override
     public void beforeSetUpTaskList(Filter filter) {
         updater.initialize(list, filter);
     }
 
+    @Override
     public Property<?>[] taskProperties() {
         Property<?>[] baseProperties = TaskAdapter.PROPERTIES;
         if (Preferences.getIntegerFromString(R.string.p_taskRowStyle_v2, 0) == 2) {
@@ -202,6 +205,7 @@ public class OrderedMetadataListFragmentHelper<LIST> implements OrderedListFragm
         }
     };
 
+    @Override
     public TaskAdapter createTaskAdapter(TodorooCursor<Task> cursor,
             AtomicReference<String> sqlQueryTemplate) {
 
@@ -315,6 +319,7 @@ public class OrderedMetadataListFragmentHelper<LIST> implements OrderedListFragm
         //
     }
 
+    @Override
     public void onDeleteTask(Task task) {
         updater.onDeleteTask(getFilter(), list, task.getId());
         taskAdapter.notifyDataSetInvalidated();

astrid/plugin-src/com/todoroo/astrid/subtasks/OrderedMetadataListUpdater.java

@@ -385,6 +385,7 @@ abstract public class OrderedMetadataListUpdater<LIST> {
 
     public void debugPrint(Filter filter, LIST list) {
         iterateThroughList(filter, list, new OrderedListIterator() {
+            @Override
             public void processTask(long taskId, Metadata metadata) {
                 System.err.format("id %d: order %d, indent:%d, parent:%d\n", taskId, //$NON-NLS-1$
                         metadata.getValue(orderProperty()),

astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksHelper.java

@@ -169,6 +169,7 @@ public class SubtasksHelper {
 
     private static void remapLocalTreeToRemote(Node root, HashMap<Long, String> idMap) {
         remapTree(root, idMap, new TreeRemapHelper<Long>() {
+            @Override
             public Long getKeyFromOldUuid(String uuid) {
                 Long localId = -1L;
                 try {

astrid/plugin-src/com/todoroo/astrid/tags/TagsControlSet.java

@@ -207,6 +207,7 @@ public final class TagsControlSet extends PopupControlSet {
         ImageButton reminderRemoveButton;
         reminderRemoveButton = (ImageButton)tagItem.findViewById(R.id.button1);
         reminderRemoveButton.setOnClickListener(new View.OnClickListener() {
+            @Override
             public void onClick(View v) {
                 TextView lastView = getLastTextView();
                 if(lastView == textView && textView.getText().length() == 0) {

astrid/plugin-src/com/todoroo/astrid/timers/TimerActionControlSet.java

@@ -100,6 +100,7 @@ public class TimerActionControlSet extends TaskEditControlSet {
             chronometer.setBase(SystemClock.elapsedRealtime() - elapsed);
             if (elapsed > DateUtilities.ONE_DAY) {
                 chronometer.setOnChronometerTickListener(new OnChronometerTickListener() {
+                    @Override
                     public void onChronometerTick(Chronometer cArg) {
                         long t = SystemClock.elapsedRealtime() - cArg.getBase();
                         cArg.setText(DateFormat.format("d'd' h:mm", t)); //$NON-NLS-1$

astrid/src-legacy/com/timsu/astrid/data/LegacyAbstractController.java

@@ -62,10 +62,12 @@ abstract public class LegacyAbstractController {
             this.cls = cls;
         }
 
+        @Override
         public boolean hasNext() {
             return !cursor.isLast();
         }
 
+        @Override
         public TYPE next() {
             try {
                 TYPE model = cls.getConstructor(Cursor.class).newInstance(cursor);
@@ -90,6 +92,7 @@ abstract public class LegacyAbstractController {
             return null;
         }
 
+        @Override
         public void remove() {
             throw new UnsupportedOperationException("Can't remove this way");
         }

astrid/src/com/commonsware/cwac/merge/MergeSpinnerAdapter.java

@@ -40,6 +40,7 @@ public class MergeSpinnerAdapter extends MergeAdapter {
    * @see android.widget.BaseAdapter#getDropDownView(int,
    * android.view.View, android.view.ViewGroup)
    */
+  @Override
   public View getDropDownView(int position, View convertView,
                               ViewGroup parent) {
     for (ListAdapter piece : pieces) {
@@ -64,6 +65,7 @@ public class MergeSpinnerAdapter extends MergeAdapter {
    * @param view
    *          Single view to add
    */
+  @Override
   public void addView(View view) {
     throw new RuntimeException("Not supported with MergeSpinnerAdapter");
   }
@@ -77,6 +79,7 @@ public class MergeSpinnerAdapter extends MergeAdapter {
    * @param enabled
    *          false if views are disabled, true if enabled
    */
+  @Override
   public void addView(View view, boolean enabled) {
     throw new RuntimeException("Not supported with MergeSpinnerAdapter");
   }
@@ -88,6 +91,7 @@ public class MergeSpinnerAdapter extends MergeAdapter {
    * @param views
    *          List of views to add
    */
+  @Override
   public void addViews(List<View> views) {
     throw new RuntimeException("Not supported with MergeSpinnerAdapter");
   }
@@ -101,6 +105,7 @@ public class MergeSpinnerAdapter extends MergeAdapter {
    * @param enabled
    *          false if views are disabled, true if enabled
    */
+  @Override
   public void addViews(List<View> views, boolean enabled) {
     throw new RuntimeException("Not supported with MergeSpinnerAdapter");
   }

astrid/src/com/todoroo/astrid/activity/AstridActivity.java

@@ -145,6 +145,7 @@ public class AstridActivity extends SherlockFragmentActivity
     /**
      * Handles items being clicked from the filterlist-fragment. Return true if item is handled.
      */
+    @Override
     public boolean onFilterItemClicked(FilterListItem item) {
         if (this instanceof TaskListActivity && (item instanceof Filter) ) {
             ((TaskListActivity) this).setSelectedItem((Filter) item);

astrid/src/com/todoroo/astrid/activity/EditPreferences.java

@@ -168,6 +168,7 @@ public class EditPreferences extends TodorooPreferenceActivity {
         // first-order preferences
         Preference preference = screen.findPreference(getString(R.string.p_about));
         preference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+            @Override
             public boolean onPreferenceClick(Preference p) {
                 showAbout();
                 return true;
@@ -430,6 +431,7 @@ public class EditPreferences extends TodorooPreferenceActivity {
         Preference preference = new Preference(this);
         preference.setTitle("Flush detail cache");
         preference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+            @Override
             public boolean onPreferenceClick(Preference p) {
                 database.openForWriting();
                 Toast.makeText(EditPreferences.this, "" + taskService.clearDetails(Criterion.all),
@@ -442,6 +444,7 @@ public class EditPreferences extends TodorooPreferenceActivity {
         preference = new Preference(this);
         preference.setTitle("Make Lots of Tasks");
         preference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+            @Override
             public boolean onPreferenceClick(Preference p) {
                 database.openForWriting();
                 Task task = new Task();
@@ -459,6 +462,7 @@ public class EditPreferences extends TodorooPreferenceActivity {
         preference = new Preference(this);
         preference.setTitle("Delete all tasks");
         preference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+            @Override
             public boolean onPreferenceClick(Preference p) {
                 database.openForWriting();
                 taskService.deleteWhere(Criterion.all);
@@ -471,6 +475,7 @@ public class EditPreferences extends TodorooPreferenceActivity {
         preference = new Preference(this);
         preference.setTitle("Make lots of contacts");
         preference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
+            @Override
             public boolean onPreferenceClick(Preference p) {
                 ContactListAdapter.makeLotsOfContacts();
                 DialogUtilities.okDialog(EditPreferences.this, "done", null);

astrid/src/com/todoroo/astrid/activity/ExpandableListFragment.java

@@ -34,6 +34,7 @@ public class ExpandableListFragment extends Fragment
     final private Handler mHandler = new Handler();
 
     final private Runnable mRequestFocus = new Runnable() {
+        @Override
         public void run() {
             mList.focusableViewAvailable(mList);
         }
@@ -41,6 +42,7 @@ public class ExpandableListFragment extends Fragment
 
     final private AdapterView.OnItemClickListener mOnClickListener
             = new AdapterView.OnItemClickListener() {
+        @Override
         public void onItemClick(AdapterView<?> parent, View v, int position, long id) {
             onListItemClick((ListView)parent, v, position, id);
         }

astrid/src/com/todoroo/astrid/activity/FilterListFragment.java

@@ -443,6 +443,7 @@ public class FilterListFragment extends SherlockListFragment {
         .setView(frameLayout)
         .setIcon(android.R.drawable.ic_dialog_info)
         .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+            @Override
             public void onClick(DialogInterface dialog, int which) {
                 createShortcut.run();
             }

astrid/src/com/todoroo/astrid/activity/FilterShortcutActivity.java

@@ -47,6 +47,7 @@ public class FilterShortcutActivity extends ListActivity {
     }
 
     final View.OnClickListener mOnClickListener = new View.OnClickListener() {
+        @Override
         public void onClick(View v) {
             Filter filter = (Filter) adapter.getSelection();
             if (filter == null) {

astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java

@@ -732,6 +732,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
             }
 
             activity.runOnUiThread(new Runnable() {
+                @Override
                 public void run() {
                     onUiThread();
                 }
@@ -1140,6 +1141,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener {
                         R.string.DLG_delete_this_task_question).setIcon(
                                 android.R.drawable.ic_dialog_alert).setPositiveButton(
                                         android.R.string.ok, new DialogInterface.OnClickListener() {
+                                            @Override
                                             public void onClick(DialogInterface dialog, int which) {
                                                 TimerPlugin.updateTimer(getActivity(), model, false);
                                                 taskService.delete(model);

astrid/src/com/todoroo/astrid/activity/TaskListFragment.java

@@ -1134,6 +1134,7 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele
         if (!Preferences.getBoolean(R.string.p_showed_tap_task_help, false)) {
             quickAddBar.hideKeyboard();
             getListView().postDelayed(new Runnable() {
+                @Override
                 public void run() {
                     try {
                         if (taskAdapter != null && taskAdapter.getCount() > 0) {
@@ -1283,6 +1284,7 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele
                 R.string.DLG_delete_this_task_question).setIcon(
                 android.R.drawable.ic_dialog_alert).setPositiveButton(
                 android.R.string.ok, new DialogInterface.OnClickListener() {
+                    @Override
                     public void onClick(DialogInterface dialog, int which) {
                         onTaskDelete(task);
                         taskService.delete(task);

astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java

@@ -185,6 +185,7 @@ public class FilterAdapter extends ArrayAdapter<Filter> {
 
                     filterCounts.put(filter, size);
                     activity.runOnUiThread(new Runnable() {
+                        @Override
                         public void run() {
                             notifyDataSetChanged();
                         }
@@ -624,6 +625,7 @@ public class FilterAdapter extends ArrayAdapter<Filter> {
                                 public void onSendFinished(PendingIntent pendingIntent, Intent intent,
                                         int resultCode, String resultData, Bundle resultExtras) {
                                     activity.runOnUiThread(new Runnable() {
+                                        @Override
                                         public void run() {
                                             clear();
                                         }

astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java

@@ -870,6 +870,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
     private final ImageGetter detailImageGetter = new ImageGetter() {
         private final HashMap<Integer, Drawable> cache =
             new HashMap<Integer, Drawable>(3);
+        @Override
         @SuppressWarnings("nls")
         public Drawable getDrawable(String source) {
             int drawable = 0;
@@ -1038,6 +1039,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
     }
 
     protected final View.OnClickListener completeBoxListener = new View.OnClickListener() {
+        @Override
         public void onClick(View v) {
 
             int[] location = new int[2];

astrid/src/com/todoroo/astrid/helper/TaskListContextMenuExtensionLoader.java

@@ -46,6 +46,7 @@ public class TaskListContextMenuExtensionLoader {
 
     public void loadInNewThread(final Context context) {
         new Thread(new Runnable() {
+            @Override
             public void run() {
                 loadContextMenuIntents(context);
             }

astrid/src/com/todoroo/astrid/service/StartupService.java

@@ -231,6 +231,7 @@ public class StartupService {
 
         // perform startup activities in a background thread
         new Thread(new Runnable() {
+            @Override
             public void run() {
                 // start widget updating alarm
                 AlarmManager am = (AlarmManager)context.getSystemService(Context.ALARM_SERVICE);

astrid/src/com/todoroo/astrid/ui/CalendarView.java

@@ -187,6 +187,7 @@ public class CalendarView extends View {
         });
 
         final OnTouchListener swipeTouchListener = new OnTouchListener() {
+            @Override
             public boolean onTouch(View v, MotionEvent event) {
                 return swipeCalendarListener.onTouchEvent(event);
             }

astrid/src/com/todoroo/astrid/ui/CheckableImageView.java

@@ -35,10 +35,12 @@ public class CheckableImageView extends ImageView implements Checkable {
     private boolean mBroadcasting;
     private OnCheckedChangeListener mOnCheckedChangeListener;
 
+    @Override
     public void toggle() {
         setChecked(!mChecked);
     }
 
+    @Override
     @ViewDebug.ExportedProperty
     public boolean isChecked() {
         return mChecked;
@@ -49,6 +51,7 @@ public class CheckableImageView extends ImageView implements Checkable {
      *
      * @param checked true to check the button, false to uncheck it
      */
+    @Override
     public void setChecked(boolean checked) {
         if (mChecked != checked) {
             mChecked = checked;

astrid/src/com/todoroo/astrid/ui/DeadlineTimePickerDialog.java

@@ -143,6 +143,7 @@ public class DeadlineTimePickerDialog extends AlertDialog implements OnClickList
 
     }
 
+    @Override
     public void onClick(DialogInterface dialog, int which) {
         if (mCallback != null) {
             mTimePicker.clearFocus();
@@ -153,6 +154,7 @@ public class DeadlineTimePickerDialog extends AlertDialog implements OnClickList
         }
     }
 
+    @Override
     public void onTimeChanged(TimePicker view, int hourOfDay, int minute) {
         updateTitle();
     }

astrid/src/com/todoroo/astrid/ui/DraggableListView.java

@@ -333,6 +333,7 @@ public class DraggableListView extends ListView {
             this.ev = ev;
         }
 
+        @Override
         public void run() {
             try {
                 Thread.sleep(300L);
@@ -347,6 +348,7 @@ public class DraggableListView extends ListView {
                 Thread.sleep(1000L);
 
                 post(new Runnable() {
+                    @Override
                     public void run() {
                         stopDragging();
                         dragThread = null;

astrid/src/com/todoroo/astrid/ui/ImportanceControlSet.java

@@ -110,6 +110,7 @@ public class ImportanceControlSet extends TaskEditControlSet {
             button.setPadding(0, 1, 0, 0);
 
             button.setOnClickListener(new View.OnClickListener() {
+                @Override
                 public void onClick(View v) {
                     setImportance((Integer)button.getTag());
                 }

astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java

@@ -85,6 +85,7 @@ public class MainMenuPopover extends FragmentPopover implements InterceptTouchLi
         addFixedItems();
     }
 
+    @Override
     public boolean didInterceptTouch(KeyEvent event) {
         int keyCode = event.getKeyCode();
         if (!suppressNextKeyEvent) {

astrid/src/com/todoroo/astrid/ui/NNumberPickerDialog.java

@@ -99,6 +99,7 @@ public class NNumberPickerDialog extends AlertDialog implements OnClickListener
         }
     }
 
+    @Override
     public void onClick(DialogInterface dialog, int which) {
         if (mCallback != null) {
             int[] values = new int[pickers.size()];

astrid/src/com/todoroo/astrid/ui/NumberPicker.java

@@ -50,6 +50,7 @@ public class NumberPicker extends LinearLayout implements OnClickListener,
         final java.util.Formatter mFmt     = new java.util.Formatter(mBuilder);
         final Object[]            mArgs    = new Object[1];
 
+        @Override
         public String toString(int value) {
             mArgs[0] = value;
             mBuilder.delete(0, mBuilder.length());
@@ -65,6 +66,7 @@ public class NumberPicker extends LinearLayout implements OnClickListener,
 
     private final Handler  mHandler;
     private final Runnable mRunnable = new Runnable() {
+        @Override
         public void run() {
             if (mIncrement) {
                 changeCurrent(mCurrent + incrementBy, mSlideUpInAnimation, mSlideUpOutAnimation);
@@ -230,6 +232,7 @@ public class NumberPicker extends LinearLayout implements OnClickListener,
         mSpeed = speed;
     }
 
+    @Override
     public void onClick(View v) {
 
         /*
@@ -313,6 +316,7 @@ public class NumberPicker extends LinearLayout implements OnClickListener,
         updateView();
     }
 
+    @Override
     public void onFocusChange(View v, boolean hasFocus) {
 
         /*
@@ -336,6 +340,7 @@ public class NumberPicker extends LinearLayout implements OnClickListener,
      * We start the long click here but rely on the {@link NumberPickerButton}
      * to inform us when the long click has ended.
      */
+    @Override
     public boolean onLongClick(View v) {
 
         /*
@@ -369,6 +374,7 @@ public class NumberPicker extends LinearLayout implements OnClickListener,
     private final NumberPickerButton  mDecrementButton;
 
     class NumberPickerInputFilter implements InputFilter {
+        @Override
         public CharSequence filter(CharSequence source, int start, int end,
                 Spanned dest, int dstart, int dend) {
             if (mDisplayedValues == null) {
@@ -432,7 +438,8 @@ public class NumberPicker extends LinearLayout implements OnClickListener,
             }
         }
 
-		public int getInputType() {
+		@Override
+        public int getInputType() {
 			return 0;
 		}
     }

astrid/src/com/todoroo/astrid/ui/NumberPickerDialog.java

@@ -47,6 +47,7 @@ public class NumberPickerDialog extends AlertDialog implements OnClickListener {
         mPicker.setCurrent(initialValue);
     }
 
+    @Override
     public void onClick(DialogInterface dialog, int which) {
         if (mCallback != null) {
             mPicker.clearFocus();

astrid/src/com/todoroo/astrid/ui/PeopleContainer.java

@@ -105,6 +105,7 @@ public class PeopleContainer extends LinearLayout {
             removeButton.setVisibility(View.GONE);
         } else {
             removeButton.setOnClickListener(new OnClickListener() {
+                @Override
                 public void onClick(View v) {
                     TextView lastView = getLastTextView();
                     if (lastView == textView && textView.getText().length() == 0) {

astrid/src/com/todoroo/astrid/ui/QuickAddBar.java

@@ -173,6 +173,7 @@ public class QuickAddBar extends LinearLayout {
 
         // set listener for quick add button
         quickAddButton.setOnClickListener(new OnClickListener() {
+            @Override
             public void onClick(View v) {
                 Task task = quickAddTask(quickAddBox.getText().toString(), true);
                 if (task != null && task.getValue(Task.TITLE).length() == 0) {

astrid/src/com/todoroo/astrid/ui/TimeDurationControlSet.java

@@ -80,11 +80,13 @@ public class TimeDurationControlSet implements OnNNumberPickedListener,
     }
 
     /** Called when NumberPicker activity is completed */
+    @Override
     public void onNumbersPicked(int[] values) {
         setTimeDuration(values[0] * 3600 + values[1] * 60);
     }
 
     /** Called when time button is clicked */
+    @Override
     public void onClick(View v) {
         if(dialog == null) {
             dialog = new NNumberPickerDialog(activity, this,

astrid/src/com/todoroo/astrid/utility/Entities.java

@@ -446,6 +446,7 @@ class Entities {
         /**
          * {@inheritDoc}
          */
+        @Override
         public void add(String name, int value) {
             mapNameToValue.put(name, new Integer(value));
             mapValueToName.put(value, name);
@@ -454,6 +455,7 @@ class Entities {
         /**
          * {@inheritDoc}
          */
+        @Override
         public String name(int value) {
             return (String) mapValueToName.get(value);
         }
@@ -461,6 +463,7 @@ class Entities {
         /**
          * {@inheritDoc}
          */
+        @Override
         public int value(String name) {
             Object value = mapNameToValue.get(name);
             if (value == null) {
@@ -478,6 +481,7 @@ class Entities {
         /**
          * {@inheritDoc}
          */
+        @Override
         public void add(String name, int value) {
             mapNameToValue.put(name, new Integer(value));
             mapValueToName.put(new Integer(value), name);
@@ -486,6 +490,7 @@ class Entities {
         /**
          * {@inheritDoc}
          */
+        @Override
         public String name(int value) {
             return (String) mapValueToName.get(new Integer(value));
         }
@@ -493,6 +498,7 @@ class Entities {
         /**
          * {@inheritDoc}
          */
+        @Override
         public int value(String name) {
             Object value = mapNameToValue.get(name);
             if (value == null) {
@@ -598,6 +604,7 @@ class Entities {
         /**
          * {@inheritDoc}
          */
+        @Override
         public void add(String name, int value) {
             ensureCapacity(size + 1);
             names[size] = name;
@@ -626,6 +633,7 @@ class Entities {
         /**
          * {@inheritDoc}
          */
+        @Override
         public String name(int value) {
             for (int i = 0; i < size; ++i) {
                 if (values[i] == value) {
@@ -638,6 +646,7 @@ class Entities {
         /**
          * {@inheritDoc}
          */
+        @Override
         public int value(String name) {
             for (int i = 0; i < size; ++i) {
                 if (names[i].equals(name)) {

astrid/src/com/todoroo/astrid/voice/Api6VoiceOutputAssistant.java

@@ -42,6 +42,7 @@ public class Api6VoiceOutputAssistant implements OnInitListener, VoiceOutputAssi
         this.context = ContextManager.getContext().getApplicationContext();
     }
 
+    @Override
     public void checkIsTTSInstalled() {
         if (!isTTSInitialized && context instanceof Activity) {
             Intent checkIntent = new Intent();
@@ -51,6 +52,7 @@ public class Api6VoiceOutputAssistant implements OnInitListener, VoiceOutputAssi
         }
     }
 
+    @Override
     public boolean handleActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == MY_DATA_CHECK_CODE) {
             if (resultCode == TextToSpeech.Engine.CHECK_VOICE_DATA_PASS) {
@@ -73,6 +75,7 @@ public class Api6VoiceOutputAssistant implements OnInitListener, VoiceOutputAssi
         mTts = new TextToSpeech(context, (OnInitListener)this);
     }
 
+    @Override
     public void queueSpeak(String textToSpeak) {
         if (mTts != null && isTTSInitialized) {
             mTts.speak(textToSpeak, TextToSpeech.QUEUE_ADD, ttsParams);
@@ -129,6 +132,7 @@ public class Api6VoiceOutputAssistant implements OnInitListener, VoiceOutputAssi
     /**
      * Has to be called in onDestroy of the activity that uses this instance of VoiceOutputAssistant.
      */
+    @Override
     public void onDestroy() {
         if (mTts != null && isTTSInitialized) {
             mTts.shutdown();

astrid/src/com/todoroo/astrid/voice/VoiceInputAssistant.java

@@ -267,6 +267,7 @@ public class VoiceInputAssistant {
         if (Preferences.getBoolean(R.string.p_voiceInputEnabled, true) && VoiceRecognizer.voiceInputAvailable(ContextManager.getContext())) {
             voiceButton.setVisibility(View.VISIBLE);
             voiceButton.setOnClickListener(new OnClickListener() {
+                @Override
                 public void onClick(View v) {
                     startVoiceRecognitionActivity(fragment, prompt);
                 }

astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java

@@ -124,6 +124,7 @@ public class WelcomeWalkthrough extends ActFmLoginActivity {
                 final GoogleAccountManager accountManager = new GoogleAccountManager(WelcomeWalkthrough.this);
                 Account a = accountManager.getAccountByName(e);
                 AccountManagerCallback<Bundle> callback = new AccountManagerCallback<Bundle>() {
+                    @Override
                     public void run(final AccountManagerFuture<Bundle> future) {
                         new Thread() {
                             @Override

astrid/src/com/todoroo/astrid/widget/WidgetConfigActivity.java

@@ -87,6 +87,7 @@ abstract public class WidgetConfigActivity extends ListActivity {
     }
 
     View.OnClickListener mOnClickListener = new View.OnClickListener() {
+        @Override
         public void onClick(View v) {
             // Save configuration options
             saveConfiguration(adapter.getSelection());

facebook/facebook/src/com/facebook/AuthorizationClient.java

@@ -500,6 +500,7 @@ class AuthorizationClient implements Serializable {
             }
         }
 
+        @Override
         boolean tryAuthorize(final AuthorizationRequest request) {
             getTokenClient = new GetTokenClient(context, request.getApplicationId());
             if (!getTokenClient.start()) {

facebook/facebook/src/com/facebook/Request.java

@@ -1235,6 +1235,7 @@ public class Request {
 
         if (callbacks.size() > 0) {
             Runnable runnable = new Runnable() {
+                @Override
                 public void run() {
                     for (Pair<Callback, Response> pair : callbacks) {
                         pair.first.onCompleted(pair.second);
@@ -1673,6 +1674,7 @@ public class Request {
             }
         }
 
+        @Override
         public void writeString(String key, String value) throws IOException {
             writeContentDisposition(key, null, null);
             writeLine("%s", value);

facebook/facebook/src/com/facebook/Session.java

@@ -1171,9 +1171,11 @@ public class Session implements Serializable {
             // Otherwise these callbacks could have been added to the queue before the SessionTracker
             // gets the ACTIVE_SESSION_SET action.
             Runnable runCallbacks = new Runnable() {
+                @Override
                 public void run() {
                     for (final StatusCallback callback : callbacks) {
                         Runnable closure = new Runnable() {
+                            @Override
                             public void run() {
                                 // This can be called inside a synchronized block.
                                 callback.call(Session.this, newState, exception);
@@ -1747,6 +1749,7 @@ public class Session implements Serializable {
          *                       notify regarding Session state changes.
          * @return the OpenRequest object to allow for chaining
          */
+        @Override
         public final OpenRequest setCallback(StatusCallback statusCallback) {
             super.setCallback(statusCallback);
             return this;
@@ -1760,6 +1763,7 @@ public class Session implements Serializable {
          *                      authorization.
          * @return the OpenRequest object to allow for chaining
          */
+        @Override
         public final OpenRequest setLoginBehavior(SessionLoginBehavior loginBehavior) {
             super.setLoginBehavior(loginBehavior);
             return this;
@@ -1774,6 +1778,7 @@ public class Session implements Serializable {
          *                    passed in, then a default value will be used.
          * @return the OpenRequest object to allow for chaining
          */
+        @Override
         public final OpenRequest setRequestCode(int requestCode) {
             super.setRequestCode(requestCode);
             return this;
@@ -1787,6 +1792,7 @@ public class Session implements Serializable {
          *                    represents basic permissions.
          * @return the OpenRequest object to allow for chaining
          */
+        @Override
         public final OpenRequest setPermissions(List<String> permissions) {
             super.setPermissions(permissions);
             return this;
@@ -1800,6 +1806,7 @@ public class Session implements Serializable {
          * @param defaultAudience A SessionDefaultAudience representing the default audience setting to request.
          * @return the OpenRequest object to allow for chaining
          */
+        @Override
         public final OpenRequest setDefaultAudience(SessionDefaultAudience defaultAudience) {
             super.setDefaultAudience(defaultAudience);
             return this;
@@ -1841,6 +1848,7 @@ public class Session implements Serializable {
          *                       notify regarding Session state changes.
          * @return the NewPermissionsRequest object to allow for chaining
          */
+        @Override
         public final NewPermissionsRequest setCallback(StatusCallback statusCallback) {
             super.setCallback(statusCallback);
             return this;
@@ -1854,6 +1862,7 @@ public class Session implements Serializable {
          *                      authorization.
          * @return the NewPermissionsRequest object to allow for chaining
          */
+        @Override
         public final NewPermissionsRequest setLoginBehavior(SessionLoginBehavior loginBehavior) {
             super.setLoginBehavior(loginBehavior);
             return this;
@@ -1868,6 +1877,7 @@ public class Session implements Serializable {
          *                    passed in, then a default value will be used.
          * @return the NewPermissionsRequest object to allow for chaining
          */
+        @Override
         public final NewPermissionsRequest setRequestCode(int requestCode) {
             super.setRequestCode(requestCode);
             return this;
@@ -1879,6 +1889,7 @@ public class Session implements Serializable {
          * @param defaultAudience A SessionDefaultAudience representing the default audience setting to request.
          * @return the NewPermissionsRequest object to allow for chaining
          */
+        @Override
         public final NewPermissionsRequest setDefaultAudience(SessionDefaultAudience defaultAudience) {
             super.setDefaultAudience(defaultAudience);
             return this;

facebook/facebook/src/com/facebook/Settings.java

@@ -66,6 +66,7 @@ public final class Settings {
     private static final ThreadFactory DEFAULT_THREAD_FACTORY = new ThreadFactory() {
         private final AtomicInteger counter = new AtomicInteger(0);
 
+        @Override
         public Thread newThread(Runnable runnable) {
             return new Thread(runnable, "FacebookSdk #" + counter.incrementAndGet());
         }

facebook/facebook/src/com/facebook/SharedPreferencesTokenCachingStrategy.java

@@ -121,6 +121,7 @@ public class SharedPreferencesTokenCachingStrategy extends TokenCachingStrategy
      *
      * @return A Bundle with the information contained in this cache
      */
+    @Override
     public Bundle load() {
         Bundle settings = new Bundle();
 
@@ -147,6 +148,7 @@ public class SharedPreferencesTokenCachingStrategy extends TokenCachingStrategy
      * @param bundle
      *          The Bundle containing information to be cached
      */
+    @Override
     public void save(Bundle bundle) {
         Validate.notNull(bundle, "bundle");
 
@@ -173,6 +175,7 @@ public class SharedPreferencesTokenCachingStrategy extends TokenCachingStrategy
     /**
      * Clears out all token information stored in this cache.
      */
+    @Override
     public void clear() {
         cache.edit().clear().commit();
     }

facebook/facebook/src/com/facebook/widget/FriendPickerFragment.java

@@ -127,11 +127,13 @@ public class FriendPickerFragment extends PickerFragment<GraphUser> {
         a.recycle();
     }
 
+    @Override
     public void setSettingsFromBundle(Bundle inState) {
         super.setSettingsFromBundle(inState);
         setFriendPickerSettingsFromBundle(inState);
     }
 
+    @Override
     void saveSettingsToBundle(Bundle outState) {
         super.saveSettingsToBundle(outState);
 

facebook/facebook/src/com/facebook/widget/LoginButton.java

@@ -604,6 +604,7 @@ public class LoginButton extends Button {
                     builder.setMessage(message)
                            .setCancelable(true)
                            .setPositiveButton(logout, new DialogInterface.OnClickListener() {
+                               @Override
                                public void onClick(DialogInterface dialog, int which) {
                                    openSession.closeAndClearTokenInformation();
                                }

facebook/facebook/src/com/facebook/widget/PickerFragment.java

@@ -912,6 +912,7 @@ public abstract class PickerFragment<T extends GraphObject> extends Fragment {
     class SingleSelectionStrategy extends SelectionStrategy {
         private String selectedId;
 
+        @Override
         public Collection<String> getSelectedIds() {
             return Arrays.asList(new String[]{selectedId});
         }
@@ -963,6 +964,7 @@ public abstract class PickerFragment<T extends GraphObject> extends Fragment {
     class MultiSelectionStrategy extends SelectionStrategy {
         private Set<String> selectedIds = new HashSet<String>();
 
+        @Override
         public Collection<String> getSelectedIds() {
             return selectedIds;
         }

facebook/facebook/src/com/facebook/widget/PlacePickerFragment.java

@@ -236,6 +236,7 @@ public class PlacePickerFragment extends PickerFragment<GraphPlace> {
         return (selection != null && selection.size() > 0) ? selection.iterator().next() : null;
     }
 
+    @Override
     public void setSettingsFromBundle(Bundle inState) {
         super.setSettingsFromBundle(inState);
         setPlacePickerSettingsFromBundle(inState);
@@ -313,6 +314,7 @@ public class PlacePickerFragment extends PickerFragment<GraphPlace> {
         }
     }
 
+    @Override
     void saveSettingsToBundle(Bundle outState) {
         super.saveSettingsToBundle(outState);
 

facebook/facebook/src/com/facebook/widget/SimpleGraphObjectCursor.java

@@ -48,6 +48,7 @@ class SimpleGraphObjectCursor<T extends GraphObject> implements GraphObjectCurso
         this.fromCache |= fromCache;
     }
 
+    @Override
     public boolean isFromCache() {
         return fromCache;
     }
@@ -56,6 +57,7 @@ class SimpleGraphObjectCursor<T extends GraphObject> implements GraphObjectCurso
         this.fromCache = fromCache;
     }
 
+    @Override
     public boolean areMoreObjectsAvailable() {
         return moreObjectsAvailable;
     }