Remove warning suppressions

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

@@ -39,7 +39,6 @@ import com.todoroo.andlib.utility.AndroidUtilities;
  * @author Tim Su <tim@todoroo.com>
  *
  */
-@SuppressWarnings("nls")
 abstract public class AbstractDatabase {
 
 	// --- abstract methods

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

@@ -145,7 +145,6 @@ public abstract class AbstractModel implements Parcelable, Cloneable {
     }
 
     @Override
-    @SuppressWarnings("nls")
     public String toString() {
         StringBuilder builder = new StringBuilder();
         builder.append(getClass().getSimpleName()).append("\n")

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

@@ -28,7 +28,6 @@ import com.todoroo.andlib.sql.UnaryCriterion;
  * @param <TYPE>
  *            a database supported type, such as String or Integer
  */
-@SuppressWarnings("nls")
 public abstract class Property<TYPE> extends Field implements Cloneable {
 
     // --- implementation

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

@@ -34,7 +34,6 @@ public final class Table extends SqlTable {
      * Reads a list of properties from model class by reflection
      * @return property array
      */
-    @SuppressWarnings("nls")
     public Property<?>[] getProperties() {
         try {
             return (Property<?>[])modelClass.getField("PROPERTIES").get(null);
@@ -64,7 +63,6 @@ public final class Table extends SqlTable {
      * @param property
      * @return
      */
-    @SuppressWarnings("nls")
     public Field field(Property<?> property) {
         if(alias != null) {
             return Field.field(alias + "." + property.name);
@@ -86,4 +84,4 @@ public final class Table extends SqlTable {
         }
         return name;
     }
-}
+}

api/src/com/todoroo/andlib/data/package-info.java

@@ -2,4 +2,4 @@
  * Todoroo Library classes for the data layer: accessing data from a database or
  * {@link ContentResolver}
  */
-package com.todoroo.andlib.data;
+package com.todoroo.andlib.data;

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

@@ -38,7 +38,6 @@ public class DependencyInjectionService {
      * @param caller
      *            object to perform DI on
      */
-    @SuppressWarnings("nls")
     public void inject(Object caller) {
         // Traverse through class and all parent classes, looking for
         // fields declared with the @Autowired annotation and using
@@ -73,7 +72,6 @@ public class DependencyInjectionService {
         }
     }
 
-    @SuppressWarnings("nls")
     private boolean isQualifiedPackage(String packageName) {
         if(packageName.startsWith("com.todoroo")) {
             return true;
@@ -96,7 +94,6 @@ public class DependencyInjectionService {
      * @param field
      *            field to inject
      */
-    @SuppressWarnings("nls")
     private synchronized void handleField(Object caller, Field field)
             throws IllegalStateException, IllegalArgumentException,
             IllegalAccessException {
@@ -130,7 +127,6 @@ public class DependencyInjectionService {
     // --- default dependency injector
 
     private class DefaultDependencyInjector extends AbstractDependencyInjector {
-        @SuppressWarnings("nls")
         @Override
         protected void addInjectables() {
             injectables.put("debug", false);

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

@@ -61,7 +61,6 @@ public class HttpRestClient implements RestClient {
 
     private int timeout = TIMEOUT_MILLIS;
 
-    @SuppressWarnings("nls")
     public HttpRestClient() {
         DependencyInjectionService.getInstance().inject(this);
 
@@ -101,7 +100,6 @@ public class HttpRestClient implements RestClient {
         return httpClient.get();
     }
 
-    @SuppressWarnings("nls")
     protected void actsAsGzippable(DefaultHttpClient client) {
         client.addRequestInterceptor(new HttpRequestInterceptor() {
             @Override

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

@@ -19,4 +19,4 @@ import org.apache.http.HttpEntity;
 public interface RestClient {
     public String get(String url) throws IOException;
     public String post(String url, HttpEntity data, Header... headers) throws IOException;
-}
+}

api/src/com/todoroo/andlib/service/package-info.java

@@ -2,4 +2,4 @@
  * Todoroo Library classes for the service layer: dependency injection,
  * exceptions, HTTP requests, etc.
  */
-package com.todoroo.andlib.service;
+package com.todoroo.andlib.service;

api/src/com/todoroo/andlib/sql/Field.java

@@ -37,7 +37,6 @@ public class Field extends DBObject<Field> {
      * @param value string which field must equal
      * @return the criterion
      */
-    @SuppressWarnings("nls")
     public Criterion eqCaseInsensitive(String value) {
     	if(value == null) {
             return UnaryCriterion.isNull(this);

api/src/com/todoroo/andlib/sql/Functions.java

@@ -12,7 +12,6 @@ import com.todoroo.andlib.data.Property.StringProperty;
 
 
 
-@SuppressWarnings("nls")
 public final class Functions {
 
     public static String caseStatement(Criterion when, Object ifTrue, Object ifFalse) {

api/src/com/todoroo/andlib/sql/Join.java

@@ -38,7 +38,6 @@ public class Join {
     }
 
     @Override
-    @SuppressWarnings("nls")
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append(joinType).append(SPACE).append(JOIN).append(SPACE).append(joinTable).append(SPACE).append(ON).append(SPACE).append("(");

api/src/com/todoroo/andlib/sql/Operator.java

@@ -10,7 +10,6 @@ import static com.todoroo.andlib.sql.SqlConstants.SPACE;
 import java.util.HashMap;
 import java.util.Map;
 
-@SuppressWarnings("nls")
 public final class Operator {
 
     private final String operator;

api/src/com/todoroo/andlib/sql/Query.java

@@ -145,7 +145,6 @@ public final class Query {
         sql.deleteCharAt(sql.length() - 1).append(SPACE);
     }
 
-    @SuppressWarnings("nls")
     private void visitGroupByClause(StringBuilder sql) {
         if (groupBies.isEmpty()) {
             return;
@@ -303,7 +302,6 @@ public final class Query {
     public static class QueryTemplateHelper {
 
         /** build a content resolver query */
-        @SuppressWarnings("nls")
         public static void queryForContentResolver(String queryTemplate,
                 StringBuilder selectionClause, StringBuilder orderClause,
                 StringBuilder groupByClause) {

api/src/com/todoroo/andlib/sql/QueryTemplate.java

@@ -75,7 +75,6 @@ public final class QueryTemplate {
         sql.deleteCharAt(sql.length() - 1).append(SPACE);
     }
 
-    @SuppressWarnings("nls")
     private void visitGroupByClause(StringBuilder sql) {
         if (groupBies.isEmpty()) {
             return;

api/src/com/todoroo/andlib/sql/SqlConstants.java

@@ -5,7 +5,6 @@
  */
 package com.todoroo.andlib.sql;
 
-@SuppressWarnings("nls")
 public final class SqlConstants {
     public static final String SELECT = "SELECT";
     public static final String DISTINCT = "DISTINCT";

api/src/com/todoroo/andlib/sql/SqlTable.java

@@ -15,7 +15,6 @@ public class SqlTable extends DBObject<SqlTable> {
         return new SqlTable(table);
     }
 
-    @SuppressWarnings("nls")
     protected String fieldExpression(String fieldName) {
         if (hasAlias()) {
             return alias + "." + fieldName;

api/src/com/todoroo/andlib/sql/UnaryCriterion.java

@@ -36,7 +36,6 @@ public class UnaryCriterion extends Criterion {
         sb.append(operator);
     }
 
-    @SuppressWarnings("nls")
     protected void afterPopulateOperator(StringBuilder sb) {
         if(value == null) {
             return;
@@ -52,7 +51,6 @@ public class UnaryCriterion extends Criterion {
      * @param input
      * @return
      */
-    @SuppressWarnings("nls")
     public static String sanitize(String input) {
         return input.replace("'", "''");
     }
@@ -110,7 +108,6 @@ public class UnaryCriterion extends Criterion {
             protected void populateOperator(StringBuilder sb) {
                 sb.append(SPACE).append(operator).append(SPACE);
             }
-            @SuppressWarnings("nls")
             @Override
             protected void afterPopulateOperator(StringBuilder sb) {
                 super.afterPopulateOperator(sb);

api/src/com/todoroo/andlib/sql/package-info.java

@@ -1,4 +1,4 @@
 /**
  * Fork of <a href="http://code.google.com/p/sql-dsl/">sql-dsl</a>
  */
-package com.todoroo.andlib.sql;
+package com.todoroo.andlib.sql;

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

@@ -411,7 +411,6 @@ public class AndroidUtilities {
         public void put(T object, String key, char type, String value) throws NumberFormatException;
     }
 
-    @SuppressWarnings("nls")
     private static <T> void fromSerialized(String string, T object, SerializedPut<T> putter) {
         String[] pairs = string.split("\\" + SERIALIZATION_SEPARATOR); //$NON-NLS-1$
         for(int i = 0; i < pairs.length; i += 2) {
@@ -438,7 +437,6 @@ public class AndroidUtilities {
      * @param string
      * @return
      */
-    @SuppressWarnings("nls")
     public static ContentValues contentValuesFromString(String string) {
         if(string == null) {
             return null;
@@ -665,7 +663,6 @@ public class AndroidUtilities {
      * @param args arguments
      * @return method return value, or null if nothing was called or exception
      */
-    @SuppressWarnings("nls")
     public static Object callApiStaticMethod(int minSdk, String className,
             String methodName, Class<?>[] params, Object... args) {
         if(getSdkVersion() < minSdk) {
@@ -690,7 +687,6 @@ public class AndroidUtilities {
      * @param args arguments
      * @return method return value, or null if nothing was called or exception
      */
-    @SuppressWarnings("nls")
     public static Object callMethod(Class<?> cls, Object receiver,
             String methodName, Class<?>[] params, Object... args) {
         try {
@@ -771,7 +767,6 @@ public class AndroidUtilities {
      * @param input
      * @return
      */
-    @SuppressWarnings("nls")
     public static String md5(String input) {
         try {
             byte[] bytesOfMessage = input.getBytes("UTF-8");
@@ -1008,7 +1003,6 @@ public class AndroidUtilities {
      * @param file
      * @return
      */
-    @SuppressWarnings("nls")
     public static String getFileExtension(String file) {
         int index = file.lastIndexOf('.');
         String extension = "";
@@ -1024,7 +1018,6 @@ public class AndroidUtilities {
     /**
      * Logs a JSONObject using in a readable way
      */
-    @SuppressWarnings("nls")
     public static void logJSONObject(String tag, JSONObject object) {
         if (object == null) {
             Log.e(tag, "JSONOBject: null");

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

@@ -99,7 +99,6 @@ public class DateUtilities {
      * @param date time to format
      * @return time, with hours and minutes
      */
-    @SuppressWarnings("nls")
     public static String getTimeString(Context context, Date date, boolean excludeZeroMinutes) {
         String value;
         if (is24HourFormat(context)) {
@@ -128,7 +127,6 @@ public class DateUtilities {
      * @param date date to format
      * @return date, with month, day, and year
      */
-    @SuppressWarnings("nls")
     public static String getDateString(Context context, Date date, boolean includeYear) {
         String month = DateUtils.getMonthString(date.getMonth() +
                 Calendar.JANUARY, DateUtils.LENGTH_MEDIUM);
@@ -163,7 +161,6 @@ public class DateUtilities {
      * @param date date to format
      * @return date, with month, day, and year
      */
-    @SuppressWarnings("nls")
     public static String getDateStringHideYear(Context context, Date date) {
         String month = DateUtils.getMonthString(date.getMonth() +
                 Calendar.JANUARY, DateUtils.LENGTH_MEDIUM);
@@ -194,7 +191,6 @@ public class DateUtilities {
     /**
      * @return date format as getDateFormat with weekday
      */
-    @SuppressWarnings("nls")
     public static String getDateStringWithWeekday(Context context, Date date) {
         String weekday = getWeekday(date);
         return weekday + ", " + getDateString(context, date);
@@ -220,7 +216,6 @@ public class DateUtilities {
     /**
      * @return date format as getDateFormat with weekday
      */
-    @SuppressWarnings("nls")
     public static String getDateStringWithTimeAndWeekday(Context context, Date date) {
         return getDateStringWithWeekday(context, date) + " " + getTimeString(context, date);
     }
@@ -228,7 +223,6 @@ public class DateUtilities {
     /**
      * @return date with time at the end
      */
-    @SuppressWarnings("nls")
     public static String getDateStringWithTime(Context context, Date date) {
         return getDateString(context, date) + " " + getTimeString(context, date);
     }

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

@@ -55,7 +55,6 @@ public class DialogUtilities {
      * @param html
      * @param title
      */
-    @SuppressWarnings("nls")
     public static void htmlDialog(Context context, String html, int title) {
         WebView webView = new WebView(context);
         webView.loadDataWithBaseURL("file:///android_asset/", html, "text/html", "utf-8", null);

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

@@ -100,4 +100,4 @@ abstract public class TodorooPreferenceActivity extends PreferenceActivity {
         }
     }
 
-}
+}

api/src/com/todoroo/andlib/utility/package-info.java

@@ -1,4 +1,4 @@
 /**
  * Todoroo Library utility classes
  */
-package com.todoroo.andlib.utility;
+package com.todoroo.andlib.utility;

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

@@ -13,7 +13,6 @@ import android.widget.RemoteViews;
  *
  * @author Tim Su <tim@todoroo.com>
  */
-@SuppressWarnings("nls")
 public class AstridApiConstants {
 
     // --- General Constants

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

@@ -72,7 +72,6 @@ public class FilterCategoryWithNewButton extends FilterCategory {
     /**
      * Parcelable creator
      */
-    @SuppressWarnings("hiding")
     public static final Parcelable.Creator<FilterCategoryWithNewButton> CREATOR = new Parcelable.Creator<FilterCategoryWithNewButton>() {
 
         /**

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

@@ -87,7 +87,6 @@ public class FilterWithCustomIntent extends Filter {
     /**
      * Parcelable Creator Object
      */
-    @SuppressWarnings("hiding")
     public static final Parcelable.Creator<FilterWithCustomIntent> CREATOR = new Parcelable.Creator<FilterWithCustomIntent>() {
 
         /**

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

@@ -68,7 +68,6 @@ public class FilterWithUpdate extends FilterWithCustomIntent {
     /**
      * Parcelable Creator Object
      */
-    @SuppressWarnings("hiding")
     public static final Parcelable.Creator<FilterWithUpdate> CREATOR = new Parcelable.Creator<FilterWithUpdate>() {
 
         /**

api/src/com/todoroo/astrid/api/package-info.java

@@ -1,4 +1,4 @@
 /**
  * Astrid API constants and container packages
  */
-package com.todoroo.astrid.api;
+package com.todoroo.astrid.api;

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

@@ -45,7 +45,6 @@ public class SortHelper {
      * @param sort
      * @return
      */
-    @SuppressWarnings("nls")
     public static String adjustQueryForFlagsAndSort(String originalSql, int flags, int sort) {
         // sort
         if(originalSql == null) {
@@ -89,7 +88,6 @@ public class SortHelper {
         return flags;
     }
 
-    @SuppressWarnings("nls")
     public static Order orderForSortType(int sortType) {
         Order order;
         switch(sortType) {
@@ -124,7 +122,6 @@ public class SortHelper {
      * Returns SQL task ordering that is astrid's default algorithm
      * @return
      */
-    @SuppressWarnings("nls")
     public static Order defaultTaskOrder() {
         return Order.asc(Functions.caseStatement(Task.DUE_DATE.eq(0),
                 Functions.now() + "*2",
@@ -132,7 +129,6 @@ public class SortHelper {
                 Task.IMPORTANCE + " + 2*" + Task.COMPLETION_DATE);
     }
 
-    @SuppressWarnings("nls")
     private static String adjustedDueDateFunction() {
         return new StringBuilder("(CASE WHEN (").append(Task.DUE_DATE.name).append(" / 1000) % 60 > 0")
                 .append(" THEN ").append(Task.DUE_DATE.name).append(" ELSE ").append("(").append(Task.DUE_DATE.name)

api/src/com/todoroo/astrid/data/History.java

@@ -11,7 +11,6 @@ import com.todoroo.andlib.data.Table;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.astrid.api.AstridApiConstants;
 
-@SuppressWarnings("nls")
 public class History extends AbstractModel {
 
     /** table for this model */

api/src/com/todoroo/astrid/data/Metadata.java

@@ -23,7 +23,6 @@ import com.todoroo.astrid.api.AstridApiConstants;
  * @author Tim Su <tim@todoroo.com>
  *
  */
-@SuppressWarnings("nls")
 public class Metadata extends AbstractModel {
 
     // --- table

api/src/com/todoroo/astrid/data/OutstandingEntry.java

@@ -4,7 +4,6 @@ import com.todoroo.andlib.data.AbstractModel;
 import com.todoroo.andlib.data.Property.LongProperty;
 import com.todoroo.andlib.data.Property.StringProperty;
 
-@SuppressWarnings("nls")
 public abstract class OutstandingEntry<TYPE extends RemoteModel> extends AbstractModel {
 
     public static final String ENTITY_ID_PROPERTY_NAME = "entityId";

api/src/com/todoroo/astrid/data/RemoteModel.java

@@ -137,7 +137,6 @@ abstract public class RemoteModel extends AbstractModel {
             return String.format("cached::%s%s", tagData.getValue(TagData.NAME), tag_date);
         }
 
-        @SuppressWarnings("nls")
         public static JSONObject savePictureJson(Context context, Bitmap bitmap) {
             try {
                 String name = DateUtilities.now() + ".jpg";
@@ -189,7 +188,6 @@ abstract public class RemoteModel extends AbstractModel {
             }
         }
 
-        @SuppressWarnings("nls")
         public static Bitmap getPictureBitmap(String value) {
             try {
                 if (value == null) {

api/src/com/todoroo/astrid/data/StoreObject.java

@@ -23,7 +23,6 @@ import com.todoroo.astrid.api.AstridApiConstants;
  * @author Tim Su <tim@todoroo.com>
  *
  */
-@SuppressWarnings("nls")
 public class StoreObject extends AbstractModel {
 
     // --- table

api/src/com/todoroo/astrid/data/SyncFlags.java

@@ -5,7 +5,6 @@
  */
 package com.todoroo.astrid.data;
 
-@SuppressWarnings("nls")
 public class SyncFlags {
 
     public static final String GTASKS_SUPPRESS_SYNC = "gtasks_suppress_sync";

api/src/com/todoroo/astrid/data/TagData.java

@@ -24,7 +24,6 @@ import com.todoroo.astrid.api.AstridApiConstants;
  * @author Tim Su <tim@todoroo.com>
  *
  */
-@SuppressWarnings("nls")
 public final class TagData extends RemoteModel {
 
     // --- table and uri

api/src/com/todoroo/astrid/data/TagMetadata.java

@@ -11,7 +11,6 @@ import com.todoroo.andlib.data.Table;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.astrid.api.AstridApiConstants;
 
-@SuppressWarnings("nls")
 public class TagMetadata extends AbstractModel {
 
     public static final Table TABLE = new Table("tag_metadata", TagMetadata.class);

api/src/com/todoroo/astrid/data/TagOutstanding.java

@@ -8,7 +8,6 @@ import com.todoroo.andlib.data.Property.LongProperty;
 import com.todoroo.andlib.data.Property.StringProperty;
 import com.todoroo.andlib.data.Table;
 
-@SuppressWarnings("nls")
 public class TagOutstanding extends OutstandingEntry<TagData> {
 
     /** table for this model */

api/src/com/todoroo/astrid/data/Task.java

@@ -29,7 +29,6 @@ import org.astrid.api.R;
  * @author Tim Su <tim@todoroo.com>
  *
  */
-@SuppressWarnings("nls")
 public final class Task extends RemoteModel {
 
     // --- table and uri

api/src/com/todoroo/astrid/data/TaskApiDao.java

@@ -89,7 +89,6 @@ public class TaskApiDao extends ContentResolverDao<Task> {
         }
 
         /** @return tasks that have a blank or null title */
-        @SuppressWarnings("nls")
         public static Criterion hasNoTitle() {
             return Criterion.or(Task.TITLE.isNull(), Task.TITLE.eq(""));
         }

api/src/com/todoroo/astrid/data/TaskAttachment.java

@@ -25,7 +25,6 @@ import com.todoroo.astrid.api.AstridApiConstants;
  * @author Tim Su <tim@todoroo.com>
  *
  */
-@SuppressWarnings("nls")
 public final class TaskAttachment extends RemoteModel {
 
     // --- table and uri

api/src/com/todoroo/astrid/data/TaskAttachmentOutstanding.java

@@ -8,7 +8,6 @@ import com.todoroo.andlib.data.Property.LongProperty;
 import com.todoroo.andlib.data.Property.StringProperty;
 import com.todoroo.andlib.data.Table;
 
-@SuppressWarnings("nls")
 public class TaskAttachmentOutstanding extends OutstandingEntry<TaskAttachment> {
 
     /** table for this model */

api/src/com/todoroo/astrid/data/TaskListMetadata.java

@@ -25,7 +25,6 @@ import com.todoroo.astrid.api.AstridApiConstants;
  * @author Tim Su <tim@todoroo.com>
  *
  */
-@SuppressWarnings("nls")
 public final class TaskListMetadata extends RemoteModel {
 
     // --- table and uri

api/src/com/todoroo/astrid/data/TaskListMetadataOutstanding.java

@@ -8,7 +8,6 @@ import com.todoroo.andlib.data.Property.LongProperty;
 import com.todoroo.andlib.data.Property.StringProperty;
 import com.todoroo.andlib.data.Table;
 
-@SuppressWarnings("nls")
 public class TaskListMetadataOutstanding extends OutstandingEntry<TaskListMetadata> {
 
     /** table for this model */

api/src/com/todoroo/astrid/data/TaskOutstanding.java

@@ -8,7 +8,6 @@ import com.todoroo.andlib.data.Property.LongProperty;
 import com.todoroo.andlib.data.Property.StringProperty;
 import com.todoroo.andlib.data.Table;
 
-@SuppressWarnings("nls")
 public class TaskOutstanding extends OutstandingEntry<Task> {
 
     /** table for this model */

api/src/com/todoroo/astrid/data/Update.java

@@ -24,7 +24,6 @@ import com.todoroo.astrid.api.AstridApiConstants;
  * @author Tim Su <tim@todoroo.com>
  *
  */
-@SuppressWarnings("nls")
 @Deprecated
 public class Update extends RemoteModel {
 

api/src/com/todoroo/astrid/data/User.java

@@ -24,7 +24,6 @@ import com.todoroo.astrid.api.AstridApiConstants;
  * @author Tim Su <tim@todoroo.com>
  *
  */
-@SuppressWarnings("nls")
 public final class User extends RemoteModel {
 
     // --- table and uri

api/src/com/todoroo/astrid/data/UserActivity.java

@@ -11,7 +11,6 @@ import com.todoroo.andlib.data.Table;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.astrid.api.AstridApiConstants;
 
-@SuppressWarnings("nls")
 public class UserActivity extends RemoteModel {
 
  // --- table

api/src/com/todoroo/astrid/data/UserActivityOutstanding.java

@@ -8,7 +8,6 @@ import com.todoroo.andlib.data.Property.LongProperty;
 import com.todoroo.andlib.data.Property.StringProperty;
 import com.todoroo.andlib.data.Table;
 
-@SuppressWarnings("nls")
 public class UserActivityOutstanding extends OutstandingEntry<UserActivity> {
 
     /** table for this model */

api/src/com/todoroo/astrid/data/WaitingOnMe.java

@@ -12,7 +12,6 @@ import com.todoroo.andlib.data.Table;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.astrid.api.AstridApiConstants;
 
-@SuppressWarnings("nls")
 public class WaitingOnMe extends RemoteModel {
 
     /** table for this model */

api/src/com/todoroo/astrid/data/WaitingOnMeOutstanding.java

@@ -8,7 +8,6 @@ import com.todoroo.andlib.data.Property.LongProperty;
 import com.todoroo.andlib.data.Property.StringProperty;
 import com.todoroo.andlib.data.Table;
 
-@SuppressWarnings("nls")
 public class WaitingOnMeOutstanding extends OutstandingEntry<WaitingOnMe> {
 
     /** table for this model */

api/src/com/todoroo/astrid/data/package-info.java

@@ -1,4 +1,4 @@
 /**
  * Astrid data model classes and ContentResolver data access objects
  */
-package com.todoroo.astrid.data;
+package com.todoroo.astrid.data;

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

@@ -43,4 +43,4 @@ public class SyncContainer {
     public void prepareForSaving() {
         // override me necessary
     }
-}
+}

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

@@ -241,7 +241,6 @@ public abstract class SyncProvider<TYPE extends SyncContainer> {
         readRemotelyUpdated(data);
     }
 
-    @SuppressWarnings("nls")
     protected String getFinalSyncStatus() {
         if (getUtilities().getLastError() != null || getUtilities().getLastAttemptedSyncDate() != 0) {
             if (getUtilities().getLastAttemptedSyncDate() == 0) {

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

@@ -193,7 +193,6 @@ abstract public class SyncProviderPreferences extends TodorooPreferenceActivity
 
                 preference.setOnPreferenceClickListener(new OnPreferenceClickListener() {
                     @Override
-                    @SuppressWarnings("nls")
                     public boolean onPreferenceClick(Preference pref) {
                         // Show last error
                         new AlertDialog.Builder(SyncProviderPreferences.this)
@@ -256,7 +255,6 @@ abstract public class SyncProviderPreferences extends TodorooPreferenceActivity
      */
     private static HashMap<String, Integer> exceptionsToDisplayMessages;
 
-    @SuppressWarnings("nls")
     private static HashMap<String, Integer> getExceptionMap() {
         if (exceptionsToDisplayMessages == null) {
             exceptionsToDisplayMessages = new HashMap<String, Integer>();
@@ -292,4 +290,4 @@ abstract public class SyncProviderPreferences extends TodorooPreferenceActivity
         }
     }
 
-}
+}

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

@@ -27,4 +27,4 @@ public interface SyncResultCallback {
      * Provider finished sync
      */
     public void finished();
-}
+}

api/src/com/todoroo/astrid/sync/package-info.java

@@ -1,4 +1,4 @@
 /**
  * Astrid synchronization helpers
  */
-package com.todoroo.astrid.sync;
+package com.todoroo.astrid.sync;

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

@@ -376,4 +376,4 @@ public class MergeAdapter extends BaseAdapter implements SectionIndexer {
       notifyDataSetInvalidated();
     }
   }
-}
+}

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

@@ -37,7 +37,6 @@ import org.astrid.R;
 import com.todoroo.andlib.utility.AndroidUtilities;
 import com.todoroo.astrid.ui.ErrorCatchingListView;
 
-@SuppressWarnings("nls")
 public class TouchListView extends ErrorCatchingListView {
 	private ImageView mDragView;
 	private View mOriginalView;

astrid/src/com/mdimension/jchronic/AstridChronic.java

@@ -20,7 +20,6 @@ import com.mdimension.jchronic.tags.TimeZone;
 import com.mdimension.jchronic.utils.Span;
 import com.mdimension.jchronic.utils.Token;
 
-@SuppressWarnings("nls")
 public class AstridChronic {
   public static final String VERSION = "0.2.3";
 
@@ -71,7 +70,6 @@ public class AstridChronic {
    *     will be made, and the first matching instance of that time will
    *     be used.
    */
-  @SuppressWarnings("unchecked")
   public static Span parse(String text, Options options) {
     // store now for later =)
     //_now = options.getNow();

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

@@ -16,7 +16,6 @@ import com.todoroo.andlib.service.Autowired;
 import com.todoroo.andlib.service.DependencyInjectionService;
 
 /** Abstract controller class. Mostly contains some static fields */
-@SuppressWarnings("nls")
 abstract public class LegacyAbstractController {
 
     protected Context context;

astrid/src/com/timsu/astrid/data/LegacyAbstractModel.java

@@ -12,7 +12,6 @@ import android.content.ContentValues;
 import android.database.Cursor;
 
 /** A data object backed by a database */
-@SuppressWarnings("nls")
 public abstract class LegacyAbstractModel {
 
     /* Data Source Ordering:

astrid/src/com/timsu/astrid/data/alerts/Alert.java

@@ -20,7 +20,6 @@ import com.timsu.astrid.data.task.TaskIdentifier;
 
 
 /** A single alert on a task */
-@SuppressWarnings("nls")
 public class Alert extends LegacyAbstractModel {
 
     /** Version number of this model */

astrid/src/com/timsu/astrid/data/alerts/AlertController.java

@@ -22,7 +22,6 @@ import com.timsu.astrid.data.alerts.Alert.AlertDatabaseHelper;
 import com.timsu.astrid.data.task.TaskIdentifier;
 
 /** Controller for Tag-related operations */
-@SuppressWarnings("nls")
 public class AlertController extends LegacyAbstractController {
 
     private SQLiteDatabase alertDatabase;

astrid/src/com/timsu/astrid/data/sync/SyncDataController.java

@@ -21,7 +21,6 @@ import com.timsu.astrid.data.task.TaskIdentifier;
 import com.timsu.astrid.data.task.TaskModelForSync;
 
 /** Controller for Tag-related operations */
-@SuppressWarnings("nls")
 public class SyncDataController extends LegacyAbstractController {
 
     private SQLiteDatabase syncDatabase;

astrid/src/com/timsu/astrid/data/sync/SyncMapping.java

@@ -18,7 +18,6 @@ import com.timsu.astrid.data.task.TaskIdentifier;
 
 
 /** A single tag on a task */
-@SuppressWarnings("nls")
 public class SyncMapping extends LegacyAbstractModel {
 
 

astrid/src/com/timsu/astrid/data/tag/AbstractTagModel.java

@@ -24,7 +24,6 @@ import com.timsu.astrid.data.LegacyAbstractModel;
  * @author timsu
  *
  */
-@SuppressWarnings("nls")
 public abstract class AbstractTagModel extends LegacyAbstractModel {
 
     /** Version number of this model */

astrid/src/com/timsu/astrid/data/tag/TagController.java

@@ -23,7 +23,6 @@ import com.timsu.astrid.data.task.TaskIdentifier;
 import com.todoroo.astrid.provider.Astrid2TaskProvider;
 
 /** Controller for Tag-related operations */
-@SuppressWarnings("nls")
 @Deprecated
 public class TagController extends LegacyAbstractController {
 

astrid/src/com/timsu/astrid/data/tag/TagModelForView.java

@@ -11,7 +11,6 @@ import com.timsu.astrid.data.LegacyAbstractController;
 
 
 /** Tag model for viewing purposes. Contains task name */
-@SuppressWarnings("nls")
 public class TagModelForView extends AbstractTagModel {
 
     static String[] FIELD_LIST = new String[] {

astrid/src/com/timsu/astrid/data/tag/TagToTaskMapping.java

@@ -18,7 +18,6 @@ import com.timsu.astrid.data.task.TaskIdentifier;
 
 
 /** A single tag on a task */
-@SuppressWarnings("nls")
 public class TagToTaskMapping extends LegacyAbstractModel {
 
     /** Version number of this model */

astrid/src/com/timsu/astrid/data/task/AbstractTaskModel.java

@@ -27,7 +27,6 @@ import com.timsu.astrid.data.enums.RepeatInterval;
  * @author timsu
  *
  */
-@SuppressWarnings("nls")
 public abstract class AbstractTaskModel extends LegacyAbstractModel {
 
     /** Version number of this model */
@@ -140,7 +139,6 @@ public abstract class AbstractTaskModel extends LegacyAbstractModel {
         }
 
         @Override
-        @SuppressWarnings("fallthrough")
         public synchronized void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
             Log.w(getClass().getSimpleName(), "Upgrading database from version " +
                     oldVersion + " to " + newVersion + ".");

astrid/src/com/timsu/astrid/data/task/TaskController.java

@@ -37,7 +37,6 @@ import com.todoroo.astrid.widget.TasksWidget.WidgetUpdateService;
  *
  */
 @Deprecated
-@SuppressWarnings("nls")
 public class TaskController extends LegacyAbstractController {
 
     private SQLiteDatabase database;

astrid/src/com/timsu/astrid/data/task/TaskModelForHandlers.java

@@ -43,7 +43,6 @@ public class TaskModelForHandlers extends AbstractTaskModel {
      * @param taskController
      * @param repeatInfo
      */
-    @SuppressWarnings("deprecation")
     public void repeatTaskBy(Context context, TaskController taskController,
             RepeatInfo repeatInfo) {
 

astrid/src/com/timsu/astrid/data/task/TaskModelForProvider.java

@@ -16,7 +16,6 @@ import com.timsu.astrid.data.enums.Importance;
 
 
 /** Fields that you would want to see in the TaskView activity */
-@SuppressWarnings("nls")
 public class TaskModelForProvider extends AbstractTaskModel {
 
     static String[] FIELD_LIST = new String[] {

astrid/src/com/timsu/astrid/data/task/TaskModelForWidget.java

@@ -15,7 +15,6 @@ import com.timsu.astrid.data.enums.Importance;
 
 
 /** Fields that you would want to see in the TaskView activity */
-@SuppressWarnings("nls")
 public class TaskModelForWidget extends AbstractTaskModel {
 
     static String[] FIELD_LIST = new String[] {

astrid/src/com/timsu/astrid/data/task/TaskModelForXml.java

@@ -15,7 +15,6 @@ import com.timsu.astrid.data.enums.Importance;
 import com.timsu.astrid.data.enums.RepeatInterval;
 import com.todoroo.astrid.backup.BackupDateUtilities;
 
-@SuppressWarnings("nls")
 public class TaskModelForXml extends AbstractTaskModel {
 
     static String[] FIELD_LIST = new String[] {

astrid/src/com/timsu/astrid/utilities/LegacyTasksXmlExporter.java

@@ -35,7 +35,6 @@ import com.timsu.astrid.data.task.TaskIdentifier;
 import com.timsu.astrid.data.task.TaskModelForXml;
 import com.todoroo.astrid.backup.BackupDateUtilities;
 
-@SuppressWarnings({"nls", "deprecation"})
 public class LegacyTasksXmlExporter {
 
     private TaskController taskController;

astrid/src/com/todoroo/astrid/actfm/ActFmCameraModule.java

@@ -57,7 +57,6 @@ public class ActFmCameraModule {
                 android.R.layout.simple_spinner_dropdown_item, options.toArray(new String[options.size()]));
 
         DialogInterface.OnClickListener listener = new DialogInterface.OnClickListener() {
-            @SuppressWarnings("nls")
             @Override
             public void onClick(DialogInterface d, int which) {
                 if(which == 0 && cameraAvailable) {
@@ -107,7 +106,6 @@ public class ActFmCameraModule {
                 android.R.layout.simple_spinner_dropdown_item, options.toArray(new String[options.size()]));
 
         DialogInterface.OnClickListener listener = new DialogInterface.OnClickListener() {
-            @SuppressWarnings("nls")
             @Override
             public void onClick(DialogInterface d, int which) {
                 if(which == 0 && cameraAvailable) {
@@ -135,7 +133,6 @@ public class ActFmCameraModule {
         .show().setOwnerActivity(fragment.getActivity());
     }
 
-    @SuppressWarnings("nls")
     private static File getTempFile(Activity activity) {
         try {
             String storageState = Environment.getExternalStorageState();

astrid/src/com/todoroo/astrid/actfm/TagSettingsActivity.java

@@ -274,7 +274,6 @@ public class TagSettingsActivity extends SherlockFragmentActivity {
         }
     }
 
-    @SuppressWarnings("nls")
     private void saveSettings() {
         String oldName = tagData.getValue(TagData.NAME);
         String newName = tagName.getText().toString().trim();
@@ -413,7 +412,6 @@ public class TagSettingsActivity extends SherlockFragmentActivity {
 
     }
 
-    @SuppressWarnings("nls")
     private void updateMembers(String peopleJson, String tagUuid) {
         JSONArray people = null;
         try {

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

@@ -438,7 +438,6 @@ public class TagViewFragment extends TaskListFragment {
     // --- receivers
 
     private final BroadcastReceiver notifyReceiver = new BroadcastReceiver() {
-        @SuppressWarnings("nls")
         @Override
         public void onReceive(Context context, Intent intent) {
             if(!intent.hasExtra("tag_id")) {

astrid/src/com/todoroo/astrid/actfm/sync/ActFmInvoker.java

@@ -33,7 +33,6 @@ import com.todoroo.andlib.utility.Pair;
 import com.todoroo.andlib.utility.Preferences;
 import com.todoroo.astrid.utility.Constants;
 
-@SuppressWarnings("nls")
 public class ActFmInvoker {
 
     /** NOTE: these values are development values & will not work on production */

astrid/src/com/todoroo/astrid/actfm/sync/ActFmPreferenceService.java

@@ -134,7 +134,6 @@ public class ActFmPreferenceService extends SyncProviderUtilities {
         populateUser();
     }
 
-    @SuppressWarnings("nls")
     private static void populateUser() {
         try {
             user.put("name", Preferences.getStringValue(PREF_NAME));
@@ -177,7 +176,6 @@ public class ActFmPreferenceService extends SyncProviderUtilities {
         return name;
     }
 
-    @SuppressWarnings("nls")
     public static String thisUserName() {
         JSONObject thisUser = thisUser();
 

astrid/src/com/todoroo/astrid/actfm/sync/ActFmSyncMonitor.java

@@ -7,4 +7,4 @@ public class ActFmSyncMonitor {
     public static ActFmSyncMonitor getInstance() {
         return INSTANCE;
     }
-}
+}

astrid/src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java

@@ -30,7 +30,6 @@ import com.todoroo.astrid.tags.reusable.FeaturedListFilterExposer;
  * @author Tim Su <tim@todoroo.com>
  *
  */
-@SuppressWarnings("nls")
 public final class ActFmSyncService {
 
     // --- instance variables

astrid/src/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java

@@ -247,7 +247,6 @@ public class ActFmSyncThread {
         public void runOnErrors(List<JSONArray> errors) {/**/}
     };
 
-    @SuppressWarnings("nls")
     private void sync() {
         try {
             int batchSize = 4;
@@ -432,7 +431,6 @@ public class ActFmSyncThread {
 
     private JSONObject clientVersion = null;
 
-    @SuppressWarnings("nls")
     private JSONObject getClientVersion() {
         if (clientVersion == null) {
             try {

astrid/src/com/todoroo/astrid/actfm/sync/AstridNewSyncMigrator.java

@@ -51,7 +51,6 @@ import com.todoroo.astrid.subtasks.SubtasksHelper;
 import com.todoroo.astrid.subtasks.SubtasksUpdater;
 import com.todoroo.astrid.tags.TaskToTagMetadata;
 
-@SuppressWarnings("nls")
 public class AstridNewSyncMigrator {
 
     @Autowired private MetadataService metadataService;
@@ -75,7 +74,6 @@ public class AstridNewSyncMigrator {
         DependencyInjectionService.getInstance().inject(this);
     }
 
-    @SuppressWarnings("deprecation")
     public void performMigration() {
         if (Preferences.getBoolean(PREF_SYNC_MIGRATION, false)) {
             return;

astrid/src/com/todoroo/astrid/actfm/sync/messages/ChangesHappened.java

@@ -40,7 +40,6 @@ import com.todoroo.astrid.data.UserActivityOutstanding;
 import com.todoroo.astrid.data.WaitingOnMe;
 import com.todoroo.astrid.data.WaitingOnMeOutstanding;
 
-@SuppressWarnings("nls")
 public class ChangesHappened<TYPE extends RemoteModel, OE extends OutstandingEntry<TYPE>> extends ClientToServerMessage<TYPE> {
 
     private static final String ERROR_TAG = "actfm-changes-happened";

astrid/src/com/todoroo/astrid/actfm/sync/messages/ClientToServerMessage.java

@@ -11,7 +11,6 @@ import com.todoroo.astrid.dao.DaoReflectionHelpers;
 import com.todoroo.astrid.dao.RemoteModelDao;
 import com.todoroo.astrid.data.RemoteModel;
 
-@SuppressWarnings("nls")
 public abstract class ClientToServerMessage<TYPE extends RemoteModel> {
 
     protected final Class<TYPE> modelClass;

astrid/src/com/todoroo/astrid/actfm/sync/messages/ConstructOutstandingTableFromMasterTable.java

@@ -15,7 +15,6 @@ import com.todoroo.astrid.dao.RemoteModelDao;
 import com.todoroo.astrid.data.OutstandingEntry;
 import com.todoroo.astrid.data.RemoteModel;
 
-@SuppressWarnings("nls")
 public class ConstructOutstandingTableFromMasterTable<TYPE extends RemoteModel, OE extends OutstandingEntry<TYPE>> {
 
     protected final String table;

astrid/src/com/todoroo/astrid/actfm/sync/messages/Debug.java

@@ -12,7 +12,6 @@ public class Debug extends ServerToClientMessage {
     }
 
     @Override
-    @SuppressWarnings("nls")
     public void processMessage(String serverTime) {
         String message = json.optString("message");
         if (!TextUtils.isEmpty(message)) {

astrid/src/com/todoroo/astrid/actfm/sync/messages/FetchHistory.java

@@ -65,7 +65,6 @@ public class FetchHistory<TYPE extends RemoteModel> {
         this.done = done;
     }
 
-    @SuppressWarnings("nls")
     public void execute() {
         new Thread(new Runnable() {
             @Override

astrid/src/com/todoroo/astrid/actfm/sync/messages/JSONChangeToPropertyVisitor.java

@@ -17,7 +17,6 @@ import com.todoroo.astrid.actfm.sync.ActFmPreferenceService;
 import com.todoroo.astrid.data.Task;
 
 
-@SuppressWarnings("nls")
 public class JSONChangeToPropertyVisitor implements PropertyVisitor<Void, String> {
 
     private static final String ERROR_TAG = "actfm-make-changes";

astrid/src/com/todoroo/astrid/actfm/sync/messages/MakeChanges.java

@@ -41,7 +41,6 @@ import com.todoroo.astrid.service.MetadataService;
 import com.todoroo.astrid.tags.TagService;
 import com.todoroo.astrid.tags.TaskToTagMetadata;
 
-@SuppressWarnings("nls")
 public class MakeChanges<TYPE extends RemoteModel> extends ServerToClientMessage {
 
     private static final String ERROR_TAG = "actfm-make-changes";
@@ -217,7 +216,6 @@ public class MakeChanges<TYPE extends RemoteModel> extends ServerToClientMessage
             super(model, changes, uuid);
         }
 
-        @SuppressWarnings("deprecation")
         @Override
         public void performChanges() {
             JSONArray addMembers = changes.optJSONArray("member_added");
@@ -237,7 +235,6 @@ public class MakeChanges<TYPE extends RemoteModel> extends ServerToClientMessage
             this.oldUuid = oldUuid;
         }
 
-        @SuppressWarnings("null")
         @Override
         public void performChanges() {
             if (!TextUtils.isEmpty(oldUuid) && !oldUuid.equals(uuid)) {
@@ -332,7 +329,6 @@ public class MakeChanges<TYPE extends RemoteModel> extends ServerToClientMessage
             this.oldUuid = oldUuid;
         }
 
-        @SuppressWarnings("null")
         @Override
         public void performChanges() {
             if (!TextUtils.isEmpty(oldUuid) && !oldUuid.equals(uuid)) {

astrid/src/com/todoroo/astrid/actfm/sync/messages/NameMaps.java

@@ -17,7 +17,6 @@ import com.todoroo.astrid.data.User;
 import com.todoroo.astrid.data.UserActivity;
 import com.todoroo.astrid.data.WaitingOnMe;
 
-@SuppressWarnings("nls")
 public class NameMaps {
 
     // --------------------------------

astrid/src/com/todoroo/astrid/actfm/sync/messages/NowBriefed.java

@@ -16,7 +16,6 @@ import com.todoroo.astrid.data.TagData;
 import com.todoroo.astrid.data.Task;
 import com.todoroo.astrid.data.User;
 
-@SuppressWarnings("nls")
 public class NowBriefed<TYPE extends RemoteModel> extends ServerToClientMessage {
 
     private static final String ERROR_TAG = "actfm-now-briefed";

astrid/src/com/todoroo/astrid/actfm/sync/messages/ReplayOutstandingEntries.java

@@ -15,7 +15,6 @@ import com.todoroo.astrid.data.OutstandingEntry;
 import com.todoroo.astrid.data.RemoteModel;
 import com.todoroo.astrid.data.SyncFlags;
 
-@SuppressWarnings("nls")
 public class ReplayOutstandingEntries<T extends RemoteModel, OE extends OutstandingEntry<T>> {
 
     private static final String ERROR_TAG = "actfm-replay-outstanding";

astrid/src/com/todoroo/astrid/actfm/sync/messages/ServerToClientMessage.java

@@ -11,7 +11,6 @@ import com.todoroo.astrid.data.User;
 import com.todoroo.astrid.data.UserActivity;
 import com.todoroo.astrid.data.WaitingOnMe;
 
-@SuppressWarnings("nls")
 public abstract class ServerToClientMessage {
 
     public abstract void processMessage(String serverTime);

astrid/src/com/todoroo/astrid/actfm/sync/messages/UserData.java

@@ -19,7 +19,6 @@ public class UserData extends ServerToClientMessage {
     }
 
     @Override
-    @SuppressWarnings("nls")
     public void processMessage(String serverTime) {
         String uuid = json.optString("uuid");
         String email = json.optString("email");

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

@@ -34,7 +34,6 @@ class About {
      *
      * @param activity For context.
      */
-    @SuppressWarnings("nls")
     public static void showAbout(final Activity activity, final String versionName) {
 
         Resources r = activity.getResources();