Add missing override annotations

13 years ago · 2c264668e8
parent 5b48d6db3d
commit 2c264668e8
88 changed files with 210 additions and 0 deletions
--- a/api/src/com/todoroo/andlib/data/AbstractDatabase.java
+++ b/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());
        }
--- a/api/src/com/todoroo/andlib/data/AbstractModel.java
+++ b/api/src/com/todoroo/andlib/data/AbstractModel.java
@ -530,21 +530,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;
@ -556,6 +560,7 @@ public abstract class AbstractModel implements Parcelable, Cloneable {
    /**
     * {@inheritDoc}
     */
+    @Override
    public int describeContents() {
        return 0;
    }
@ -563,6 +568,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);
@ -591,6 +597,7 @@ public abstract class AbstractModel implements Parcelable, Cloneable {
        /**
         * {@inheritDoc}
         */
+        @Override
        public TYPE createFromParcel(Parcel source) {
            TYPE model;
            try {
@ -608,6 +615,7 @@ public abstract class AbstractModel implements Parcelable, Cloneable {
        /**
         * {@inheritDoc}
         */
+        @Override
        public TYPE[] newArray(int size) {
            return (TYPE[]) Array.newInstance(cls, size);
        }
--- a/api/src/com/todoroo/andlib/data/TodorooCursor.java
+++ b/api/src/com/todoroo/andlib/data/TodorooCursor.java
@ -105,6 +105,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);
@ -114,6 +115,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);
@ -123,6 +125,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)) {
@ -131,6 +134,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);
--- a/api/src/com/todoroo/andlib/service/ExceptionService.java
+++ b/api/src/com/todoroo/andlib/service/ExceptionService.java
@ -74,6 +74,7 @@ public class ExceptionService {
            }

            ((Activity) context).runOnUiThread(new Runnable() {
+                @Override
                public void run() {
                    try {
                        new AlertDialog.Builder(context)
@ -114,6 +115,7 @@ public class ExceptionService {
         * @param name
         * @param error
         */
+        @Override
        public void handleError(String name, Throwable error) {
            String tag = null;
            if (ContextManager.getContext() != null) {
@ -156,6 +158,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$
--- a/api/src/com/todoroo/andlib/service/HttpRestClient.java
+++ b/api/src/com/todoroo/andlib/service/HttpRestClient.java
@ -103,6 +103,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 {
@ -114,6 +115,7 @@ public class HttpRestClient implements RestClient {
        });

        client.addResponseInterceptor(new HttpResponseInterceptor() {
+            @Override
            public void process(
                    final HttpResponse response,
                    final HttpContext context) throws HttpException, IOException {
@ -191,6 +193,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$
@ -217,6 +220,7 @@ public class HttpRestClient implements RestClient {
     * @param data 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$
--- a/api/src/com/todoroo/andlib/service/NotificationManager.java
+++ b/api/src/com/todoroo/andlib/service/NotificationManager.java
@ -35,14 +35,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);
        }
--- a/api/src/com/todoroo/andlib/utility/AndroidUtilities.java
+++ b/api/src/com/todoroo/andlib/utility/AndroidUtilities.java
@ -79,6 +79,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);
@ -359,6 +360,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':
@ -395,6 +397,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':
@ -600,6 +603,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()));
            }
--- a/api/src/com/todoroo/andlib/utility/DialogUtilities.java
+++ b/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)
@ -228,6 +232,7 @@ public class DialogUtilities {
            return;
        }
        tryOnUiThread(activity, new Runnable() {
+            @Override
            public void run() {
                try {
                    dialog.dismiss();
--- a/api/src/com/todoroo/andlib/utility/TodorooPreferenceActivity.java
+++ b/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;
--- a/api/src/com/todoroo/astrid/api/Addon.java
+++ b/api/src/com/todoroo/astrid/api/Addon.java
@ -57,6 +57,7 @@ public class Addon implements Parcelable {
    /**
     * {@inheritDoc}
     */
+    @Override
    public int describeContents() {
        return 0;
    }
@ -64,6 +65,7 @@ public class Addon implements Parcelable {
    /**
     * {@inheritDoc}
     */
+    @Override
    public void writeToParcel(Parcel dest, int flags) {
        dest.writeString(addon);
        dest.writeString(title);
@ -78,6 +80,7 @@ public class Addon implements Parcelable {
        /**
         * {@inheritDoc}
         */
+        @Override
        public Addon createFromParcel(Parcel source) {
            return new Addon(source.readString(), source.readString(),
                    source.readString(), source.readString());
@ -86,6 +89,7 @@ public class Addon implements Parcelable {
        /**
         * {@inheritDoc}
         */
+        @Override
        public Addon[] newArray(int size) {
            return new Addon[size];
        }
--- a/api/src/com/todoroo/astrid/api/Filter.java
+++ b/api/src/com/todoroo/astrid/api/Filter.java
@ -135,6 +135,7 @@ public class Filter extends FilterListItem {
    /**
     * {@inheritDoc}
     */
+    @Override
    public int describeContents() {
        return 0;
    }
@ -205,6 +206,7 @@ public class Filter extends FilterListItem {
        /**
         * {@inheritDoc}
         */
+        @Override
        public Filter createFromParcel(Parcel source) {
            Filter item = new Filter();
            item.readFromParcel(source);
@ -214,6 +216,7 @@ public class Filter extends FilterListItem {
        /**
         * {@inheritDoc}
         */
+        @Override
        public Filter[] newArray(int size) {
            return new Filter[size];
        }
--- a/api/src/com/todoroo/astrid/api/FilterCategory.java
+++ b/api/src/com/todoroo/astrid/api/FilterCategory.java
@ -46,6 +46,7 @@ public class FilterCategory extends FilterListItem {
    /**
     * {@inheritDoc}
     */
+    @Override
    public int describeContents() {
        return 0;
    }
@ -67,6 +68,7 @@ public class FilterCategory extends FilterListItem {
        /**
         * {@inheritDoc}
         */
+        @Override
        public FilterCategory createFromParcel(Parcel source) {
            FilterCategory item = new FilterCategory();
            item.readFromParcel(source);
@ -88,6 +90,7 @@ public class FilterCategory extends FilterListItem {
        /**
         * {@inheritDoc}
         */
+        @Override
        public FilterCategory[] newArray(int size) {
            return new FilterCategory[size];
        }
--- a/api/src/com/todoroo/astrid/api/FilterCategoryWithNewButton.java
+++ b/api/src/com/todoroo/astrid/api/FilterCategoryWithNewButton.java
@ -75,6 +75,7 @@ public class FilterCategoryWithNewButton extends FilterCategory {
        /**
         * {@inheritDoc}
         */
+        @Override
        public FilterCategoryWithNewButton createFromParcel(Parcel source) {
            FilterCategoryWithNewButton item = new FilterCategoryWithNewButton();
            item.readFromParcel(source);
@ -99,6 +100,7 @@ public class FilterCategoryWithNewButton extends FilterCategory {
        /**
         * {@inheritDoc}
         */
+        @Override
        public FilterCategoryWithNewButton[] newArray(int size) {
            return new FilterCategoryWithNewButton[size];
        }
--- a/api/src/com/todoroo/astrid/api/FilterListHeader.java
+++ b/api/src/com/todoroo/astrid/api/FilterListHeader.java
@ -37,6 +37,7 @@ public class FilterListHeader extends FilterListItem {

    // --- parcelable

+    @Override
    public int describeContents() {
        return 0;
    }
@ -48,12 +49,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];
        }
--- a/api/src/com/todoroo/astrid/api/FilterListItem.java
+++ b/api/src/com/todoroo/astrid/api/FilterListItem.java
@ -50,6 +50,7 @@ abstract public class FilterListItem implements Parcelable {
    /**
     * {@inheritDoc}
     */
+    @Override
    public void writeToParcel(Parcel dest, int flags) {
        dest.writeString(listingTitle);
        dest.writeParcelable(listingIcon, 0);
--- a/api/src/com/todoroo/astrid/api/FilterWithCustomIntent.java
+++ b/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];
        }
--- a/api/src/com/todoroo/astrid/api/FilterWithUpdate.java
+++ b/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];
        }
--- a/api/src/com/todoroo/astrid/api/IntentFilter.java
+++ b/api/src/com/todoroo/astrid/api/IntentFilter.java
@ -45,6 +45,7 @@ public final class IntentFilter extends FilterListItem implements Parcelable {
    /**
     * {@inheritDoc}
     */
+    @Override
    public int describeContents() {
        return 0;
    }
@ -66,6 +67,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()));
@ -76,6 +78,7 @@ public final class IntentFilter extends FilterListItem implements Parcelable {
        /**
         * {@inheritDoc}
         */
+        @Override
        public IntentFilter[] newArray(int size) {
            return new IntentFilter[size];
        }
--- a/api/src/com/todoroo/astrid/api/MultipleSelectCriterion.java
+++ b/api/src/com/todoroo/astrid/api/MultipleSelectCriterion.java
@ -62,6 +62,7 @@ public class MultipleSelectCriterion extends CustomFilterCriterion implements Pa
    /**
     * {@inheritDoc}
     */
+    @Override
    public int describeContents() {
        return 0;
    }
@ -69,6 +70,7 @@ public class MultipleSelectCriterion extends CustomFilterCriterion implements Pa
    /**
     * {@inheritDoc}
     */
+    @Override
    public void writeToParcel(Parcel dest, int flags) {
        dest.writeStringArray(entryTitles);
        dest.writeStringArray(entryValues);
@ -83,6 +85,7 @@ public class MultipleSelectCriterion extends CustomFilterCriterion implements Pa
        /**
         * {@inheritDoc}
         */
+        @Override
        public MultipleSelectCriterion createFromParcel(Parcel source) {
            MultipleSelectCriterion item = new MultipleSelectCriterion();
            item.entryTitles = source.createStringArray();
@ -94,6 +97,7 @@ public class MultipleSelectCriterion extends CustomFilterCriterion implements Pa
        /**
         * {@inheritDoc}
         */
+        @Override
        public MultipleSelectCriterion[] newArray(int size) {
            return new MultipleSelectCriterion[size];
        }
--- a/api/src/com/todoroo/astrid/api/SyncAction.java
+++ b/api/src/com/todoroo/astrid/api/SyncAction.java
@ -70,6 +70,7 @@ public class SyncAction implements Parcelable {
    /**
     * {@inheritDoc}
     */
+    @Override
    public int describeContents() {
        return 0;
    }
@ -77,6 +78,7 @@ public class SyncAction implements Parcelable {
    /**
     * {@inheritDoc}
     */
+    @Override
    public void writeToParcel(Parcel dest, int flags) {
        dest.writeString(label);
        dest.writeParcelable(intent, 0);
@ -89,6 +91,7 @@ public class SyncAction implements Parcelable {
        /**
         * {@inheritDoc}
         */
+        @Override
        public SyncAction createFromParcel(Parcel source) {
            return new SyncAction(source.readString(), (PendingIntent) source.readParcelable(
                    PendingIntent.class.getClassLoader()));
@ -97,6 +100,7 @@ public class SyncAction implements Parcelable {
        /**
         * {@inheritDoc}
         */
+        @Override
        public SyncAction[] newArray(int size) {
            return new SyncAction[size];
        }
--- a/api/src/com/todoroo/astrid/api/TaskDecoration.java
+++ b/api/src/com/todoroo/astrid/api/TaskDecoration.java
@ -59,6 +59,7 @@ public final class TaskDecoration implements Parcelable {
    /**
     * {@inheritDoc}
     */
+    @Override
    public int describeContents() {
        return 0;
    }
@ -66,6 +67,7 @@ public final class TaskDecoration implements Parcelable {
    /**
     * {@inheritDoc}
     */
+    @Override
    public void writeToParcel(Parcel dest, int flags) {
        dest.writeParcelable(decoration, 0);
        dest.writeInt(position);
@ -79,6 +81,7 @@ public final class TaskDecoration implements Parcelable {
        /**
         * {@inheritDoc}
         */
+        @Override
        public TaskDecoration createFromParcel(Parcel source) {
            return new TaskDecoration((RemoteViews) source.readParcelable(
                    RemoteViews.class.getClassLoader()),
@ -88,6 +91,7 @@ public final class TaskDecoration implements Parcelable {
        /**
         * {@inheritDoc}
         */
+        @Override
        public TaskDecoration[] newArray(int size) {
            return new TaskDecoration[size];
        }
--- a/api/src/com/todoroo/astrid/api/TextInputCriterion.java
+++ b/api/src/com/todoroo/astrid/api/TextInputCriterion.java
@ -63,6 +63,7 @@ public class TextInputCriterion extends CustomFilterCriterion implements Parcela
    /**
     * {@inheritDoc}
     */
+    @Override
    public int describeContents() {
        return 0;
    }
@ -70,6 +71,7 @@ public class TextInputCriterion extends CustomFilterCriterion implements Parcela
    /**
     * {@inheritDoc}
     */
+    @Override
    public void writeToParcel(Parcel dest, int flags) {
        dest.writeString(prompt);
        dest.writeString(hint);
@ -84,6 +86,7 @@ public class TextInputCriterion extends CustomFilterCriterion implements Parcela
        /**
         * {@inheritDoc}
         */
+        @Override
        public TextInputCriterion createFromParcel(Parcel source) {
            TextInputCriterion item = new TextInputCriterion();
            item.prompt = source.readString();
@ -95,6 +98,7 @@ public class TextInputCriterion extends CustomFilterCriterion implements Parcela
        /**
         * {@inheritDoc}
         */
+        @Override
        public TextInputCriterion[] newArray(int size) {
            return new TextInputCriterion[size];
        }
--- a/api/src/com/todoroo/astrid/core/SearchFilter.java
+++ b/api/src/com/todoroo/astrid/core/SearchFilter.java
@ -38,6 +38,7 @@ public class SearchFilter extends FilterListItem {
    /**
     * {@inheritDoc}
     */
+    @Override
    public int describeContents() {
        return 0;
    }
@ -58,6 +59,7 @@ public class SearchFilter extends FilterListItem {
        /**
         * {@inheritDoc}
         */
+        @Override
        public SearchFilter createFromParcel(Parcel source) {
            SearchFilter item = new SearchFilter();
            item.readFromParcel(source);
@ -67,6 +69,7 @@ public class SearchFilter extends FilterListItem {
        /**
         * {@inheritDoc}
         */
+        @Override
        public SearchFilter[] newArray(int size) {
            return new SearchFilter[size];
        }
--- a/api/src/com/todoroo/astrid/sync/SyncProvider.java
+++ b/api/src/com/todoroo/astrid/sync/SyncProvider.java
@ -183,6 +183,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) {
--- a/api/src/com/todoroo/astrid/sync/SyncProviderPreferences.java
+++ b/api/src/com/todoroo/astrid/sync/SyncProviderPreferences.java
@ -166,6 +166,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;
@ -219,6 +220,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() {
--- a/astrid/common-src/com/commonsware/cwac/tlv/TouchListView.java
+++ b/astrid/common-src/com/commonsware/cwac/tlv/TouchListView.java
@ -417,6 +417,7 @@ public class TouchListView extends ErrorCatchingListView {
    }

    private final Runnable longPressRunnable = new Runnable() {
+        @Override
        public void run() {
            AndroidUtilities.sleepDeep(1000L);
            if (Thread.currentThread().isInterrupted()) {
@ -426,6 +427,7 @@ public class TouchListView extends ErrorCatchingListView {
            if (mDragView != null && mDragPos == mFirstDragPos &&
                    Math.abs(mDragCurrentX - mDragStartX) < 10) {
                post(new Runnable() {
+                    @Override
                    public void run() {
                        stopDragging(null);
                        mClickListener.onLongClick(mOriginalView);
--- a/astrid/common-src/com/localytics/android/ExceptionHandler.java
+++ b/astrid/common-src/com/localytics/android/ExceptionHandler.java
@ -14,6 +14,7 @@ import android.util.Log;
 * crash. This handler therefore suppresses all uncaught exceptions from the Localytics library.
 */
 /* package */final class ExceptionHandler implements Thread.UncaughtExceptionHandler {
+    @Override
    public void uncaughtException(final Thread thread, final Throwable throwable) {
        /*
         * Wrap all the work done by the exception handler in a try-catch. It would be ironic if this exception handler itself
--- a/astrid/common-src/com/localytics/android/LocalyticsSession.java
+++ b/astrid/common-src/com/localytics/android/LocalyticsSession.java
@ -1542,6 +1542,7 @@ public final class LocalyticsSession {

            try {
                mProvider.runBatchTransaction(new Runnable() {
+                    @Override
                    public void run() {
                        preUploadBuildBlobs();
                    }
@ -1666,6 +1667,7 @@ public final class LocalyticsSession {

                            if (uploadSessions(String.format(ANALYTICS_URL, mApiKey), builder.toString())) {
                                mProvider.runBatchTransaction(new Runnable() {
+                                    @Override
                                    public void run() {
                                        deleteBlobsAndSessions(mProvider);
                                    }
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmGoogleAuthActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmGoogleAuthActivity.java
@ -101,6 +101,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
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmLoginActivity.java
@ -408,6 +408,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);
@ -603,6 +604,7 @@ public class ActFmLoginActivity extends SherlockFragmentActivity {
                        constructOutstandingTables();
                    }
                    runOnUiThread(new Runnable() {
+                        @Override
                        public void run() {
                            DialogUtilities.dismissDialog(ActFmLoginActivity.this, progressDialog);
                            progressDialog = null;
@ -613,6 +615,7 @@ public class ActFmLoginActivity extends SherlockFragmentActivity {
                    handleError(e);
                } finally {
                    runOnUiThread(new Runnable() {
+                        @Override
                        public void run() {
                            if (progressDialog != null) {
                                DialogUtilities.dismissDialog(ActFmLoginActivity.this, progressDialog);
@ -815,6 +818,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
                        }
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmPreferences.java
+++ b/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() {
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/CommentsFragment.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/CommentsFragment.java
@ -304,6 +304,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();
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java
@ -423,6 +423,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());
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java
@ -96,6 +96,7 @@ public class ActFmSyncV2Provider extends SyncV2Provider {
                                       final SyncResultCallback callback) {

        new Thread(new Runnable() {
+            @Override
            public void run() {

                updateUserStatus();
--- a/astrid/plugin-src/com/todoroo/astrid/alarms/AlarmControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/alarms/AlarmControlSet.java
@ -136,6 +136,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);
            }
--- a/astrid/plugin-src/com/todoroo/astrid/backup/BackupPreferences.java
+++ b/astrid/plugin-src/com/todoroo/astrid/backup/BackupPreferences.java
@ -122,6 +122,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;
--- a/astrid/plugin-src/com/todoroo/astrid/backup/BackupService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/backup/BackupService.java
@ -161,6 +161,7 @@ public class BackupService extends Service {
    }

    private BackupDirectorySetting backupDirectorySetting = new BackupDirectorySetting() {
+        @Override
        public File getBackupDirectory() {
            return BackupConstants.defaultExportDirectory();
        }
--- a/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlExporter.java
+++ b/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);
--- a/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlImporter.java
+++ b/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);
            }
@ -189,6 +190,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) {
--- a/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterActivity.java
@ -556,6 +556,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();
--- a/astrid/plugin-src/com/todoroo/astrid/core/OldTaskPreferences.java
+++ b/astrid/plugin-src/com/todoroo/astrid/core/OldTaskPreferences.java
@ -68,6 +68,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;
@ -85,6 +86,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;
@ -93,6 +95,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;
@ -101,6 +104,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;
@ -109,6 +113,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;
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListFragment.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListFragment.java
@ -169,6 +169,7 @@ public class GtasksListFragment extends SubtasksListFragment {
                Activity activity = getActivity();
                if (activity != null) {
                    activity.runOnUiThread(new Runnable() {
+                        @Override
                        public void run() {
                            loadTaskListContent(true);
                        }
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/auth/AccountChooser.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/auth/AccountChooser.java
@ -79,6 +79,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);
@ -86,6 +87,7 @@ public class AccountChooser {
                });
        builder.setNegativeButton(android.R.string.cancel,
                new DialogInterface.OnClickListener() {
+                    @Override
                    public void onClick(DialogInterface dialog, int which) {
                        handler.handleAccountSelected(null);
                    }
@ -114,6 +116,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);
                    }
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java
@ -117,6 +117,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
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/auth/ModernAuthManager.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/auth/ModernAuthManager.java
@ -95,6 +95,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;
@ -104,6 +105,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();
@ -153,6 +155,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) {
@ -173,6 +176,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;
    }
@ -185,10 +189,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,
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java
@ -110,6 +110,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;
--- a/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java
+++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java
@ -168,6 +168,7 @@ public class GtasksSyncV2Provider extends SyncV2Provider {
        gtasksPreferenceService.recordSyncStart();

        new Thread(new Runnable() {
+            @Override
            public void run() {
                callback.incrementProgress(50);
                String authToken = getValidatedAuthToken();
@ -253,6 +254,7 @@ public class GtasksSyncV2Provider extends SyncV2Provider {
        callback.incrementMax(100);

        new Thread(new Runnable() {
+            @Override
            public void run() {
                callback.incrementProgress(50);
                try {
--- a/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java
@ -411,6 +411,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;
--- a/astrid/plugin-src/com/todoroo/astrid/people/PersonViewFragment.java
+++ b/astrid/plugin-src/com/todoroo/astrid/people/PersonViewFragment.java
@ -231,6 +231,7 @@ public class PersonViewFragment extends TaskListFragment {
                    Activity activity = getActivity();
                    if (activity != null) {
                        activity.runOnUiThread(new Runnable() {
+                            @Override
                            public void run() {
                                reloadUserData();
                                refresh();
--- a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderDebugContextActions.java
+++ b/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");
--- a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderService.java
+++ b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderService.java
@ -474,6 +474,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) {
--- a/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java
@ -307,6 +307,7 @@ public class RepeatControlSet extends PopupControlSet {

        // set up listeners
        value.setOnClickListener(new View.OnClickListener() {
+            @Override
            public void onClick(View v) {
                repeatValueClick();
            }
--- a/astrid/plugin-src/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java
+++ b/astrid/plugin-src/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java
@ -82,6 +82,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);
@ -114,6 +115,7 @@ public class AstridOrderedListFragmentHelper<LIST> implements OrderedListFragmen
        Preferences.setInt(AstridPreferences.P_SUBTASKS_HELP, 1);
    }

+    @Override
    public void beforeSetUpTaskList(Filter filter) {
        updater.initialize(list, filter);
    }
@ -190,6 +192,7 @@ public class AstridOrderedListFragmentHelper<LIST> implements OrderedListFragmen
        }
    };

+    @Override
    public TaskAdapter createTaskAdapter(TodorooCursor<Task> cursor,
                                         AtomicReference<String> sqlQueryTemplate) {

@ -320,6 +323,7 @@ public class AstridOrderedListFragmentHelper<LIST> implements OrderedListFragmen
        this.list = list;
    }

+    @Override
    public void onCreateTask(Task task) {
        updater.onCreateTask(list, getFilter(), task.getUuid());
        fragment.reconstructCursor();
@ -327,6 +331,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();
--- a/astrid/plugin-src/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java
+++ b/astrid/plugin-src/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java
@ -86,6 +86,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);
@ -118,10 +119,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) {
@ -204,6 +207,7 @@ public class OrderedMetadataListFragmentHelper<LIST> implements OrderedListFragm
        }
    };

+    @Override
    public TaskAdapter createTaskAdapter(TodorooCursor<Task> cursor,
                                         AtomicReference<String> sqlQueryTemplate) {

@ -317,6 +321,7 @@ public class OrderedMetadataListFragmentHelper<LIST> implements OrderedListFragm
        //
    }

+    @Override
    public void onDeleteTask(Task task) {
        updater.onDeleteTask(getFilter(), list, task.getId());
        taskAdapter.notifyDataSetInvalidated();
--- a/astrid/plugin-src/com/todoroo/astrid/subtasks/OrderedMetadataListUpdater.java
+++ b/astrid/plugin-src/com/todoroo/astrid/subtasks/OrderedMetadataListUpdater.java
@ -386,6 +386,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()),
--- a/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksHelper.java
+++ b/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksHelper.java
@ -170,6 +170,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 {
--- a/astrid/plugin-src/com/todoroo/astrid/tags/TagsControlSet.java
+++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagsControlSet.java
@ -210,6 +210,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) {
--- a/astrid/plugin-src/com/todoroo/astrid/timers/TimerActionControlSet.java
+++ b/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$
--- a/astrid/src-legacy/com/timsu/astrid/data/LegacyAbstractController.java
+++ b/astrid/src-legacy/com/timsu/astrid/data/LegacyAbstractController.java
@ -65,10 +65,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);
@ -93,6 +95,7 @@ abstract public class LegacyAbstractController {
            return null;
        }

+        @Override
        public void remove() {
            throw new UnsupportedOperationException("Can't remove this way");
        }
--- a/astrid/src/com/commonsware/cwac/merge/MergeSpinnerAdapter.java
+++ b/astrid/src/com/commonsware/cwac/merge/MergeSpinnerAdapter.java
@ -41,6 +41,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");
    }
@ -75,6 +77,7 @@ public class MergeSpinnerAdapter extends MergeAdapter {
     * @param view    Single view to add
     * @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");
    }
@ -85,6 +88,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");
    }
@ -96,6 +100,7 @@ public class MergeSpinnerAdapter extends MergeAdapter {
     * @param views   List of views to add
     * @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");
    }
--- a/astrid/src/com/todoroo/astrid/activity/AstridActivity.java
+++ b/astrid/src/com/todoroo/astrid/activity/AstridActivity.java
@ -144,6 +144,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);
--- a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
+++ b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java
@ -172,6 +172,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;
@ -437,6 +438,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),
@ -449,6 +451,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();
@ -466,6 +469,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);
@ -478,6 +482,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);
--- a/astrid/src/com/todoroo/astrid/activity/ExpandableListFragment.java
+++ b/astrid/src/com/todoroo/astrid/activity/ExpandableListFragment.java
@ -33,6 +33,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);
        }
@ -40,6 +41,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);
        }
--- a/astrid/src/com/todoroo/astrid/activity/FilterListFragment.java
+++ b/astrid/src/com/todoroo/astrid/activity/FilterListFragment.java
@ -446,6 +446,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();
                    }
--- a/astrid/src/com/todoroo/astrid/activity/FilterShortcutActivity.java
+++ b/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) {
--- a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java
@ -740,6 +740,7 @@ public final class TaskEditFragment extends SherlockFragment implements
            }

            activity.runOnUiThread(new Runnable() {
+                @Override
                public void run() {
                    onUiThread();
                }
@ -1157,6 +1158,7 @@ public final class TaskEditFragment extends SherlockFragment implements
                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);
--- a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
+++ b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java
@ -1144,6 +1144,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) {
@ -1294,6 +1295,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);
--- a/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/FilterAdapter.java
@ -203,6 +203,7 @@ public class FilterAdapter extends ArrayAdapter<Filter> {

                    filterCounts.put(filter, size);
                    activity.runOnUiThread(new Runnable() {
+                        @Override
                        public void run() {
                            notifyDataSetChanged();
                        }
@ -645,6 +646,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();
                                }
--- a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
+++ b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java
@ -874,6 +874,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable {
        private final HashMap<Integer, Drawable> cache =
                new HashMap<Integer, Drawable>(3);

+        @Override
        @SuppressWarnings("nls")
        public Drawable getDrawable(String source) {
            int drawable = 0;
@ -1042,6 +1043,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];
--- a/astrid/src/com/todoroo/astrid/helper/TaskListContextMenuExtensionLoader.java
+++ b/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);
            }
--- a/astrid/src/com/todoroo/astrid/service/StartupService.java
+++ b/astrid/src/com/todoroo/astrid/service/StartupService.java
@ -249,6 +249,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);
--- a/astrid/src/com/todoroo/astrid/ui/CalendarView.java
+++ b/astrid/src/com/todoroo/astrid/ui/CalendarView.java
@ -189,6 +189,7 @@ public class CalendarView extends View {
        });

        final OnTouchListener swipeTouchListener = new OnTouchListener() {
+            @Override
            public boolean onTouch(View v, MotionEvent event) {
                return swipeCalendarListener.onTouchEvent(event);
            }
--- a/astrid/src/com/todoroo/astrid/ui/CheckableImageView.java
+++ b/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;
--- a/astrid/src/com/todoroo/astrid/ui/DeadlineTimePickerDialog.java
+++ b/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();
    }
--- a/astrid/src/com/todoroo/astrid/ui/DraggableListView.java
+++ b/astrid/src/com/todoroo/astrid/ui/DraggableListView.java
@ -331,6 +331,7 @@ public class DraggableListView extends ListView {
            this.ev = ev;
        }

+        @Override
        public void run() {
            try {
                Thread.sleep(300L);
@ -345,6 +346,7 @@ public class DraggableListView extends ListView {
                Thread.sleep(1000L);

                post(new Runnable() {
+                    @Override
                    public void run() {
                        stopDragging();
                        dragThread = null;
--- a/astrid/src/com/todoroo/astrid/ui/ImportanceControlSet.java
+++ b/astrid/src/com/todoroo/astrid/ui/ImportanceControlSet.java
@ -109,6 +109,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());
                }
--- a/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java
+++ b/astrid/src/com/todoroo/astrid/ui/MainMenuPopover.java
@ -86,6 +86,7 @@ public class MainMenuPopover extends FragmentPopover implements InterceptTouchLi
        addFixedItems();
    }

+    @Override
    public boolean didInterceptTouch(KeyEvent event) {
        int keyCode = event.getKeyCode();
        if (!suppressNextKeyEvent) {
--- a/astrid/src/com/todoroo/astrid/ui/NNumberPickerDialog.java
+++ b/astrid/src/com/todoroo/astrid/ui/NNumberPickerDialog.java
@ -102,6 +102,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()];
--- a/astrid/src/com/todoroo/astrid/ui/NumberPicker.java
+++ b/astrid/src/com/todoroo/astrid/ui/NumberPicker.java
@ -52,6 +52,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());
@ -68,6 +69,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);
@ -228,6 +230,7 @@ public class NumberPicker extends LinearLayout implements OnClickListener,
        mSpeed = speed;
    }

+    @Override
    public void onClick(View v) {

        /*
@ -312,6 +315,7 @@ public class NumberPicker extends LinearLayout implements OnClickListener,
        updateView();
    }

+    @Override
    public void onFocusChange(View v, boolean hasFocus) {

        /*
@ -335,6 +339,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) {

        /*
@ -368,6 +373,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) {
@ -431,6 +437,7 @@ public class NumberPicker extends LinearLayout implements OnClickListener,
            }
        }

+        @Override
        public int getInputType() {
            return 0;
        }
--- a/astrid/src/com/todoroo/astrid/ui/NumberPickerDialog.java
+++ b/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();
--- a/astrid/src/com/todoroo/astrid/ui/PeopleContainer.java
+++ b/astrid/src/com/todoroo/astrid/ui/PeopleContainer.java
@ -107,6 +107,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) {
--- a/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java
+++ b/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java
@ -176,6 +176,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) {
--- a/astrid/src/com/todoroo/astrid/ui/TimeDurationControlSet.java
+++ b/astrid/src/com/todoroo/astrid/ui/TimeDurationControlSet.java
@ -82,6 +82,7 @@ public class TimeDurationControlSet implements OnNNumberPickedListener,
    /**
     * Called when NumberPicker activity is completed
     */
+    @Override
    public void onNumbersPicked(int[] values) {
        setTimeDuration(values[0] * 3600 + values[1] * 60);
    }
@ -89,6 +90,7 @@ public class TimeDurationControlSet implements OnNNumberPickedListener,
    /**
     * Called when time button is clicked
     */
+    @Override
    public void onClick(View v) {
        if (dialog == null) {
            dialog = new NNumberPickerDialog(activity, this,
--- a/astrid/src/com/todoroo/astrid/utility/Entities.java
+++ b/astrid/src/com/todoroo/astrid/utility/Entities.java
@ -440,6 +440,7 @@ class Entities {
        /**
         * {@inheritDoc}
         */
+        @Override
        public void add(String name, int value) {
            mapNameToValue.put(name, new Integer(value));
            mapValueToName.put(value, name);
@ -448,6 +449,7 @@ class Entities {
        /**
         * {@inheritDoc}
         */
+        @Override
        public String name(int value) {
            return (String) mapValueToName.get(value);
        }
@ -455,6 +457,7 @@ class Entities {
        /**
         * {@inheritDoc}
         */
+        @Override
        public int value(String name) {
            Object value = mapNameToValue.get(name);
            if (value == null) {
@ -472,6 +475,7 @@ class Entities {
        /**
         * {@inheritDoc}
         */
+        @Override
        public void add(String name, int value) {
            mapNameToValue.put(name, new Integer(value));
            mapValueToName.put(new Integer(value), name);
@ -480,6 +484,7 @@ class Entities {
        /**
         * {@inheritDoc}
         */
+        @Override
        public String name(int value) {
            return (String) mapValueToName.get(new Integer(value));
        }
@ -487,6 +492,7 @@ class Entities {
        /**
         * {@inheritDoc}
         */
+        @Override
        public int value(String name) {
            Object value = mapNameToValue.get(name);
            if (value == null) {
@ -591,6 +597,7 @@ class Entities {
        /**
         * {@inheritDoc}
         */
+        @Override
        public void add(String name, int value) {
            ensureCapacity(size + 1);
            names[size] = name;
@ -618,6 +625,7 @@ class Entities {
        /**
         * {@inheritDoc}
         */
+        @Override
        public String name(int value) {
            for (int i = 0; i < size; ++i) {
                if (values[i] == value) {
@ -630,6 +638,7 @@ class Entities {
        /**
         * {@inheritDoc}
         */
+        @Override
        public int value(String name) {
            for (int i = 0; i < size; ++i) {
                if (names[i].equals(name)) {
--- a/astrid/src/com/todoroo/astrid/voice/Api6VoiceOutputAssistant.java
+++ b/astrid/src/com/todoroo/astrid/voice/Api6VoiceOutputAssistant.java
@ -41,6 +41,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();
@ -50,6 +51,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) {
@ -72,6 +74,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);
@ -128,6 +131,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();
--- a/astrid/src/com/todoroo/astrid/voice/VoiceInputAssistant.java
+++ b/astrid/src/com/todoroo/astrid/voice/VoiceInputAssistant.java
@ -271,6 +271,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);
                }
--- a/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java
+++ b/astrid/src/com/todoroo/astrid/welcome/tutorial/WelcomeWalkthrough.java
@ -125,6 +125,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
--- a/astrid/src/com/todoroo/astrid/widget/WidgetConfigActivity.java
+++ b/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());