From fadb5381f5a1ca626a0a3424af045e037d55c042 Mon Sep 17 00:00:00 2001 From: Alex Baker Date: Fri, 2 Aug 2013 12:08:00 -0500 Subject: [PATCH] Remove warning suppressions --- .../com/todoroo/andlib/data/AbstractDatabase.java | 2 +- api/src/com/todoroo/andlib/data/AbstractModel.java | 2 +- api/src/com/todoroo/andlib/data/Property.java | 2 +- api/src/com/todoroo/andlib/data/Table.java | 4 ++-- .../andlib/service/DependencyInjectionService.java | 8 ++++---- .../com/todoroo/andlib/service/HttpRestClient.java | 4 ++-- api/src/com/todoroo/andlib/sql/Field.java | 2 +- api/src/com/todoroo/andlib/sql/Functions.java | 2 +- api/src/com/todoroo/andlib/sql/Join.java | 2 +- api/src/com/todoroo/andlib/sql/Operator.java | 2 +- api/src/com/todoroo/andlib/sql/Query.java | 4 ++-- api/src/com/todoroo/andlib/sql/QueryTemplate.java | 2 +- api/src/com/todoroo/andlib/sql/SqlConstants.java | 2 +- api/src/com/todoroo/andlib/sql/SqlTable.java | 2 +- api/src/com/todoroo/andlib/sql/UnaryCriterion.java | 6 +++--- .../todoroo/andlib/utility/AndroidUtilities.java | 14 +++++++------- .../com/todoroo/andlib/utility/DateUtilities.java | 12 ++++++------ .../todoroo/andlib/utility/DialogUtilities.java | 2 +- .../com/todoroo/astrid/api/AstridApiConstants.java | 2 +- .../astrid/api/FilterCategoryWithNewButton.java | 2 +- .../todoroo/astrid/api/FilterWithCustomIntent.java | 2 +- .../com/todoroo/astrid/api/FilterWithUpdate.java | 2 +- api/src/com/todoroo/astrid/core/SortHelper.java | 8 ++++---- api/src/com/todoroo/astrid/data/History.java | 2 +- api/src/com/todoroo/astrid/data/Metadata.java | 2 +- .../com/todoroo/astrid/data/OutstandingEntry.java | 2 +- api/src/com/todoroo/astrid/data/RemoteModel.java | 4 ++-- api/src/com/todoroo/astrid/data/StoreObject.java | 2 +- api/src/com/todoroo/astrid/data/SyncFlags.java | 2 +- api/src/com/todoroo/astrid/data/TagData.java | 2 +- api/src/com/todoroo/astrid/data/TagMetadata.java | 2 +- .../com/todoroo/astrid/data/TagOutstanding.java | 2 +- api/src/com/todoroo/astrid/data/Task.java | 2 +- api/src/com/todoroo/astrid/data/TaskApiDao.java | 2 +- .../com/todoroo/astrid/data/TaskAttachment.java | 2 +- .../astrid/data/TaskAttachmentOutstanding.java | 2 +- .../com/todoroo/astrid/data/TaskListMetadata.java | 2 +- .../astrid/data/TaskListMetadataOutstanding.java | 2 +- .../com/todoroo/astrid/data/TaskOutstanding.java | 2 +- api/src/com/todoroo/astrid/data/Update.java | 2 +- api/src/com/todoroo/astrid/data/User.java | 2 +- api/src/com/todoroo/astrid/data/UserActivity.java | 2 +- .../astrid/data/UserActivityOutstanding.java | 2 +- api/src/com/todoroo/astrid/data/WaitingOnMe.java | 2 +- .../astrid/data/WaitingOnMeOutstanding.java | 2 +- api/src/com/todoroo/astrid/sync/SyncProvider.java | 2 +- .../astrid/sync/SyncProviderPreferences.java | 4 ++-- .../com/commonsware/cwac/tlv/TouchListView.java | 2 +- .../com/mdimension/jchronic/AstridChronic.java | 4 ++-- .../android/imagecache/DrawableMemCache.java | 2 +- .../com/timsu/astrid/GCMIntentService.java | 2 +- .../todoroo/astrid/actfm/ActFmCameraModule.java | 6 +++--- .../todoroo/astrid/actfm/EditPeopleControlSet.java | 12 ++++++------ .../todoroo/astrid/actfm/TagSettingsActivity.java | 4 ++-- .../com/todoroo/astrid/actfm/TagViewFragment.java | 8 ++++---- .../todoroo/astrid/actfm/sync/ActFmInvoker.java | 2 +- .../astrid/actfm/sync/ActFmPreferenceService.java | 4 ++-- .../astrid/actfm/sync/ActFmSyncService.java | 2 +- .../todoroo/astrid/actfm/sync/ActFmSyncThread.java | 4 ++-- .../astrid/actfm/sync/ActFmSyncV2Provider.java | 2 +- .../astrid/actfm/sync/AstridNewSyncMigrator.java | 4 ++-- .../actfm/sync/messages/ChangesHappened.java | 2 +- .../actfm/sync/messages/ClientToServerMessage.java | 2 +- .../ConstructOutstandingTableFromMasterTable.java | 2 +- .../todoroo/astrid/actfm/sync/messages/Debug.java | 2 +- .../astrid/actfm/sync/messages/FetchHistory.java | 2 +- .../sync/messages/JSONChangeToPropertyVisitor.java | 2 +- .../astrid/actfm/sync/messages/MakeChanges.java | 8 ++++---- .../astrid/actfm/sync/messages/NameMaps.java | 2 +- .../astrid/actfm/sync/messages/NowBriefed.java | 2 +- .../sync/messages/ReplayOutstandingEntries.java | 2 +- .../actfm/sync/messages/ServerToClientMessage.java | 2 +- .../astrid/actfm/sync/messages/UserData.java | 2 +- .../com/todoroo/astrid/alarms/AlarmService.java | 2 +- .../com/todoroo/astrid/backup/BackupConstants.java | 2 +- .../todoroo/astrid/backup/BackupDateUtilities.java | 2 +- .../todoroo/astrid/backup/FilePickerBuilder.java | 2 +- .../todoroo/astrid/backup/TasksXmlExporter.java | 2 +- .../todoroo/astrid/backup/TasksXmlImporter.java | 8 ++++---- .../astrid/calls/PhoneStateChangedReceiver.java | 2 +- .../com/todoroo/astrid/core/CorePlugin.java | 2 +- .../todoroo/astrid/core/CustomFilterActivity.java | 10 +++++----- .../todoroo/astrid/core/CustomFilterAdapter.java | 2 +- .../com/todoroo/astrid/core/LinkActionExposer.java | 2 +- .../com/todoroo/astrid/files/FileUtilities.java | 2 +- .../com/todoroo/astrid/files/FilesAction.java | 2 +- .../com/todoroo/astrid/files/FilesControlSet.java | 4 ++-- .../todoroo/astrid/gcal/CalendarAlarmReceiver.java | 2 +- .../astrid/gcal/CalendarAlarmScheduler.java | 2 +- .../astrid/gcal/CalendarReminderActivity.java | 2 +- .../com/todoroo/astrid/gcal/Calendars.java | 2 +- .../com/todoroo/astrid/gcal/GCalControlSet.java | 4 ++-- .../com/todoroo/astrid/gcal/GCalHelper.java | 8 ++++---- .../astrid/gcal/GCalTaskCompleteListener.java | 2 +- .../gtasks/GtasksCustomFilterCriteriaExposer.java | 2 +- .../todoroo/astrid/gtasks/GtasksListService.java | 2 +- .../astrid/gtasks/GtasksMetadataService.java | 2 +- .../astrid/gtasks/api/GtasksApiUtilities.java | 2 +- .../todoroo/astrid/gtasks/api/GtasksInvoker.java | 2 +- .../astrid/gtasks/auth/GtasksTokenValidator.java | 2 +- .../astrid/gtasks/auth/ModernAuthManager.java | 4 ++-- .../astrid/gtasks/sync/GtasksSyncService.java | 2 +- .../todoroo/astrid/locale/LocaleEditAlerts.java | 8 ++++---- .../com/todoroo/astrid/locale/LocaleReceiver.java | 2 +- .../com/todoroo/astrid/notes/EditNoteActivity.java | 2 +- .../com/todoroo/astrid/notes/NotesAction.java | 2 +- .../todoroo/astrid/notes/NotesDetailExposer.java | 2 +- .../com/todoroo/astrid/notes/NotesPlugin.java | 2 +- .../todoroo/astrid/opencrx/OpencrxControlSet.java | 4 ++-- .../todoroo/astrid/people/PeopleFilterExposer.java | 4 ++-- .../reminders/ReminderDebugContextActions.java | 2 +- .../reminders/ReminderSchedulingService.java | 2 +- .../todoroo/astrid/reminders/ReminderService.java | 2 +- .../todoroo/astrid/repeats/RepeatControlSet.java | 4 ++-- .../subtasks/AstridOrderedListFragmentHelper.java | 2 +- .../OrderedMetadataListFragmentHelper.java | 2 +- .../subtasks/OrderedMetadataListUpdater.java | 2 +- .../todoroo/astrid/subtasks/SubtasksHelper.java | 6 +++--- .../astrid/subtasks/SubtasksMetadataMigration.java | 4 ++-- .../todoroo/astrid/subtasks/SubtasksUpdater.java | 2 +- .../com/todoroo/astrid/tags/TagCaseMigrator.java | 2 +- .../tags/TagCustomFilterCriteriaExposer.java | 2 +- .../com/todoroo/astrid/tags/TagFilterExposer.java | 2 +- .../com/todoroo/astrid/tags/TagService.java | 2 +- .../com/todoroo/astrid/tags/TagsPlugin.java | 2 +- .../com/todoroo/astrid/timers/TimerPlugin.java | 2 +- .../astrid/data/LegacyAbstractController.java | 2 +- .../com/timsu/astrid/data/LegacyAbstractModel.java | 2 +- .../com/timsu/astrid/data/alerts/Alert.java | 2 +- .../timsu/astrid/data/alerts/AlertController.java | 2 +- .../timsu/astrid/data/sync/SyncDataController.java | 2 +- .../com/timsu/astrid/data/sync/SyncMapping.java | 2 +- .../timsu/astrid/data/tag/AbstractTagModel.java | 2 +- .../com/timsu/astrid/data/tag/TagController.java | 2 +- .../com/timsu/astrid/data/tag/TagModelForView.java | 2 +- .../timsu/astrid/data/tag/TagToTaskMapping.java | 2 +- .../timsu/astrid/data/task/AbstractTaskModel.java | 4 ++-- .../com/timsu/astrid/data/task/TaskController.java | 2 +- .../astrid/data/task/TaskModelForHandlers.java | 2 +- .../astrid/data/task/TaskModelForProvider.java | 2 +- .../timsu/astrid/data/task/TaskModelForWidget.java | 2 +- .../timsu/astrid/data/task/TaskModelForXml.java | 2 +- .../astrid/utilities/LegacyTasksXmlExporter.java | 2 +- .../todoroo/astrid/activity/EditPreferences.java | 2 +- .../astrid/activity/ExpandableListFragment.java | 2 +- .../astrid/activity/FilterShortcutActivity.java | 2 +- .../todoroo/astrid/activity/TaskEditFragment.java | 4 ++-- .../todoroo/astrid/activity/TaskListFragment.java | 4 ++-- .../com/todoroo/astrid/adapter/TaskAdapter.java | 12 ++++++------ .../com/todoroo/astrid/adapter/UpdateAdapter.java | 10 +++++----- .../astrid/billing/AstridPurchaseObserver.java | 2 +- astrid/src/com/todoroo/astrid/billing/Base64.java | 2 +- .../todoroo/astrid/billing/BillingActivity.java | 6 +++--- .../todoroo/astrid/billing/BillingConstants.java | 2 +- .../com/todoroo/astrid/billing/BillingService.java | 2 +- .../src/com/todoroo/astrid/billing/Security.java | 2 +- .../todoroo/astrid/dao/DaoReflectionHelpers.java | 2 +- astrid/src/com/todoroo/astrid/dao/Database.java | 2 +- astrid/src/com/todoroo/astrid/dao/TaskDao.java | 2 +- .../src/com/todoroo/astrid/data/ABTestEvent.java | 2 +- .../com/todoroo/astrid/legacy/AlarmDatabase.java | 2 +- .../todoroo/astrid/legacy/LegacyAlertModel.java | 2 +- .../com/todoroo/astrid/legacy/LegacyTagModel.java | 2 +- .../com/todoroo/astrid/legacy/LegacyTaskModel.java | 2 +- .../todoroo/astrid/legacy/TransitionalAlarm.java | 2 +- .../astrid/provider/Astrid2TaskProvider.java | 2 +- .../astrid/provider/Astrid3ContentProvider.java | 2 +- .../astrid/provider/SqlContentProvider.java | 2 +- .../com/todoroo/astrid/service/AddOnService.java | 2 +- .../astrid/service/Astrid2To3UpgradeHelper.java | 8 ++++---- .../astrid/service/AstridDependencyInjector.java | 2 +- .../com/todoroo/astrid/service/TagDataService.java | 4 ++-- .../com/todoroo/astrid/service/TaskService.java | 2 +- .../com/todoroo/astrid/service/ThemeService.java | 2 +- .../astrid/service/UpdateMessagePreference.java | 2 +- .../astrid/service/UpdateMessageService.java | 2 +- .../com/todoroo/astrid/service/UpgradeService.java | 6 +++--- .../abtesting/ABTestEventReportingService.java | 2 +- .../astrid/service/abtesting/ABTestInvoker.java | 2 +- .../com/todoroo/astrid/ui/ContactListAdapter.java | 2 +- .../com/todoroo/astrid/ui/DateChangedAlerts.java | 6 +++--- .../astrid/ui/DeadlineTimePickerDialog.java | 2 +- .../com/todoroo/astrid/ui/DraggableListView.java | 6 +++--- .../todoroo/astrid/ui/FeedbackPromptDialogs.java | 2 +- astrid/src/com/todoroo/astrid/ui/NumberPicker.java | 2 +- .../src/com/todoroo/astrid/ui/PeopleContainer.java | 10 +++++----- astrid/src/com/todoroo/astrid/ui/QuickAddBar.java | 2 +- .../todoroo/astrid/ui/TaskListFragmentPager.java | 2 +- .../todoroo/astrid/ui/TimeDurationControlSet.java | 2 +- .../src/com/todoroo/astrid/utility/Constants.java | 2 +- .../src/com/todoroo/astrid/utility/Entities.java | 2 +- .../todoroo/astrid/utility/StringEscapeUtils.java | 2 +- .../com/todoroo/astrid/utility/TitleParser.java | 2 +- .../astrid/voice/Api6VoiceOutputAssistant.java | 2 +- .../todoroo/astrid/voice/VoiceInputAssistant.java | 2 +- .../src/com/todoroo/astrid/widget/TasksWidget.java | 4 ++-- .../astrid/widget/WidgetConfigActivity.java | 2 +- 197 files changed, 290 insertions(+), 290 deletions(-) diff --git a/api/src/com/todoroo/andlib/data/AbstractDatabase.java b/api/src/com/todoroo/andlib/data/AbstractDatabase.java index eae19fa01..6077907d9 100644 --- a/api/src/com/todoroo/andlib/data/AbstractDatabase.java +++ b/api/src/com/todoroo/andlib/data/AbstractDatabase.java @@ -38,7 +38,7 @@ import java.util.ArrayList; * * @author Tim Su */ -@SuppressWarnings("nls") + abstract public class AbstractDatabase { // --- abstract methods diff --git a/api/src/com/todoroo/andlib/data/AbstractModel.java b/api/src/com/todoroo/andlib/data/AbstractModel.java index 3f9fbc2a6..8e512ee85 100644 --- a/api/src/com/todoroo/andlib/data/AbstractModel.java +++ b/api/src/com/todoroo/andlib/data/AbstractModel.java @@ -166,7 +166,7 @@ public abstract class AbstractModel implements Parcelable, Cloneable { } @Override - @SuppressWarnings("nls") + public String toString() { StringBuilder builder = new StringBuilder(); builder.append(getClass().getSimpleName()).append("\n") diff --git a/api/src/com/todoroo/andlib/data/Property.java b/api/src/com/todoroo/andlib/data/Property.java index 43827c026..cceb03234 100644 --- a/api/src/com/todoroo/andlib/data/Property.java +++ b/api/src/com/todoroo/andlib/data/Property.java @@ -27,7 +27,7 @@ import static com.todoroo.andlib.sql.SqlConstants.SPACE; * @param a database supported type, such as String or Integer * @author Tim Su */ -@SuppressWarnings("nls") + public abstract class Property extends Field { // --- implementation diff --git a/api/src/com/todoroo/andlib/data/Table.java b/api/src/com/todoroo/andlib/data/Table.java index 4defca0bf..905de40a7 100644 --- a/api/src/com/todoroo/andlib/data/Table.java +++ b/api/src/com/todoroo/andlib/data/Table.java @@ -34,7 +34,7 @@ public final class Table extends SqlTable { * * @return property array */ - @SuppressWarnings("nls") + public Property[] getProperties() { try { return (Property[]) modelClass.getField("PROPERTIES").get(null); @@ -65,7 +65,7 @@ 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); diff --git a/api/src/com/todoroo/andlib/service/DependencyInjectionService.java b/api/src/com/todoroo/andlib/service/DependencyInjectionService.java index 6a1747937..10ed53dd1 100644 --- a/api/src/com/todoroo/andlib/service/DependencyInjectionService.java +++ b/api/src/com/todoroo/andlib/service/DependencyInjectionService.java @@ -35,7 +35,7 @@ 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 @@ -70,7 +70,7 @@ public class DependencyInjectionService { } } - @SuppressWarnings("nls") + private boolean isQualifiedPackage(String packageName) { if (packageName.startsWith("com.todoroo")) { return true; @@ -91,7 +91,7 @@ public class DependencyInjectionService { * @param caller calling object * @param field field to inject */ - @SuppressWarnings("nls") + private synchronized void handleField(Object caller, Field field) throws IllegalStateException, IllegalArgumentException, IllegalAccessException { @@ -125,7 +125,7 @@ public class DependencyInjectionService { // --- default dependency injector private class DefaultDependencyInjector extends AbstractDependencyInjector { - @SuppressWarnings("nls") + @Override protected void addInjectables() { injectables.put("debug", false); diff --git a/api/src/com/todoroo/andlib/service/HttpRestClient.java b/api/src/com/todoroo/andlib/service/HttpRestClient.java index 21fff33c6..221acfd37 100644 --- a/api/src/com/todoroo/andlib/service/HttpRestClient.java +++ b/api/src/com/todoroo/andlib/service/HttpRestClient.java @@ -60,7 +60,7 @@ public class HttpRestClient implements RestClient { private int timeout = TIMEOUT_MILLIS; - @SuppressWarnings("nls") + public HttpRestClient() { DependencyInjectionService.getInstance().inject(this); @@ -99,7 +99,7 @@ public class HttpRestClient implements RestClient { return httpClient.get(); } - @SuppressWarnings("nls") + protected void actsAsGzippable(DefaultHttpClient client) { client.addRequestInterceptor(new HttpRequestInterceptor() { @Override diff --git a/api/src/com/todoroo/andlib/sql/Field.java b/api/src/com/todoroo/andlib/sql/Field.java index 4b722ff37..5ba4a2d3c 100644 --- a/api/src/com/todoroo/andlib/sql/Field.java +++ b/api/src/com/todoroo/andlib/sql/Field.java @@ -37,7 +37,7 @@ public class Field extends DBObject { * @param value string which field must equal * @return the criterion */ - @SuppressWarnings("nls") + public Criterion eqCaseInsensitive(String value) { if (value == null) { return UnaryCriterion.isNull(this); diff --git a/api/src/com/todoroo/andlib/sql/Functions.java b/api/src/com/todoroo/andlib/sql/Functions.java index a818c71ac..558a93cf0 100644 --- a/api/src/com/todoroo/andlib/sql/Functions.java +++ b/api/src/com/todoroo/andlib/sql/Functions.java @@ -10,7 +10,7 @@ import com.todoroo.andlib.data.Property.LongProperty; import com.todoroo.andlib.data.Property.StringProperty; -@SuppressWarnings("nls") + public final class Functions { public static String caseStatement(Criterion when, Object ifTrue, Object ifFalse) { diff --git a/api/src/com/todoroo/andlib/sql/Join.java b/api/src/com/todoroo/andlib/sql/Join.java index b318bb005..f5e24d6bb 100644 --- a/api/src/com/todoroo/andlib/sql/Join.java +++ b/api/src/com/todoroo/andlib/sql/Join.java @@ -38,7 +38,7 @@ 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("("); diff --git a/api/src/com/todoroo/andlib/sql/Operator.java b/api/src/com/todoroo/andlib/sql/Operator.java index b94a0259e..58d7d491a 100644 --- a/api/src/com/todoroo/andlib/sql/Operator.java +++ b/api/src/com/todoroo/andlib/sql/Operator.java @@ -10,7 +10,7 @@ import java.util.Map; import static com.todoroo.andlib.sql.SqlConstants.SPACE; -@SuppressWarnings("nls") + public final class Operator { private final String operator; diff --git a/api/src/com/todoroo/andlib/sql/Query.java b/api/src/com/todoroo/andlib/sql/Query.java index 555ff7e20..d7b7bdb9f 100644 --- a/api/src/com/todoroo/andlib/sql/Query.java +++ b/api/src/com/todoroo/andlib/sql/Query.java @@ -145,7 +145,7 @@ public final class Query { sql.deleteCharAt(sql.length() - 1).append(SPACE); } - @SuppressWarnings("nls") + private void visitGroupByClause(StringBuilder sql) { if (groupBies.isEmpty()) { return; @@ -310,7 +310,7 @@ public final class Query { /** * build a content resolver query */ - @SuppressWarnings("nls") + public static void queryForContentResolver(String queryTemplate, StringBuilder selectionClause, StringBuilder orderClause, StringBuilder groupByClause) { diff --git a/api/src/com/todoroo/andlib/sql/QueryTemplate.java b/api/src/com/todoroo/andlib/sql/QueryTemplate.java index cd34a2cb6..d2dab7558 100644 --- a/api/src/com/todoroo/andlib/sql/QueryTemplate.java +++ b/api/src/com/todoroo/andlib/sql/QueryTemplate.java @@ -74,7 +74,7 @@ public final class QueryTemplate { sql.deleteCharAt(sql.length() - 1).append(SPACE); } - @SuppressWarnings("nls") + private void visitGroupByClause(StringBuilder sql) { if (groupBies.isEmpty()) { return; diff --git a/api/src/com/todoroo/andlib/sql/SqlConstants.java b/api/src/com/todoroo/andlib/sql/SqlConstants.java index d6ffaafe2..a377de1f2 100644 --- a/api/src/com/todoroo/andlib/sql/SqlConstants.java +++ b/api/src/com/todoroo/andlib/sql/SqlConstants.java @@ -5,7 +5,7 @@ */ package com.todoroo.andlib.sql; -@SuppressWarnings("nls") + public final class SqlConstants { public static final String SELECT = "SELECT"; public static final String DISTINCT = "DISTINCT"; diff --git a/api/src/com/todoroo/andlib/sql/SqlTable.java b/api/src/com/todoroo/andlib/sql/SqlTable.java index 3baa5d4d0..4dd1ebf47 100644 --- a/api/src/com/todoroo/andlib/sql/SqlTable.java +++ b/api/src/com/todoroo/andlib/sql/SqlTable.java @@ -15,7 +15,7 @@ public class SqlTable extends DBObject { return new SqlTable(table); } - @SuppressWarnings("nls") + protected String fieldExpression(String fieldName) { if (hasAlias()) { return alias + "." + fieldName; diff --git a/api/src/com/todoroo/andlib/sql/UnaryCriterion.java b/api/src/com/todoroo/andlib/sql/UnaryCriterion.java index d0b6b5a9f..c26c7e538 100644 --- a/api/src/com/todoroo/andlib/sql/UnaryCriterion.java +++ b/api/src/com/todoroo/andlib/sql/UnaryCriterion.java @@ -36,7 +36,7 @@ public class UnaryCriterion extends Criterion { sb.append(operator); } - @SuppressWarnings("nls") + protected void afterPopulateOperator(StringBuilder sb) { if (value == null) { return; @@ -53,7 +53,7 @@ public class UnaryCriterion extends Criterion { * @param input * @return */ - @SuppressWarnings("nls") + public static String sanitize(String input) { return input.replace("'", "''"); } @@ -112,7 +112,7 @@ public class UnaryCriterion extends Criterion { sb.append(SPACE).append(operator).append(SPACE); } - @SuppressWarnings("nls") + @Override protected void afterPopulateOperator(StringBuilder sb) { super.afterPopulateOperator(sb); diff --git a/api/src/com/todoroo/andlib/utility/AndroidUtilities.java b/api/src/com/todoroo/andlib/utility/AndroidUtilities.java index 21f286286..76ec43b79 100644 --- a/api/src/com/todoroo/andlib/utility/AndroidUtilities.java +++ b/api/src/com/todoroo/andlib/utility/AndroidUtilities.java @@ -425,7 +425,7 @@ public class AndroidUtilities { public void put(T object, String key, char type, String value) throws NumberFormatException; } - @SuppressWarnings("nls") + private static void fromSerialized(String string, T object, SerializedPut putter) { String[] pairs = string.split("\\" + SERIALIZATION_SEPARATOR); //$NON-NLS-1$ for (int i = 0; i < pairs.length; i += 2) { @@ -451,7 +451,7 @@ public class AndroidUtilities { * @param string * @return */ - @SuppressWarnings("nls") + public static ContentValues contentValuesFromString(String string) { if (string == null) { return null; @@ -686,7 +686,7 @@ 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) { @@ -712,7 +712,7 @@ 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 { @@ -795,7 +795,7 @@ public class AndroidUtilities { * @param input * @return */ - @SuppressWarnings("nls") + public static String md5(String input) { try { byte[] bytesOfMessage = input.getBytes("UTF-8"); @@ -1042,7 +1042,7 @@ public class AndroidUtilities { * @param file * @return */ - @SuppressWarnings("nls") + public static String getFileExtension(String file) { int index = file.lastIndexOf('.'); String extension = ""; @@ -1058,7 +1058,7 @@ 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"); diff --git a/api/src/com/todoroo/andlib/utility/DateUtilities.java b/api/src/com/todoroo/andlib/utility/DateUtilities.java index 263fbdebf..aea50892e 100644 --- a/api/src/com/todoroo/andlib/utility/DateUtilities.java +++ b/api/src/com/todoroo/andlib/utility/DateUtilities.java @@ -115,7 +115,7 @@ 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)) { @@ -143,7 +143,7 @@ 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); @@ -179,7 +179,7 @@ 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); @@ -210,7 +210,7 @@ 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); @@ -236,7 +236,7 @@ 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); } @@ -244,7 +244,7 @@ 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); } diff --git a/api/src/com/todoroo/andlib/utility/DialogUtilities.java b/api/src/com/todoroo/andlib/utility/DialogUtilities.java index 641e93b16..71da64eb3 100644 --- a/api/src/com/todoroo/andlib/utility/DialogUtilities.java +++ b/api/src/com/todoroo/andlib/utility/DialogUtilities.java @@ -55,7 +55,7 @@ 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); diff --git a/api/src/com/todoroo/astrid/api/AstridApiConstants.java b/api/src/com/todoroo/astrid/api/AstridApiConstants.java index f36206a15..989419a4d 100644 --- a/api/src/com/todoroo/astrid/api/AstridApiConstants.java +++ b/api/src/com/todoroo/astrid/api/AstridApiConstants.java @@ -13,7 +13,7 @@ import android.widget.RemoteViews; * * @author Tim Su */ -@SuppressWarnings("nls") + public class AstridApiConstants { // --- General Constants diff --git a/api/src/com/todoroo/astrid/api/FilterCategoryWithNewButton.java b/api/src/com/todoroo/astrid/api/FilterCategoryWithNewButton.java index 145f3affa..f709cfcf3 100644 --- a/api/src/com/todoroo/astrid/api/FilterCategoryWithNewButton.java +++ b/api/src/com/todoroo/astrid/api/FilterCategoryWithNewButton.java @@ -69,7 +69,7 @@ public class FilterCategoryWithNewButton extends FilterCategory { /** * Parcelable creator */ - @SuppressWarnings("hiding") + public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { /** diff --git a/api/src/com/todoroo/astrid/api/FilterWithCustomIntent.java b/api/src/com/todoroo/astrid/api/FilterWithCustomIntent.java index 67ec03b58..8432c573f 100644 --- a/api/src/com/todoroo/astrid/api/FilterWithCustomIntent.java +++ b/api/src/com/todoroo/astrid/api/FilterWithCustomIntent.java @@ -86,7 +86,7 @@ public class FilterWithCustomIntent extends Filter { /** * Parcelable Creator Object */ - @SuppressWarnings("hiding") + public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { /** diff --git a/api/src/com/todoroo/astrid/api/FilterWithUpdate.java b/api/src/com/todoroo/astrid/api/FilterWithUpdate.java index 9595e7e5c..8babb07cf 100644 --- a/api/src/com/todoroo/astrid/api/FilterWithUpdate.java +++ b/api/src/com/todoroo/astrid/api/FilterWithUpdate.java @@ -67,7 +67,7 @@ public class FilterWithUpdate extends FilterWithCustomIntent { /** * Parcelable Creator Object */ - @SuppressWarnings("hiding") + public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { /** diff --git a/api/src/com/todoroo/astrid/core/SortHelper.java b/api/src/com/todoroo/astrid/core/SortHelper.java index e1bf40489..051d18df2 100644 --- a/api/src/com/todoroo/astrid/core/SortHelper.java +++ b/api/src/com/todoroo/astrid/core/SortHelper.java @@ -49,7 +49,7 @@ public class SortHelper { * @param sort * @return */ - @SuppressWarnings("nls") + public static String adjustQueryForFlagsAndSort(String originalSql, int flags, int sort) { // sort if (originalSql == null) { @@ -93,7 +93,7 @@ public class SortHelper { return flags; } - @SuppressWarnings("nls") + public static Order orderForSortType(int sortType) { Order order; switch (sortType) { @@ -129,7 +129,7 @@ public class SortHelper { * * @return */ - @SuppressWarnings("nls") + public static Order defaultTaskOrder() { return Order.asc(Functions.caseStatement(Task.DUE_DATE.eq(0), Functions.now() + "*2", @@ -137,7 +137,7 @@ 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) diff --git a/api/src/com/todoroo/astrid/data/History.java b/api/src/com/todoroo/astrid/data/History.java index 2bdaaa3e1..6788bc02a 100644 --- a/api/src/com/todoroo/astrid/data/History.java +++ b/api/src/com/todoroo/astrid/data/History.java @@ -11,7 +11,7 @@ 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 { /** diff --git a/api/src/com/todoroo/astrid/data/Metadata.java b/api/src/com/todoroo/astrid/data/Metadata.java index bfc6f5da5..3294f6993 100644 --- a/api/src/com/todoroo/astrid/data/Metadata.java +++ b/api/src/com/todoroo/astrid/data/Metadata.java @@ -22,7 +22,7 @@ import com.todoroo.astrid.api.AstridApiConstants; * * @author Tim Su */ -@SuppressWarnings("nls") + public class Metadata extends AbstractModel { // --- table diff --git a/api/src/com/todoroo/astrid/data/OutstandingEntry.java b/api/src/com/todoroo/astrid/data/OutstandingEntry.java index 879281869..fc7de8d98 100644 --- a/api/src/com/todoroo/astrid/data/OutstandingEntry.java +++ b/api/src/com/todoroo/astrid/data/OutstandingEntry.java @@ -4,7 +4,7 @@ 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 extends AbstractModel { public static final String ENTITY_ID_PROPERTY_NAME = "entityId"; diff --git a/api/src/com/todoroo/astrid/data/RemoteModel.java b/api/src/com/todoroo/astrid/data/RemoteModel.java index 9939f1c21..d99b5200e 100644 --- a/api/src/com/todoroo/astrid/data/RemoteModel.java +++ b/api/src/com/todoroo/astrid/data/RemoteModel.java @@ -155,7 +155,7 @@ 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"; @@ -207,7 +207,7 @@ abstract public class RemoteModel extends AbstractModel { } } - @SuppressWarnings("nls") + public static Bitmap getPictureBitmap(String value) { try { if (value == null) { diff --git a/api/src/com/todoroo/astrid/data/StoreObject.java b/api/src/com/todoroo/astrid/data/StoreObject.java index d90292921..fefbd7492 100644 --- a/api/src/com/todoroo/astrid/data/StoreObject.java +++ b/api/src/com/todoroo/astrid/data/StoreObject.java @@ -22,7 +22,7 @@ import com.todoroo.astrid.api.AstridApiConstants; * * @author Tim Su */ -@SuppressWarnings("nls") + public class StoreObject extends AbstractModel { // --- table diff --git a/api/src/com/todoroo/astrid/data/SyncFlags.java b/api/src/com/todoroo/astrid/data/SyncFlags.java index 74057a28c..bcb1dac09 100644 --- a/api/src/com/todoroo/astrid/data/SyncFlags.java +++ b/api/src/com/todoroo/astrid/data/SyncFlags.java @@ -5,7 +5,7 @@ */ package com.todoroo.astrid.data; -@SuppressWarnings("nls") + public class SyncFlags { public static final String GTASKS_SUPPRESS_SYNC = "gtasks_suppress_sync"; diff --git a/api/src/com/todoroo/astrid/data/TagData.java b/api/src/com/todoroo/astrid/data/TagData.java index c4027273d..8f94a371e 100644 --- a/api/src/com/todoroo/astrid/data/TagData.java +++ b/api/src/com/todoroo/astrid/data/TagData.java @@ -23,7 +23,7 @@ import com.todoroo.astrid.api.AstridApiConstants; * * @author Tim Su */ -@SuppressWarnings("nls") + public final class TagData extends RemoteModel { // --- table and uri diff --git a/api/src/com/todoroo/astrid/data/TagMetadata.java b/api/src/com/todoroo/astrid/data/TagMetadata.java index 6da7bb8af..8de55f845 100644 --- a/api/src/com/todoroo/astrid/data/TagMetadata.java +++ b/api/src/com/todoroo/astrid/data/TagMetadata.java @@ -11,7 +11,7 @@ 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); diff --git a/api/src/com/todoroo/astrid/data/TagOutstanding.java b/api/src/com/todoroo/astrid/data/TagOutstanding.java index b970c6d91..e635981f5 100644 --- a/api/src/com/todoroo/astrid/data/TagOutstanding.java +++ b/api/src/com/todoroo/astrid/data/TagOutstanding.java @@ -8,7 +8,7 @@ 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 { /** diff --git a/api/src/com/todoroo/astrid/data/Task.java b/api/src/com/todoroo/astrid/data/Task.java index cc373a7c4..775f22282 100644 --- a/api/src/com/todoroo/astrid/data/Task.java +++ b/api/src/com/todoroo/astrid/data/Task.java @@ -28,7 +28,7 @@ import java.util.Date; * * @author Tim Su */ -@SuppressWarnings("nls") + public final class Task extends RemoteModel { // --- table and uri diff --git a/api/src/com/todoroo/astrid/data/TaskApiDao.java b/api/src/com/todoroo/astrid/data/TaskApiDao.java index 6b50b98f1..0c4c99132 100644 --- a/api/src/com/todoroo/astrid/data/TaskApiDao.java +++ b/api/src/com/todoroo/astrid/data/TaskApiDao.java @@ -110,7 +110,7 @@ public class TaskApiDao extends ContentResolverDao { /** * @return tasks that have a blank or null title */ - @SuppressWarnings("nls") + public static Criterion hasNoTitle() { return Criterion.or(Task.TITLE.isNull(), Task.TITLE.eq("")); } diff --git a/api/src/com/todoroo/astrid/data/TaskAttachment.java b/api/src/com/todoroo/astrid/data/TaskAttachment.java index 1db2dab08..785640917 100644 --- a/api/src/com/todoroo/astrid/data/TaskAttachment.java +++ b/api/src/com/todoroo/astrid/data/TaskAttachment.java @@ -24,7 +24,7 @@ import com.todoroo.astrid.api.AstridApiConstants; * * @author Tim Su */ -@SuppressWarnings("nls") + public final class TaskAttachment extends RemoteModel { // --- table and uri diff --git a/api/src/com/todoroo/astrid/data/TaskAttachmentOutstanding.java b/api/src/com/todoroo/astrid/data/TaskAttachmentOutstanding.java index e3f377748..1be51486c 100644 --- a/api/src/com/todoroo/astrid/data/TaskAttachmentOutstanding.java +++ b/api/src/com/todoroo/astrid/data/TaskAttachmentOutstanding.java @@ -8,7 +8,7 @@ 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 { /** diff --git a/api/src/com/todoroo/astrid/data/TaskListMetadata.java b/api/src/com/todoroo/astrid/data/TaskListMetadata.java index bbacb0424..7f4060005 100644 --- a/api/src/com/todoroo/astrid/data/TaskListMetadata.java +++ b/api/src/com/todoroo/astrid/data/TaskListMetadata.java @@ -24,7 +24,7 @@ import com.todoroo.astrid.api.AstridApiConstants; * * @author Tim Su */ -@SuppressWarnings("nls") + public final class TaskListMetadata extends RemoteModel { // --- table and uri diff --git a/api/src/com/todoroo/astrid/data/TaskListMetadataOutstanding.java b/api/src/com/todoroo/astrid/data/TaskListMetadataOutstanding.java index eab6d0e66..0050c54c9 100644 --- a/api/src/com/todoroo/astrid/data/TaskListMetadataOutstanding.java +++ b/api/src/com/todoroo/astrid/data/TaskListMetadataOutstanding.java @@ -8,7 +8,7 @@ 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 { /** diff --git a/api/src/com/todoroo/astrid/data/TaskOutstanding.java b/api/src/com/todoroo/astrid/data/TaskOutstanding.java index 7b5ecc8c4..335bd3a51 100644 --- a/api/src/com/todoroo/astrid/data/TaskOutstanding.java +++ b/api/src/com/todoroo/astrid/data/TaskOutstanding.java @@ -8,7 +8,7 @@ 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 { /** diff --git a/api/src/com/todoroo/astrid/data/Update.java b/api/src/com/todoroo/astrid/data/Update.java index 5e91159db..6f87ee312 100644 --- a/api/src/com/todoroo/astrid/data/Update.java +++ b/api/src/com/todoroo/astrid/data/Update.java @@ -22,7 +22,7 @@ import com.todoroo.astrid.api.AstridApiConstants; * * @author Tim Su */ -@SuppressWarnings("nls") + @Deprecated public class Update extends RemoteModel { diff --git a/api/src/com/todoroo/astrid/data/User.java b/api/src/com/todoroo/astrid/data/User.java index f94920476..cc46e5b88 100644 --- a/api/src/com/todoroo/astrid/data/User.java +++ b/api/src/com/todoroo/astrid/data/User.java @@ -23,7 +23,7 @@ import com.todoroo.astrid.api.AstridApiConstants; * * @author Tim Su */ -@SuppressWarnings("nls") + public final class User extends RemoteModel { // --- table and uri diff --git a/api/src/com/todoroo/astrid/data/UserActivity.java b/api/src/com/todoroo/astrid/data/UserActivity.java index 1fff12c27..c82392f3f 100644 --- a/api/src/com/todoroo/astrid/data/UserActivity.java +++ b/api/src/com/todoroo/astrid/data/UserActivity.java @@ -11,7 +11,7 @@ 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 diff --git a/api/src/com/todoroo/astrid/data/UserActivityOutstanding.java b/api/src/com/todoroo/astrid/data/UserActivityOutstanding.java index df1045163..4a06774da 100644 --- a/api/src/com/todoroo/astrid/data/UserActivityOutstanding.java +++ b/api/src/com/todoroo/astrid/data/UserActivityOutstanding.java @@ -8,7 +8,7 @@ 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 { /** diff --git a/api/src/com/todoroo/astrid/data/WaitingOnMe.java b/api/src/com/todoroo/astrid/data/WaitingOnMe.java index ce7cc4867..042221b0a 100644 --- a/api/src/com/todoroo/astrid/data/WaitingOnMe.java +++ b/api/src/com/todoroo/astrid/data/WaitingOnMe.java @@ -12,7 +12,7 @@ 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 { /** diff --git a/api/src/com/todoroo/astrid/data/WaitingOnMeOutstanding.java b/api/src/com/todoroo/astrid/data/WaitingOnMeOutstanding.java index 859dc5cc3..25f6be986 100644 --- a/api/src/com/todoroo/astrid/data/WaitingOnMeOutstanding.java +++ b/api/src/com/todoroo/astrid/data/WaitingOnMeOutstanding.java @@ -8,7 +8,7 @@ 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 { /** diff --git a/api/src/com/todoroo/astrid/sync/SyncProvider.java b/api/src/com/todoroo/astrid/sync/SyncProvider.java index e4915d938..e809c72cd 100644 --- a/api/src/com/todoroo/astrid/sync/SyncProvider.java +++ b/api/src/com/todoroo/astrid/sync/SyncProvider.java @@ -239,7 +239,7 @@ public abstract class SyncProvider { readRemotelyUpdated(data); } - @SuppressWarnings("nls") + protected String getFinalSyncStatus() { if (getUtilities().getLastError() != null || getUtilities().getLastAttemptedSyncDate() != 0) { if (getUtilities().getLastAttemptedSyncDate() == 0) { diff --git a/api/src/com/todoroo/astrid/sync/SyncProviderPreferences.java b/api/src/com/todoroo/astrid/sync/SyncProviderPreferences.java index e3ac77c71..7838ce0a3 100644 --- a/api/src/com/todoroo/astrid/sync/SyncProviderPreferences.java +++ b/api/src/com/todoroo/astrid/sync/SyncProviderPreferences.java @@ -188,7 +188,7 @@ 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) @@ -251,7 +251,7 @@ abstract public class SyncProviderPreferences extends TodorooPreferenceActivity */ private static HashMap exceptionsToDisplayMessages; - @SuppressWarnings("nls") + private static HashMap getExceptionMap() { if (exceptionsToDisplayMessages == null) { exceptionsToDisplayMessages = new HashMap(); diff --git a/astrid/common-src/com/commonsware/cwac/tlv/TouchListView.java b/astrid/common-src/com/commonsware/cwac/tlv/TouchListView.java index a83e3bb7d..4a7d98136 100644 --- a/astrid/common-src/com/commonsware/cwac/tlv/TouchListView.java +++ b/astrid/common-src/com/commonsware/cwac/tlv/TouchListView.java @@ -37,7 +37,7 @@ import com.timsu.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; diff --git a/astrid/common-src/com/mdimension/jchronic/AstridChronic.java b/astrid/common-src/com/mdimension/jchronic/AstridChronic.java index 9fddc1a12..aaa35dcbe 100644 --- a/astrid/common-src/com/mdimension/jchronic/AstridChronic.java +++ b/astrid/common-src/com/mdimension/jchronic/AstridChronic.java @@ -20,7 +20,7 @@ import com.mdimension.jchronic.utils.Token; import java.util.LinkedList; import java.util.List; -@SuppressWarnings("nls") + public class AstridChronic { public static final String VERSION = "0.2.3"; @@ -71,7 +71,7 @@ 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(); diff --git a/astrid/common-src/edu/mit/mobile/android/imagecache/DrawableMemCache.java b/astrid/common-src/edu/mit/mobile/android/imagecache/DrawableMemCache.java index 695e23d56..39f43e4ad 100644 --- a/astrid/common-src/edu/mit/mobile/android/imagecache/DrawableMemCache.java +++ b/astrid/common-src/edu/mit/mobile/android/imagecache/DrawableMemCache.java @@ -25,7 +25,7 @@ import android.support.v4.util.LruCache; public class DrawableMemCache extends LruCache { - @SuppressWarnings("unused") + private static final String TAG = DrawableMemCache.class.getSimpleName(); public DrawableMemCache(int maxSize) { diff --git a/astrid/plugin-src/com/timsu/astrid/GCMIntentService.java b/astrid/plugin-src/com/timsu/astrid/GCMIntentService.java index 86a41397d..963fa1092 100644 --- a/astrid/plugin-src/com/timsu/astrid/GCMIntentService.java +++ b/astrid/plugin-src/com/timsu/astrid/GCMIntentService.java @@ -50,7 +50,7 @@ import com.todoroo.astrid.utility.Constants; import java.io.IOException; -@SuppressWarnings("nls") + public class GCMIntentService extends GCMBaseIntentService { public static final String SENDER_ID = "1003855277730"; //$NON-NLS-1$ diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmCameraModule.java b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmCameraModule.java index 4fbd2aa0a..92148c4c8 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmCameraModule.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/ActFmCameraModule.java @@ -57,7 +57,7 @@ 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 +107,7 @@ 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 +135,7 @@ public class ActFmCameraModule { .show().setOwnerActivity(fragment.getActivity()); } - @SuppressWarnings("nls") + private static File getTempFile(Activity activity) { try { String storageState = Environment.getExternalStorageState(); diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java index 07d6e58ba..9cad4a62f 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/EditPeopleControlSet.java @@ -243,7 +243,7 @@ public class EditPeopleControlSet extends PopupControlSet { } } - @SuppressWarnings("nls") + private void buildAssignedToSpinner(Task t, ArrayList sharedWith) { HashSet userIds = new HashSet(); HashSet emails = new HashSet(); @@ -360,7 +360,7 @@ public class EditPeopleControlSet extends PopupControlSet { } } - @SuppressWarnings("nls") + private ArrayList convertJsonUsersToAssignedUsers(ArrayList jsonUsers, HashSet userIds, HashSet emails, HashMap names) { ArrayList users = new ArrayList(); @@ -412,7 +412,7 @@ public class EditPeopleControlSet extends PopupControlSet { return users; } - @SuppressWarnings("nls") + private int findAssignedIndex(Task t, ArrayList... userLists) { String assignedStr = t.getValue(Task.USER); String assignedId = Task.USER_ID_IGNORE; @@ -495,7 +495,7 @@ public class EditPeopleControlSet extends PopupControlSet { this.positionOffset = positionOffset; } - @SuppressWarnings("nls") + @Override public View getView(int position, View convertView, ViewGroup parent) { if (convertView == null) { @@ -618,7 +618,7 @@ public class EditPeopleControlSet extends PopupControlSet { * @param toast toast to show after saving is finished * @return false if login is required & save should be halted */ - @SuppressWarnings("nls") + public boolean saveSharingSettings(String toast) { if (task == null) { return false; @@ -665,7 +665,7 @@ public class EditPeopleControlSet extends PopupControlSet { String taskUserId = Task.USER_ID_EMAIL; String taskUserEmail = ""; try { - @SuppressWarnings("deprecation") // For backwards compatibility + // For backwards compatibility JSONObject taskUser = new JSONObject(task.getValue(Task.USER)); taskUserId = getLongOrStringId(taskUser, Task.USER_ID_EMAIL); taskUserEmail = taskUser.optString("email"); diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java index 72e795b80..43ac38b84 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagSettingsActivity.java @@ -292,7 +292,7 @@ public class TagSettingsActivity extends SherlockFragmentActivity { } } - @SuppressWarnings("nls") + private void saveSettings() { String oldName = tagData.getValue(TagData.NAME); String newName = tagName.getText().toString().trim(); @@ -448,7 +448,7 @@ public class TagSettingsActivity extends SherlockFragmentActivity { } - @SuppressWarnings("nls") + private void updateMembers(String peopleJson, String tagUuid) { tagMembers.removeAllViews(); JSONArray people = null; diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java index 78784b6f5..13593fa1b 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagViewFragment.java @@ -608,7 +608,7 @@ public class TagViewFragment extends TaskListFragment { } } - @SuppressWarnings("nls") + private void addImageForMember(LinearLayout membersView, JSONObject member) { DisplayMetrics displayMetrics = new DisplayMetrics(); getActivity().getWindowManager().getDefaultDisplay().getMetrics(displayMetrics); @@ -647,7 +647,7 @@ public class TagViewFragment extends TaskListFragment { return new OnClickListener() { final String email = member.optString("email"); //$NON-NLS-1$ - @SuppressWarnings("deprecation") + @Override public void onClick(View v) { if (currentId.equals(id)) { @@ -693,7 +693,7 @@ public class TagViewFragment extends TaskListFragment { setUpTaskList(); } - @SuppressWarnings("nls") + private String displayName(JSONObject user) { String name = user.optString("name"); if (!TextUtils.isEmpty(name) && !"null".equals(name)) { @@ -719,7 +719,7 @@ 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")) { diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmInvoker.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmInvoker.java index b1d36a6c6..fb7a4b1e9 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmInvoker.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmInvoker.java @@ -36,7 +36,7 @@ import java.util.Collections; import java.util.Comparator; import java.util.TimeZone; -@SuppressWarnings("nls") + public class ActFmInvoker { /** diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmPreferenceService.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmPreferenceService.java index d9a4fac53..10f45c4c3 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmPreferenceService.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmPreferenceService.java @@ -155,7 +155,7 @@ public class ActFmPreferenceService extends SyncProviderUtilities { populateUser(); } - @SuppressWarnings("nls") + private static void populateUser() { try { user.put("name", Preferences.getStringValue(PREF_NAME)); @@ -211,7 +211,7 @@ public class ActFmPreferenceService extends SyncProviderUtilities { return name; } - @SuppressWarnings("nls") + public static String thisUserName() { JSONObject thisUser = thisUser(); diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java index 9882e1059..a5eb62e2b 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncService.java @@ -33,7 +33,7 @@ import java.util.List; * * @author Tim Su */ -@SuppressWarnings("nls") + public final class ActFmSyncService { // --- instance variables diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java index a54856c8a..867424140 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncThread.java @@ -248,7 +248,7 @@ public class ActFmSyncThread { public void runOnErrors(List errors) {/**/} }; - @SuppressWarnings("nls") + private void sync() { try { int batchSize = 4; @@ -433,7 +433,7 @@ public class ActFmSyncThread { private JSONObject clientVersion = null; - @SuppressWarnings("nls") + private JSONObject getClientVersion() { if (clientVersion == null) { try { diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java index e944b11c3..8a43e0ec6 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/ActFmSyncV2Provider.java @@ -104,7 +104,7 @@ public class ActFmSyncV2Provider extends SyncV2Provider { /** * fetch user status hash */ - @SuppressWarnings("nls") + public void updateUserStatus() { if (Preferences.getStringValue(GCMIntentService.PREF_NEEDS_REGISTRATION) != null) { actFmSyncService.setGCMRegistration(Preferences.getStringValue(GCMIntentService.PREF_NEEDS_REGISTRATION)); diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/AstridNewSyncMigrator.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/AstridNewSyncMigrator.java index 3359fb227..9f9dd0197 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/AstridNewSyncMigrator.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/AstridNewSyncMigrator.java @@ -51,7 +51,7 @@ import com.todoroo.astrid.tags.TaskToTagMetadata; import java.util.HashSet; import java.util.Set; -@SuppressWarnings("nls") + public class AstridNewSyncMigrator { @Autowired @@ -86,7 +86,7 @@ public class AstridNewSyncMigrator { DependencyInjectionService.getInstance().inject(this); } - @SuppressWarnings("deprecation") + public void performMigration() { if (Preferences.getBoolean(PREF_SYNC_MIGRATION, false)) { return; diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ChangesHappened.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ChangesHappened.java index c9208cdbe..c041ff8dc 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ChangesHappened.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ChangesHappened.java @@ -40,7 +40,7 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -@SuppressWarnings("nls") + public class ChangesHappened> extends ClientToServerMessage { private static final String ERROR_TAG = "actfm-changes-happened"; diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ClientToServerMessage.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ClientToServerMessage.java index d067f9095..9c9cd1efe 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ClientToServerMessage.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ClientToServerMessage.java @@ -11,7 +11,7 @@ import org.apache.http.entity.mime.MultipartEntity; import org.json.JSONException; import org.json.JSONObject; -@SuppressWarnings("nls") + public abstract class ClientToServerMessage { protected final Class modelClass; diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ConstructOutstandingTableFromMasterTable.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ConstructOutstandingTableFromMasterTable.java index b215bde8a..adba88bcc 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ConstructOutstandingTableFromMasterTable.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ConstructOutstandingTableFromMasterTable.java @@ -15,7 +15,7 @@ import com.todoroo.astrid.dao.RemoteModelDao; import com.todoroo.astrid.data.OutstandingEntry; import com.todoroo.astrid.data.RemoteModel; -@SuppressWarnings("nls") + public class ConstructOutstandingTableFromMasterTable> { protected final String table; diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/Debug.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/Debug.java index 32d6e249e..e6e9e4bb9 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/Debug.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/Debug.java @@ -12,7 +12,7 @@ public class Debug extends ServerToClientMessage { } @Override - @SuppressWarnings("nls") + public void processMessage(String serverTime) { String message = json.optString("message"); if (!TextUtils.isEmpty(message)) { diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/FetchHistory.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/FetchHistory.java index 955702ce8..a8205bc13 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/FetchHistory.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/FetchHistory.java @@ -65,7 +65,7 @@ public class FetchHistory { this.done = done; } - @SuppressWarnings("nls") + public void execute() { new Thread(new Runnable() { @Override diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/JSONChangeToPropertyVisitor.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/JSONChangeToPropertyVisitor.java index efb27f032..4860b67c1 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/JSONChangeToPropertyVisitor.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/JSONChangeToPropertyVisitor.java @@ -17,7 +17,7 @@ import org.json.JSONException; import org.json.JSONObject; -@SuppressWarnings("nls") + public class JSONChangeToPropertyVisitor implements PropertyVisitor { private static final String ERROR_TAG = "actfm-make-changes"; diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/MakeChanges.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/MakeChanges.java index 2715639f5..ad6edaa19 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/MakeChanges.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/MakeChanges.java @@ -41,7 +41,7 @@ import java.text.ParseException; import java.util.ArrayList; import java.util.Iterator; -@SuppressWarnings("nls") + public class MakeChanges extends ServerToClientMessage { private static final String ERROR_TAG = "actfm-make-changes"; @@ -217,7 +217,7 @@ public class MakeChanges extends ServerToClientMessage super(model, changes, uuid); } - @SuppressWarnings("deprecation") + @Override public void performChanges() { JSONArray addMembers = changes.optJSONArray("member_added"); @@ -237,7 +237,7 @@ public class MakeChanges extends ServerToClientMessage this.oldUuid = oldUuid; } - @SuppressWarnings("null") + @Override public void performChanges() { if (!TextUtils.isEmpty(oldUuid) && !oldUuid.equals(uuid)) { @@ -332,7 +332,7 @@ public class MakeChanges extends ServerToClientMessage this.oldUuid = oldUuid; } - @SuppressWarnings("null") + @Override public void performChanges() { if (!TextUtils.isEmpty(oldUuid) && !oldUuid.equals(uuid)) { diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/NameMaps.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/NameMaps.java index 83f0ce4f4..c60016e4f 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/NameMaps.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/NameMaps.java @@ -17,7 +17,7 @@ import java.util.HashSet; import java.util.Map; import java.util.Set; -@SuppressWarnings("nls") + public class NameMaps { // -------------------------------- diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/NowBriefed.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/NowBriefed.java index a11b83968..cbfe2c75b 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/NowBriefed.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/NowBriefed.java @@ -16,7 +16,7 @@ import org.json.JSONObject; import java.text.ParseException; -@SuppressWarnings("nls") + public class NowBriefed extends ServerToClientMessage { private static final String ERROR_TAG = "actfm-now-briefed"; diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ReplayOutstandingEntries.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ReplayOutstandingEntries.java index e16dea6a4..0c75a4b2f 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ReplayOutstandingEntries.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ReplayOutstandingEntries.java @@ -15,7 +15,7 @@ import com.todoroo.astrid.data.OutstandingEntry; import com.todoroo.astrid.data.RemoteModel; import com.todoroo.astrid.data.SyncFlags; -@SuppressWarnings("nls") + public class ReplayOutstandingEntries> { private static final String ERROR_TAG = "actfm-replay-outstanding"; diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ServerToClientMessage.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ServerToClientMessage.java index 428bf7737..444ab5340 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ServerToClientMessage.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/ServerToClientMessage.java @@ -11,7 +11,7 @@ import com.todoroo.astrid.data.WaitingOnMe; import org.json.JSONObject; -@SuppressWarnings("nls") + public abstract class ServerToClientMessage { public abstract void processMessage(String serverTime); diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/UserData.java b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/UserData.java index b3e04b799..21bb2589b 100644 --- a/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/UserData.java +++ b/astrid/plugin-src/com/todoroo/astrid/actfm/sync/messages/UserData.java @@ -19,7 +19,7 @@ public class UserData extends ServerToClientMessage { } @Override - @SuppressWarnings("nls") + public void processMessage(String serverTime) { String uuid = json.optString("uuid"); String email = json.optString("email"); diff --git a/astrid/plugin-src/com/todoroo/astrid/alarms/AlarmService.java b/astrid/plugin-src/com/todoroo/astrid/alarms/AlarmService.java index 6f46d973d..f87b0b3ef 100644 --- a/astrid/plugin-src/com/todoroo/astrid/alarms/AlarmService.java +++ b/astrid/plugin-src/com/todoroo/astrid/alarms/AlarmService.java @@ -186,7 +186,7 @@ public class AlarmService { * * @param shouldPerformPropertyCheck whether to check if task has requisite properties */ - @SuppressWarnings("nls") + private void scheduleAlarm(Metadata alarm) { if (alarm == null) { return; diff --git a/astrid/plugin-src/com/todoroo/astrid/backup/BackupConstants.java b/astrid/plugin-src/com/todoroo/astrid/backup/BackupConstants.java index a9c73ee9c..39b3e2195 100644 --- a/astrid/plugin-src/com/todoroo/astrid/backup/BackupConstants.java +++ b/astrid/plugin-src/com/todoroo/astrid/backup/BackupConstants.java @@ -14,7 +14,7 @@ import java.io.File; * * @author Tim Su */ -@SuppressWarnings("nls") + public class BackupConstants { // Do NOT edit the constants in this file! You will break compatibility with old backups diff --git a/astrid/plugin-src/com/todoroo/astrid/backup/BackupDateUtilities.java b/astrid/plugin-src/com/todoroo/astrid/backup/BackupDateUtilities.java index 804dc1fcb..28aa858e9 100644 --- a/astrid/plugin-src/com/todoroo/astrid/backup/BackupDateUtilities.java +++ b/astrid/plugin-src/com/todoroo/astrid/backup/BackupDateUtilities.java @@ -17,7 +17,7 @@ import java.util.Date; * * @author Tim Su */ -@SuppressWarnings("nls") + public class BackupDateUtilities { private static final String ISO_8601_FORMAT = "yyyy-MM-dd'T'HH:mm:ssz"; diff --git a/astrid/plugin-src/com/todoroo/astrid/backup/FilePickerBuilder.java b/astrid/plugin-src/com/todoroo/astrid/backup/FilePickerBuilder.java index 890e24c07..0b744ba6a 100644 --- a/astrid/plugin-src/com/todoroo/astrid/backup/FilePickerBuilder.java +++ b/astrid/plugin-src/com/todoroo/astrid/backup/FilePickerBuilder.java @@ -16,7 +16,7 @@ import com.todoroo.andlib.utility.AndroidUtilities; import java.io.File; import java.io.FilenameFilter; -@SuppressWarnings("nls") + public class FilePickerBuilder extends AlertDialog.Builder implements DialogInterface.OnClickListener { public interface OnFilePickedListener { diff --git a/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlExporter.java b/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlExporter.java index 9d4bed8a2..5a9fdca9a 100644 --- a/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlExporter.java +++ b/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlExporter.java @@ -157,7 +157,7 @@ public class TasksXmlExporter { } - @SuppressWarnings("nls") + private void doTasksExport(String output) throws IOException { File xmlFile = new File(output); xmlFile.createNewFile(); diff --git a/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlImporter.java b/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlImporter.java index 2bc83ac21..ed3fb6703 100644 --- a/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlImporter.java +++ b/astrid/plugin-src/com/todoroo/astrid/backup/TasksXmlImporter.java @@ -133,7 +133,7 @@ public class TasksXmlImporter { }).start(); } - @SuppressWarnings("nls") + private void performImport() throws IOException, XmlPullParserException { XmlPullParserFactory factory = XmlPullParserFactory.newInstance(); XmlPullParser xpp = factory.newPullParser(); @@ -248,7 +248,7 @@ public class TasksXmlImporter { } } - @SuppressWarnings("nls") + private void parseTask() { taskCount++; setProgressMessage(context.getString(R.string.import_progress_read, @@ -496,7 +496,7 @@ public class TasksXmlImporter { tags.clear(); } - @SuppressWarnings("nls") + private Task parseTask() { taskCount++; setProgressMessage(context.getString(R.string.import_progress_read, @@ -559,7 +559,7 @@ public class TasksXmlImporter { /** * helper method to set field on a task */ - @SuppressWarnings("nls") + private boolean setTaskField(Task task, String field, String value) { if (field.equals(LegacyTaskModel.ID)) { // ignore diff --git a/astrid/plugin-src/com/todoroo/astrid/calls/PhoneStateChangedReceiver.java b/astrid/plugin-src/com/todoroo/astrid/calls/PhoneStateChangedReceiver.java index 6a498b464..a8b20409c 100644 --- a/astrid/plugin-src/com/todoroo/astrid/calls/PhoneStateChangedReceiver.java +++ b/astrid/plugin-src/com/todoroo/astrid/calls/PhoneStateChangedReceiver.java @@ -23,7 +23,7 @@ import com.todoroo.andlib.utility.Preferences; import java.util.Date; -@SuppressWarnings("nls") + public class PhoneStateChangedReceiver extends BroadcastReceiver { private static final String PREF_LAST_INCOMING_NUMBER = "last_incoming_number"; diff --git a/astrid/plugin-src/com/todoroo/astrid/core/CorePlugin.java b/astrid/plugin-src/com/todoroo/astrid/core/CorePlugin.java index 59b13c0f8..6ab7948e7 100644 --- a/astrid/plugin-src/com/todoroo/astrid/core/CorePlugin.java +++ b/astrid/plugin-src/com/todoroo/astrid/core/CorePlugin.java @@ -17,7 +17,7 @@ public class CorePlugin extends BroadcastReceiver { static final String IDENTIFIER = "core"; //$NON-NLS-1$ @Override - @SuppressWarnings("nls") + public void onReceive(Context context, Intent intent) { Addon plugin = new Addon(IDENTIFIER, "Core Filters", "Todoroo", "Provides 'Inbox', 'Search', and 'More...' Filters"); diff --git a/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterActivity.java b/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterActivity.java index 8af966024..5457f8058 100644 --- a/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterActivity.java +++ b/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterActivity.java @@ -108,7 +108,7 @@ public class CustomFilterActivity extends SherlockFragmentActivity { */ public int start, end, max; - @SuppressWarnings("nls") + public String getTitleFromCriterion() { if (criterion instanceof MultipleSelectCriterion) { if (selectedIndex >= 0 && ((MultipleSelectCriterion) criterion).entryTitles != null && @@ -199,7 +199,7 @@ public class CustomFilterActivity extends SherlockFragmentActivity { * Populate criteria list with built in and plugin criteria. The request is sent to every application * registered to listen for this broadcast. Each plugin can then add criteria to this activity. */ - @SuppressWarnings("nls") + private void populateCriteria() { Intent broadcastIntent = new Intent(AstridApiConstants.BROADCAST_REQUEST_CUSTOM_FILTER_CRITERIA); sendOrderedBroadcast(broadcastIntent, AstridApiConstants.PERMISSION_READ); @@ -387,7 +387,7 @@ public class CustomFilterActivity extends SherlockFragmentActivity { } } - @SuppressWarnings("nls") + void saveAndView() { StringBuilder sql = new StringBuilder(" WHERE "); StringBuilder suggestedTitle = new StringBuilder(); @@ -456,7 +456,7 @@ public class CustomFilterActivity extends SherlockFragmentActivity { /** * Recalculate all sizes */ - @SuppressWarnings("nls") + void updateList() { int max = 0, last = -1; @@ -512,7 +512,7 @@ public class CustomFilterActivity extends SherlockFragmentActivity { adapter.notifyDataSetInvalidated(); } - @SuppressWarnings("nls") + private V getNth(int index, Map map) { int i = 0; for (V v : map.values()) { diff --git a/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterAdapter.java b/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterAdapter.java index 1924950f0..16fbf097b 100644 --- a/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterAdapter.java +++ b/astrid/plugin-src/com/todoroo/astrid/core/CustomFilterAdapter.java @@ -184,7 +184,7 @@ public class CustomFilterAdapter extends ArrayAdapter { public FilterView filterView; } - @SuppressWarnings("nls") + private void initializeView(View convertView) { ViewHolder viewHolder = (ViewHolder) convertView.getTag(); CriterionInstance item = viewHolder.item; diff --git a/astrid/plugin-src/com/todoroo/astrid/core/LinkActionExposer.java b/astrid/plugin-src/com/todoroo/astrid/core/LinkActionExposer.java index 4a07e49bf..77240511b 100644 --- a/astrid/plugin-src/com/todoroo/astrid/core/LinkActionExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/core/LinkActionExposer.java @@ -79,7 +79,7 @@ public class LinkActionExposer { return null; } - @SuppressWarnings("nls") + private static TaskAction createLinkAction(Context context, long id, String url, String text, PackageManager pm) { Intent itemIntent = new Intent(Intent.ACTION_VIEW); itemIntent.setData(Uri.parse(url)); diff --git a/astrid/plugin-src/com/todoroo/astrid/files/FileUtilities.java b/astrid/plugin-src/com/todoroo/astrid/files/FileUtilities.java index 1e1272160..d472f76b7 100644 --- a/astrid/plugin-src/com/todoroo/astrid/files/FileUtilities.java +++ b/astrid/plugin-src/com/todoroo/astrid/files/FileUtilities.java @@ -27,7 +27,7 @@ public class FileUtilities { return DateUtilities.getDateStringHideYear(context, date) + ", " + getTimeStringForFilename(context, date); //$NON-NLS-1$ } - @SuppressWarnings("nls") + private static String getTimeStringForFilename(Context context, Date date) { String value; if (DateUtilities.is24HourFormat(context)) { diff --git a/astrid/plugin-src/com/todoroo/astrid/files/FilesAction.java b/astrid/plugin-src/com/todoroo/astrid/files/FilesAction.java index 9089ca5b4..3847410ec 100644 --- a/astrid/plugin-src/com/todoroo/astrid/files/FilesAction.java +++ b/astrid/plugin-src/com/todoroo/astrid/files/FilesAction.java @@ -19,7 +19,7 @@ public class FilesAction extends TaskAction { // /** // * Parcelable creator // */ -// @SuppressWarnings("hiding") +// // public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { // /** // * {@inheritDoc} diff --git a/astrid/plugin-src/com/todoroo/astrid/files/FilesControlSet.java b/astrid/plugin-src/com/todoroo/astrid/files/FilesControlSet.java index 065855e3b..1f6279b87 100644 --- a/astrid/plugin-src/com/todoroo/astrid/files/FilesControlSet.java +++ b/astrid/plugin-src/com/todoroo/astrid/files/FilesControlSet.java @@ -314,7 +314,7 @@ public class FilesControlSet extends PopupControlSet { }, null); } - @SuppressWarnings("nls") + private void downloadFile(final TaskAttachment m) { final ProgressDialog pd = new ProgressDialog(activity); pd.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL); @@ -434,7 +434,7 @@ public class FilesControlSet extends PopupControlSet { return name.substring(0, extension); } - @SuppressWarnings("nls") + private String getTypeString(String name) { int extension = name.lastIndexOf('.'); if (extension < 0 || extension + 1 >= name.length()) { diff --git a/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarAlarmReceiver.java b/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarAlarmReceiver.java index 0da053eef..b6e105756 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarAlarmReceiver.java +++ b/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarAlarmReceiver.java @@ -22,7 +22,7 @@ import java.util.ArrayList; import java.util.HashSet; import java.util.Set; -@SuppressWarnings("nls") + public class CalendarAlarmReceiver extends BroadcastReceiver { public static final int REQUEST_CODE_CAL_REMINDER = 100; diff --git a/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarAlarmScheduler.java b/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarAlarmScheduler.java index 9796b5332..0900166dc 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarAlarmScheduler.java +++ b/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarAlarmScheduler.java @@ -16,7 +16,7 @@ import com.todoroo.astrid.utility.Constants; import java.util.Date; -@SuppressWarnings("nls") + public class CalendarAlarmScheduler { public static final String TAG = "calendar-alarm"; diff --git a/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarReminderActivity.java b/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarReminderActivity.java index c7e918495..b6d849b0e 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarReminderActivity.java +++ b/astrid/plugin-src/com/todoroo/astrid/gcal/CalendarReminderActivity.java @@ -33,7 +33,7 @@ import com.todoroo.astrid.utility.Constants; import java.util.Date; -@SuppressWarnings("nls") + public class CalendarReminderActivity extends Activity { public static final String TOKEN_NAMES = "names"; diff --git a/astrid/plugin-src/com/todoroo/astrid/gcal/Calendars.java b/astrid/plugin-src/com/todoroo/astrid/gcal/Calendars.java index fbfc2a51f..b6f9db9d6 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gcal/Calendars.java +++ b/astrid/plugin-src/com/todoroo/astrid/gcal/Calendars.java @@ -22,7 +22,7 @@ import com.todoroo.andlib.utility.Preferences; import java.util.ArrayList; import java.util.Arrays; -@SuppressWarnings("nls") + public class Calendars { public static final String CALENDAR_CONTENT_CALENDARS = "calendars"; diff --git a/astrid/plugin-src/com/todoroo/astrid/gcal/GCalControlSet.java b/astrid/plugin-src/com/todoroo/astrid/gcal/GCalControlSet.java index c5657098e..05a56602c 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gcal/GCalControlSet.java +++ b/astrid/plugin-src/com/todoroo/astrid/gcal/GCalControlSet.java @@ -135,7 +135,7 @@ public class GCalControlSet extends PopupControlSet { } } - @SuppressWarnings("nls") + @Override protected String writeToModelAfterInitialized(Task task) { if (!task.hasDueDate()) { @@ -200,7 +200,7 @@ public class GCalControlSet extends PopupControlSet { return null; } - @SuppressWarnings("nls") + private void viewCalendarEvent() { if (calendarUri == null) { return; diff --git a/astrid/plugin-src/com/todoroo/astrid/gcal/GCalHelper.java b/astrid/plugin-src/com/todoroo/astrid/gcal/GCalHelper.java index b7590f887..b13c931ed 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gcal/GCalHelper.java +++ b/astrid/plugin-src/com/todoroo/astrid/gcal/GCalHelper.java @@ -70,7 +70,7 @@ public class GCalHelper { return createTaskEvent(task, cr, values, true); } - @SuppressWarnings("nls") + public static Uri createTaskEvent(Task task, ContentResolver cr, ContentValues values, boolean deleteEventIfExists) { String eventuri = getTaskEventUri(task); @@ -143,7 +143,7 @@ public class GCalHelper { } } - @SuppressWarnings("nls") + public static boolean deleteTaskEvent(Task task) { boolean eventDeleted = false; String uri; @@ -184,7 +184,7 @@ public class GCalHelper { return eventDeleted; } - @SuppressWarnings("nls") + static void createStartAndEndDate(Task task, ContentValues values) { long dueDate = task.getValue(Task.DUE_DATE); long tzCorrectedDueDate = dueDate + TimeZone.getDefault().getOffset(dueDate); @@ -219,7 +219,7 @@ public class GCalHelper { adjustDateForIcs(values); } - @SuppressWarnings("nls") + private static void adjustDateForIcs(ContentValues values) { if (AndroidUtilities.getSdkVersion() >= 14) { if ("1".equals(values.get("allDay"))) { diff --git a/astrid/plugin-src/com/todoroo/astrid/gcal/GCalTaskCompleteListener.java b/astrid/plugin-src/com/todoroo/astrid/gcal/GCalTaskCompleteListener.java index 62ed0a71a..90c6adb57 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gcal/GCalTaskCompleteListener.java +++ b/astrid/plugin-src/com/todoroo/astrid/gcal/GCalTaskCompleteListener.java @@ -22,7 +22,7 @@ import com.todoroo.astrid.data.Task; public class GCalTaskCompleteListener extends BroadcastReceiver { - @SuppressWarnings("nls") + @Override public void onReceive(Context context, Intent intent) { ContextManager.setContext(context); diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksCustomFilterCriteriaExposer.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksCustomFilterCriteriaExposer.java index 3957ccf07..d00227dba 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksCustomFilterCriteriaExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksCustomFilterCriteriaExposer.java @@ -42,7 +42,7 @@ public class GtasksCustomFilterCriteriaExposer extends BroadcastReceiver { AstridDependencyInjector.initialize(); } - @SuppressWarnings("nls") + @Override public void onReceive(Context context, Intent intent) { ContextManager.setContext(context); diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListService.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListService.java index 56fd542b6..b58e34509 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListService.java +++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksListService.java @@ -90,7 +90,7 @@ public class GtasksListService { * * @param remoteLists remote information about your lists */ - @SuppressWarnings("nls") + public synchronized void updateLists(TaskLists remoteLists) { readLists(); diff --git a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksMetadataService.java b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksMetadataService.java index 021c51745..1377d9bae 100644 --- a/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksMetadataService.java +++ b/astrid/plugin-src/com/todoroo/astrid/gtasks/GtasksMetadataService.java @@ -141,7 +141,7 @@ public final class GtasksMetadataService extends SyncMetadataService CREATOR = new Parcelable.Creator() { // /** // * {@inheritDoc} diff --git a/astrid/plugin-src/com/todoroo/astrid/notes/NotesDetailExposer.java b/astrid/plugin-src/com/todoroo/astrid/notes/NotesDetailExposer.java index 1f0841f23..21ee2e2a1 100644 --- a/astrid/plugin-src/com/todoroo/astrid/notes/NotesDetailExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/notes/NotesDetailExposer.java @@ -52,7 +52,7 @@ public class NotesDetailExposer extends BroadcastReceiver { context.sendBroadcast(broadcastIntent, AstridApiConstants.PERMISSION_READ); } - @SuppressWarnings("nls") + public String getTaskDetails(long id) { if (!Preferences.getBoolean(R.string.p_showNotes, false)) { return null; diff --git a/astrid/plugin-src/com/todoroo/astrid/notes/NotesPlugin.java b/astrid/plugin-src/com/todoroo/astrid/notes/NotesPlugin.java index b76ef8f5e..3fb675fb8 100644 --- a/astrid/plugin-src/com/todoroo/astrid/notes/NotesPlugin.java +++ b/astrid/plugin-src/com/todoroo/astrid/notes/NotesPlugin.java @@ -20,7 +20,7 @@ public class NotesPlugin extends BroadcastReceiver { public static final String IDENTIFIER = "notes"; //$NON-NLS-1$ @Override - @SuppressWarnings("nls") + public void onReceive(Context context, Intent intent) { Addon plugin = new Addon(IDENTIFIER, "Notes", "Todoroo", "Lets you add and view notes for a task."); diff --git a/astrid/plugin-src/com/todoroo/astrid/opencrx/OpencrxControlSet.java b/astrid/plugin-src/com/todoroo/astrid/opencrx/OpencrxControlSet.java index 23865d663..3f9ea148f 100644 --- a/astrid/plugin-src/com/todoroo/astrid/opencrx/OpencrxControlSet.java +++ b/astrid/plugin-src/com/todoroo/astrid/opencrx/OpencrxControlSet.java @@ -44,7 +44,7 @@ public class OpencrxControlSet extends PopupControlSet { /** * Class that represents OpenCRX ActivityCreator. Duplicates some functionality of OpenCRX plugin. */ - @SuppressWarnings("unused") + private static class OpencrxActivityCreator { /** * type @@ -107,7 +107,7 @@ public class OpencrxControlSet extends PopupControlSet { /** * Class that represents OpenCRX Contact. Duplicates some functionality of OpenCRX plugin. */ - @SuppressWarnings("unused") + private static class OpencrxContact { public static final String TYPE = "opencrx-contacts"; //$NON-NLS-1$ diff --git a/astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterExposer.java index 729c86128..51bc8dd82 100644 --- a/astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/people/PeopleFilterExposer.java @@ -79,7 +79,7 @@ public class PeopleFilterExposer extends BroadcastReceiver { } } - @SuppressWarnings({"nls", "deprecation"}) + private static FilterWithCustomIntent filterFromUserData(User user) { String title = user.getDisplayName(); if (TextUtils.isEmpty(title) || "null".equals(title)) { @@ -117,7 +117,7 @@ public class PeopleFilterExposer extends BroadcastReceiver { return filter; } - @SuppressWarnings("nls") + public static FilterWithCustomIntent mySharedTasks(Context context) { TodorooCursor tagsWithMembers = PluginServices.getTagDataService() .query(Query.select(TagData.NAME).where(TagData.MEMBER_COUNT.gt(0))); diff --git a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderDebugContextActions.java b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderDebugContextActions.java index 00df0c70e..2f930e404 100644 --- a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderDebugContextActions.java +++ b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderDebugContextActions.java @@ -15,7 +15,7 @@ import com.todoroo.astrid.utility.Constants; import java.util.Date; -@SuppressWarnings("nls") + public class ReminderDebugContextActions { public static class WhenReminder implements TaskContextActionExposer { diff --git a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderSchedulingService.java b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderSchedulingService.java index b8a6c717a..ab34fe3ce 100644 --- a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderSchedulingService.java +++ b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderSchedulingService.java @@ -41,7 +41,7 @@ public class ReminderSchedulingService extends Service { return START_NOT_STICKY; } - @SuppressWarnings("nls") + private void scheduleReminders() { try { ReminderService.getInstance().scheduleAllAlarms(); diff --git a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderService.java b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderService.java index aa466026c..e7d01d9e4 100644 --- a/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderService.java +++ b/astrid/plugin-src/com/todoroo/astrid/reminders/ReminderService.java @@ -475,7 +475,7 @@ public final class ReminderService { * @param flags */ @Override - @SuppressWarnings("nls") + public void createAlarm(Task task, long time, int type) { if (task.getId() == Task.NO_ID) { return; diff --git a/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java b/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java index 9d2469616..f12ef4091 100644 --- a/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java +++ b/astrid/plugin-src/com/todoroo/astrid/repeats/RepeatControlSet.java @@ -162,7 +162,7 @@ public class RepeatControlSet extends PopupControlSet { } } - @SuppressWarnings("nls") + @Override public void readFromTask(Task task) { super.readFromTask(task); @@ -212,7 +212,7 @@ public class RepeatControlSet extends PopupControlSet { refreshDisplayView(); } - @SuppressWarnings("nls") + @Override protected void readFromTaskOnInitialize() { Date date; diff --git a/astrid/plugin-src/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java b/astrid/plugin-src/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java index a74136c8d..7a77aef0d 100644 --- a/astrid/plugin-src/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java +++ b/astrid/plugin-src/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java @@ -97,7 +97,7 @@ public class AstridOrderedListFragmentHelper implements OrderedListFragmen } } - @SuppressWarnings("nls") + private void showSubtasksHelp() { String body = String.format("

%s

" + "
%s



%s", diff --git a/astrid/plugin-src/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java b/astrid/plugin-src/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java index 68af98542..058d2f5ae 100644 --- a/astrid/plugin-src/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java +++ b/astrid/plugin-src/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java @@ -101,7 +101,7 @@ public class OrderedMetadataListFragmentHelper implements OrderedListFragm } } - @SuppressWarnings("nls") + private void showSubtasksHelp() { String body = String.format("

%s

" + "
%s



%s", diff --git a/astrid/plugin-src/com/todoroo/astrid/subtasks/OrderedMetadataListUpdater.java b/astrid/plugin-src/com/todoroo/astrid/subtasks/OrderedMetadataListUpdater.java index d3aad2fe3..0758f02aa 100644 --- a/astrid/plugin-src/com/todoroo/astrid/subtasks/OrderedMetadataListUpdater.java +++ b/astrid/plugin-src/com/todoroo/astrid/subtasks/OrderedMetadataListUpdater.java @@ -397,7 +397,7 @@ abstract public class OrderedMetadataListUpdater { } - @SuppressWarnings("nls") + public void debugPrint(Node root, int depth) { for (int i = 0; i < depth; i++) { System.err.print(" + "); diff --git a/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksHelper.java b/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksHelper.java index ca0acdb7b..e323f8cf2 100644 --- a/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksHelper.java +++ b/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksHelper.java @@ -59,7 +59,7 @@ public class SubtasksHelper { return false; } - @SuppressWarnings("nls") + public static String applySubtasksToWidgetFilter(Filter filter, String query, String tagName, int limit) { if (SubtasksHelper.shouldUseSubtasksFragmentForFilter(filter)) { // care for manual ordering @@ -102,7 +102,7 @@ public class SubtasksHelper { return AstridOrderedListUpdater.buildOrderString(getStringIdArray(serialized)); } - @SuppressWarnings("nls") + @Deprecated private static Long[] getIdArray(String serializedTree) { ArrayList ids = new ArrayList(); @@ -119,7 +119,7 @@ public class SubtasksHelper { return ids.toArray(new Long[ids.size()]); } - @SuppressWarnings("nls") + public static String[] getStringIdArray(String serializedTree) { ArrayList ids = new ArrayList(); String[] values = serializedTree.split("[\\[\\],\"\\s]"); // Split on [ ] , or whitespace chars diff --git a/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksMetadataMigration.java b/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksMetadataMigration.java index 652d2c137..01ab84d15 100644 --- a/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksMetadataMigration.java +++ b/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksMetadataMigration.java @@ -20,7 +20,7 @@ import com.todoroo.astrid.subtasks.AstridOrderedListUpdater.Node; import java.util.ArrayList; -@SuppressWarnings("deprecation") // Subtasks metadata is deprecated + // Subtasks metadata is deprecated public class SubtasksMetadataMigration { @Autowired @@ -55,7 +55,7 @@ public class SubtasksMetadataMigration { } } - @SuppressWarnings("nls") + private void processTag(String tag, TodorooCursor subtasksMetadata) { Metadata item = new Metadata(); TagData td = null; diff --git a/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksUpdater.java b/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksUpdater.java index 6437dbea8..f059f3dfa 100644 --- a/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksUpdater.java +++ b/astrid/plugin-src/com/todoroo/astrid/subtasks/SubtasksUpdater.java @@ -33,7 +33,7 @@ public abstract class SubtasksUpdater extends AstridOrderedListUpdater { } @Override - @SuppressWarnings("nls") + public void applyToFilter(Filter filter) { String query = filter.getSqlQuery(); diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagCaseMigrator.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagCaseMigrator.java index 8d445e907..61087c728 100644 --- a/astrid/plugin-src/com/todoroo/astrid/tags/TagCaseMigrator.java +++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagCaseMigrator.java @@ -46,7 +46,7 @@ public class TagCaseMigrator { private final HashMap nameToRemoteId = new HashMap(); private final HashMap nameCountMap = new HashMap(); - public void performTagCaseMigration(@SuppressWarnings("unused") Context context) { + public void performTagCaseMigration( Context context) { if (!Preferences.getBoolean(PREF_CASE_MIGRATION_PERFORMED, false)) { TagService.Tag[] allTagData = TagService.getInstance().getGroupedTags( TagService.GROUPED_TAGS_BY_ALPHA, Criterion.all); diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java index 7e89254bd..36e75b75b 100644 --- a/astrid/plugin-src/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagCustomFilterCriteriaExposer.java @@ -30,7 +30,7 @@ public class TagCustomFilterCriteriaExposer extends BroadcastReceiver { private static final String IDENTIFIER_TAG_IS = "tag_is"; //$NON-NLS-1$ private static final String IDENTIFIER_TAG_CONTAINS = "tag_contains"; //$NON-NLS-1$ - @SuppressWarnings("nls") + @Override public void onReceive(Context context, Intent intent) { Resources r = context.getResources(); diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java index e8f7b3d0e..c48283ffb 100644 --- a/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java +++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagFilterExposer.java @@ -70,7 +70,7 @@ public class TagFilterExposer extends BroadcastReceiver implements AstridFilterE /** * Create filter from new tag object */ - @SuppressWarnings("nls") + public static FilterWithCustomIntent filterFromTag(Context context, Tag tag, Criterion criterion) { String title = tag.tag; if (TextUtils.isEmpty(title)) { diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java index a2dedb2fc..6a488cc85 100644 --- a/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java +++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagService.java @@ -52,7 +52,7 @@ import java.util.Set; * * @author Tim Su */ -@SuppressWarnings("nls") + public final class TagService { public static final String TOKEN_TAG_SQL = "tagSql"; //$NON-NLS-1$ diff --git a/astrid/plugin-src/com/todoroo/astrid/tags/TagsPlugin.java b/astrid/plugin-src/com/todoroo/astrid/tags/TagsPlugin.java index d88bdae4a..0e47fef68 100644 --- a/astrid/plugin-src/com/todoroo/astrid/tags/TagsPlugin.java +++ b/astrid/plugin-src/com/todoroo/astrid/tags/TagsPlugin.java @@ -19,7 +19,7 @@ public class TagsPlugin extends BroadcastReceiver { static final String IDENTIFIER = "tags"; //$NON-NLS-1$ - @SuppressWarnings("nls") + @Override public void onReceive(Context context, Intent intent) { Addon plugin = new Addon(IDENTIFIER, "Tags", "Todoroo", diff --git a/astrid/plugin-src/com/todoroo/astrid/timers/TimerPlugin.java b/astrid/plugin-src/com/todoroo/astrid/timers/TimerPlugin.java index 85514f971..354767a80 100644 --- a/astrid/plugin-src/com/todoroo/astrid/timers/TimerPlugin.java +++ b/astrid/plugin-src/com/todoroo/astrid/timers/TimerPlugin.java @@ -31,7 +31,7 @@ public class TimerPlugin extends BroadcastReceiver { static final String IDENTIFIER = "timer"; //$NON-NLS-1$ @Override - @SuppressWarnings("nls") + public void onReceive(Context context, Intent intent) { ContextManager.setContext(context); Addon plugin = new Addon(IDENTIFIER, "Timer", "Todoroo", diff --git a/astrid/src-legacy/com/timsu/astrid/data/LegacyAbstractController.java b/astrid/src-legacy/com/timsu/astrid/data/LegacyAbstractController.java index c23ef47f7..f6eb9a499 100644 --- a/astrid/src-legacy/com/timsu/astrid/data/LegacyAbstractController.java +++ b/astrid/src-legacy/com/timsu/astrid/data/LegacyAbstractController.java @@ -18,7 +18,7 @@ import java.util.Iterator; /** * Abstract controller class. Mostly contains some static fields */ -@SuppressWarnings("nls") + abstract public class LegacyAbstractController { protected Context context; diff --git a/astrid/src-legacy/com/timsu/astrid/data/LegacyAbstractModel.java b/astrid/src-legacy/com/timsu/astrid/data/LegacyAbstractModel.java index 936375b0d..a58974b58 100644 --- a/astrid/src-legacy/com/timsu/astrid/data/LegacyAbstractModel.java +++ b/astrid/src-legacy/com/timsu/astrid/data/LegacyAbstractModel.java @@ -14,7 +14,7 @@ import java.util.HashMap; /** * A data object backed by a database */ -@SuppressWarnings("nls") + public abstract class LegacyAbstractModel { /* Data Source Ordering: diff --git a/astrid/src-legacy/com/timsu/astrid/data/alerts/Alert.java b/astrid/src-legacy/com/timsu/astrid/data/alerts/Alert.java index 8a4a78671..aa137be34 100644 --- a/astrid/src-legacy/com/timsu/astrid/data/alerts/Alert.java +++ b/astrid/src-legacy/com/timsu/astrid/data/alerts/Alert.java @@ -22,7 +22,7 @@ import java.util.Date; /** * A single alert on a task */ -@SuppressWarnings("nls") + public class Alert extends LegacyAbstractModel { /** diff --git a/astrid/src-legacy/com/timsu/astrid/data/alerts/AlertController.java b/astrid/src-legacy/com/timsu/astrid/data/alerts/AlertController.java index daf35ffcc..7923fecab 100644 --- a/astrid/src-legacy/com/timsu/astrid/data/alerts/AlertController.java +++ b/astrid/src-legacy/com/timsu/astrid/data/alerts/AlertController.java @@ -24,7 +24,7 @@ import java.util.Set; /** * Controller for Tag-related operations */ -@SuppressWarnings("nls") + public class AlertController extends LegacyAbstractController { private SQLiteDatabase alertDatabase; diff --git a/astrid/src-legacy/com/timsu/astrid/data/sync/SyncDataController.java b/astrid/src-legacy/com/timsu/astrid/data/sync/SyncDataController.java index 81b470fea..3649b923f 100644 --- a/astrid/src-legacy/com/timsu/astrid/data/sync/SyncDataController.java +++ b/astrid/src-legacy/com/timsu/astrid/data/sync/SyncDataController.java @@ -23,7 +23,7 @@ import java.util.HashSet; /** * Controller for Tag-related operations */ -@SuppressWarnings("nls") + public class SyncDataController extends LegacyAbstractController { private SQLiteDatabase syncDatabase; diff --git a/astrid/src-legacy/com/timsu/astrid/data/sync/SyncMapping.java b/astrid/src-legacy/com/timsu/astrid/data/sync/SyncMapping.java index e5c5cadbc..f5a97d52b 100644 --- a/astrid/src-legacy/com/timsu/astrid/data/sync/SyncMapping.java +++ b/astrid/src-legacy/com/timsu/astrid/data/sync/SyncMapping.java @@ -20,7 +20,7 @@ import com.timsu.astrid.data.task.TaskIdentifier; /** * A single tag on a task */ -@SuppressWarnings("nls") + public class SyncMapping extends LegacyAbstractModel { diff --git a/astrid/src-legacy/com/timsu/astrid/data/tag/AbstractTagModel.java b/astrid/src-legacy/com/timsu/astrid/data/tag/AbstractTagModel.java index 79a9fe710..3fb811f6e 100644 --- a/astrid/src-legacy/com/timsu/astrid/data/tag/AbstractTagModel.java +++ b/astrid/src-legacy/com/timsu/astrid/data/tag/AbstractTagModel.java @@ -24,7 +24,7 @@ import java.util.Date; * * @author timsu */ -@SuppressWarnings("nls") + public abstract class AbstractTagModel extends LegacyAbstractModel { /** diff --git a/astrid/src-legacy/com/timsu/astrid/data/tag/TagController.java b/astrid/src-legacy/com/timsu/astrid/data/tag/TagController.java index 3bf97841d..0efd735ae 100644 --- a/astrid/src-legacy/com/timsu/astrid/data/tag/TagController.java +++ b/astrid/src-legacy/com/timsu/astrid/data/tag/TagController.java @@ -25,7 +25,7 @@ import java.util.LinkedList; /** * Controller for Tag-related operations */ -@SuppressWarnings("nls") + @Deprecated public class TagController extends LegacyAbstractController { diff --git a/astrid/src-legacy/com/timsu/astrid/data/tag/TagModelForView.java b/astrid/src-legacy/com/timsu/astrid/data/tag/TagModelForView.java index 7330c8105..5b87ce2b4 100644 --- a/astrid/src-legacy/com/timsu/astrid/data/tag/TagModelForView.java +++ b/astrid/src-legacy/com/timsu/astrid/data/tag/TagModelForView.java @@ -13,7 +13,7 @@ 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[]{ diff --git a/astrid/src-legacy/com/timsu/astrid/data/tag/TagToTaskMapping.java b/astrid/src-legacy/com/timsu/astrid/data/tag/TagToTaskMapping.java index 5c5dce3b2..086d5dbf9 100644 --- a/astrid/src-legacy/com/timsu/astrid/data/tag/TagToTaskMapping.java +++ b/astrid/src-legacy/com/timsu/astrid/data/tag/TagToTaskMapping.java @@ -20,7 +20,7 @@ import com.timsu.astrid.data.task.TaskIdentifier; /** * A single tag on a task */ -@SuppressWarnings("nls") + public class TagToTaskMapping extends LegacyAbstractModel { /** diff --git a/astrid/src-legacy/com/timsu/astrid/data/task/AbstractTaskModel.java b/astrid/src-legacy/com/timsu/astrid/data/task/AbstractTaskModel.java index 30e6173d6..1f6ec1d67 100644 --- a/astrid/src-legacy/com/timsu/astrid/data/task/AbstractTaskModel.java +++ b/astrid/src-legacy/com/timsu/astrid/data/task/AbstractTaskModel.java @@ -27,7 +27,7 @@ import java.util.Date; * * @author timsu */ -@SuppressWarnings("nls") + public abstract class AbstractTaskModel extends LegacyAbstractModel { /** @@ -148,7 +148,7 @@ 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 + "."); diff --git a/astrid/src-legacy/com/timsu/astrid/data/task/TaskController.java b/astrid/src-legacy/com/timsu/astrid/data/task/TaskController.java index 0eb7233bb..68a1f983d 100644 --- a/astrid/src-legacy/com/timsu/astrid/data/task/TaskController.java +++ b/astrid/src-legacy/com/timsu/astrid/data/task/TaskController.java @@ -36,7 +36,7 @@ import java.util.List; * @author timsu */ @Deprecated -@SuppressWarnings("nls") + public class TaskController extends LegacyAbstractController { private SQLiteDatabase database; diff --git a/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForHandlers.java b/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForHandlers.java index 9a7e42733..73e1bb591 100644 --- a/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForHandlers.java +++ b/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForHandlers.java @@ -44,7 +44,7 @@ public class TaskModelForHandlers extends AbstractTaskModel { * @param taskController * @param repeatInfo */ - @SuppressWarnings("deprecation") + public void repeatTaskBy(Context context, TaskController taskController, RepeatInfo repeatInfo) { diff --git a/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForProvider.java b/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForProvider.java index a3656d010..3cb7f837e 100644 --- a/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForProvider.java +++ b/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForProvider.java @@ -17,7 +17,7 @@ import java.util.Date; /** * Fields that you would want to see in the TaskView activity */ -@SuppressWarnings("nls") + public class TaskModelForProvider extends AbstractTaskModel { static String[] FIELD_LIST = new String[]{ diff --git a/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForWidget.java b/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForWidget.java index bc73b970e..41dcb9367 100644 --- a/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForWidget.java +++ b/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForWidget.java @@ -16,7 +16,7 @@ import java.util.Date; /** * Fields that you would want to see in the TaskView activity */ -@SuppressWarnings("nls") + public class TaskModelForWidget extends AbstractTaskModel { static String[] FIELD_LIST = new String[]{ diff --git a/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForXml.java b/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForXml.java index e9c85b6f2..2bda3ca06 100644 --- a/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForXml.java +++ b/astrid/src-legacy/com/timsu/astrid/data/task/TaskModelForXml.java @@ -15,7 +15,7 @@ import com.todoroo.astrid.backup.BackupDateUtilities; import java.util.Date; import java.util.HashMap; -@SuppressWarnings("nls") + public class TaskModelForXml extends AbstractTaskModel { static String[] FIELD_LIST = new String[]{ diff --git a/astrid/src-legacy/com/timsu/astrid/utilities/LegacyTasksXmlExporter.java b/astrid/src-legacy/com/timsu/astrid/utilities/LegacyTasksXmlExporter.java index a13c23ecb..02f30b243 100644 --- a/astrid/src-legacy/com/timsu/astrid/utilities/LegacyTasksXmlExporter.java +++ b/astrid/src-legacy/com/timsu/astrid/utilities/LegacyTasksXmlExporter.java @@ -35,7 +35,7 @@ import java.util.HashSet; import java.util.LinkedList; import java.util.List; -@SuppressWarnings({"nls", "deprecation"}) + public class LegacyTasksXmlExporter { private TaskController taskController; diff --git a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java index 9e33e8182..3ac7a87c4 100644 --- a/astrid/src/com/todoroo/astrid/activity/EditPreferences.java +++ b/astrid/src/com/todoroo/astrid/activity/EditPreferences.java @@ -330,7 +330,7 @@ public class EditPreferences extends TodorooPreferenceActivity { } } - @SuppressWarnings("nls") + private void addDebugPreferences() { if (!Constants.DEBUG) { return; diff --git a/astrid/src/com/todoroo/astrid/activity/ExpandableListFragment.java b/astrid/src/com/todoroo/astrid/activity/ExpandableListFragment.java index 2b3744a77..88a2b2b5b 100644 --- a/astrid/src/com/todoroo/astrid/activity/ExpandableListFragment.java +++ b/astrid/src/com/todoroo/astrid/activity/ExpandableListFragment.java @@ -22,7 +22,7 @@ import android.widget.ListAdapter; import android.widget.ListView; import android.widget.TextView; -@SuppressWarnings("nls") + public class ExpandableListFragment extends Fragment implements ExpandableListView.OnChildClickListener, ExpandableListView.OnGroupCollapseListener, diff --git a/astrid/src/com/todoroo/astrid/activity/FilterShortcutActivity.java b/astrid/src/com/todoroo/astrid/activity/FilterShortcutActivity.java index fa1e614fa..471e2cb3a 100644 --- a/astrid/src/com/todoroo/astrid/activity/FilterShortcutActivity.java +++ b/astrid/src/com/todoroo/astrid/activity/FilterShortcutActivity.java @@ -19,7 +19,7 @@ import com.todoroo.astrid.adapter.FilterAdapter; import com.todoroo.astrid.api.Filter; import com.todoroo.astrid.service.ThemeService; -@SuppressWarnings("nls") + public class FilterShortcutActivity extends ListActivity { private FilterAdapter adapter = null; diff --git a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java index cc26e2b9a..74ad29de2 100755 --- a/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskEditFragment.java @@ -754,7 +754,7 @@ public final class TaskEditFragment extends SherlockFragment implements * * @param intent */ - @SuppressWarnings("nls") + protected void loadItem(Intent intent) { if (model != null) { // came from bundle @@ -1231,7 +1231,7 @@ public final class TaskEditFragment extends SherlockFragment implements createNewFileAttachment(path, name, type); } - @SuppressWarnings("nls") + private void attachImage(Bitmap bitmap) { AtomicReference nameRef = new AtomicReference(); diff --git a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java index cfef51cd5..86711d2c2 100644 --- a/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java +++ b/astrid/src/com/todoroo/astrid/activity/TaskListFragment.java @@ -244,7 +244,7 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele * @param customComponent * @return */ - @SuppressWarnings("nls") + public static TaskListFragment instantiateWithFilterAndExtras(Filter filter, Bundle extras, Class customComponent) { Class component = customComponent; if (filter instanceof FilterWithCustomIntent && component == null) { @@ -1031,7 +1031,7 @@ public class TaskListFragment extends SherlockListFragment implements OnSortSele return filter; } - @SuppressWarnings("nls") + private TodorooCursor constructCursor() { String tagName = null; if (getActiveTagData() != null) { diff --git a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java index 7a1a0155e..56b3e6d4f 100644 --- a/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java +++ b/astrid/src/com/todoroo/astrid/adapter/TaskAdapter.java @@ -107,11 +107,11 @@ public class TaskAdapter extends CursorAdapter { public static final String BROADCAST_EXTRA_TASK = "model"; //$NON-NLS-1$ - @SuppressWarnings("nls") + private static final StringProperty TAGS = new StringProperty(null, "group_concat(nullif(" + TaskListFragment.TAGS_METADATA_JOIN + "." + TaskToTagMetadata.TAG_NAME.name + ", '')" + ", ' | ')").as("tags"); - @SuppressWarnings("nls") + private static final LongProperty FILE_ID_PROPERTY = TaskAttachment.ID.cloneAs(TaskListFragment.FILE_METADATA_JOIN, "fileId"); - @SuppressWarnings("nls") + private static final IntegerProperty HAS_NOTES_PROPERTY = new IntegerProperty(null, "length(" + Task.NOTES + ") > 0").as("hasNotes"); private static final StringProperty PICTURE = User.PICTURE.cloneAs(TaskListFragment.USER_IMAGE_JOIN, null); @@ -564,7 +564,7 @@ public class TaskAdapter extends CursorAdapter { } } - @SuppressWarnings("nls") + private void drawDetails(ViewHolder viewHolder, String details, float rightWidth) { SpannableStringBuilder prospective = new SpannableStringBuilder(); SpannableStringBuilder actual = new SpannableStringBuilder(); @@ -728,7 +728,7 @@ public class TaskAdapter extends CursorAdapter { private final HashMap dateCache = new HashMap(8); - @SuppressWarnings("nls") + private String formatDate(long date) { if (dateCache.containsKey(date)) { return dateCache.get(date); @@ -874,7 +874,7 @@ public class TaskAdapter extends CursorAdapter { new HashMap(3); @Override - @SuppressWarnings("nls") + public Drawable getDrawable(String source) { int drawable = 0; if (source.equals("silk_clock")) { diff --git a/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java b/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java index cba118fa1..dd1df5d82 100644 --- a/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java +++ b/astrid/src/com/todoroo/astrid/adapter/UpdateAdapter.java @@ -502,7 +502,7 @@ public class UpdateAdapter extends CursorAdapter { return builder; } - @SuppressWarnings("nls") + public static String getHistoryComment(final AstridActivity context, History history, User user, String linkColor, String fromView) { boolean hasTask = false; JSONArray taskAttrs = null; @@ -744,10 +744,10 @@ public class UpdateAdapter extends CursorAdapter { INTERVAL_LABELS.put("MINUTELY", R.string.repeat_minutes); //$NON-NLS-1$ } - @SuppressWarnings("nls") + private static final String[] SORTED_WEEKDAYS = {"SU", "MO", "TU", "WE", "TH", "FR", "SA"}; - @SuppressWarnings("nls") + private static String getRepeatString(Context context, String value) { if (TextUtils.isEmpty(value) || "null".equals(value)) { return null; @@ -832,7 +832,7 @@ public class UpdateAdapter extends CursorAdapter { } } - @SuppressWarnings("nls") + private static String userDisplay(Context context, String historyUserId, JSONObject userJson) { try { String id = userJson.getString("id"); @@ -852,7 +852,7 @@ public class UpdateAdapter extends CursorAdapter { } } - @SuppressWarnings("nls") + private static final String[] PRIORITY_STRINGS = {"!!!", "!!", "!", "o"}; private static String priorityString(int priority) { diff --git a/astrid/src/com/todoroo/astrid/billing/AstridPurchaseObserver.java b/astrid/src/com/todoroo/astrid/billing/AstridPurchaseObserver.java index e7154d109..6a347302b 100644 --- a/astrid/src/com/todoroo/astrid/billing/AstridPurchaseObserver.java +++ b/astrid/src/com/todoroo/astrid/billing/AstridPurchaseObserver.java @@ -17,7 +17,7 @@ import com.todoroo.astrid.billing.BillingConstants.ResponseCode; import com.todoroo.astrid.billing.BillingService.RequestPurchase; import com.todoroo.astrid.billing.BillingService.RestoreTransactions; -@SuppressWarnings("nls") + public abstract class AstridPurchaseObserver extends PurchaseObserver { @Autowired diff --git a/astrid/src/com/todoroo/astrid/billing/Base64.java b/astrid/src/com/todoroo/astrid/billing/Base64.java index fa216e4cb..be87fb212 100644 --- a/astrid/src/com/todoroo/astrid/billing/Base64.java +++ b/astrid/src/com/todoroo/astrid/billing/Base64.java @@ -510,7 +510,7 @@ public class Base64 { * @param decodabet the decodabet for decoding Base64 content * @return decoded data */ - @SuppressWarnings("nls") + public static byte[] decode(byte[] source, int off, int len, byte[] decodabet) throws Base64DecoderException { int len34 = len * 3 / 4; diff --git a/astrid/src/com/todoroo/astrid/billing/BillingActivity.java b/astrid/src/com/todoroo/astrid/billing/BillingActivity.java index af07bcf03..7a79d352e 100644 --- a/astrid/src/com/todoroo/astrid/billing/BillingActivity.java +++ b/astrid/src/com/todoroo/astrid/billing/BillingActivity.java @@ -184,7 +184,7 @@ public class BillingActivity extends SherlockFragmentActivity implements AstridP }); } - @SuppressWarnings("nls") + private void setupText() { int[] bullets = new int[]{R.string.premium_description_1, /* R.string.premium_description_2,*/ R.string.premium_description_3, R.string.premium_description_4, R.string.premium_description_5, R.string.premium_description_6 @@ -238,7 +238,7 @@ public class BillingActivity extends SherlockFragmentActivity implements AstridP * @param str the string to replace the language/country within * @return a string containing the local language and region codes */ - @SuppressWarnings("nls") + private String replaceLanguageAndRegion(String str) { // Substitute language and or region if present in string if (str.contains("%lang%") || str.contains("%region%")) { @@ -266,7 +266,7 @@ public class BillingActivity extends SherlockFragmentActivity implements AstridP } } - @SuppressWarnings("nls") + private Dialog createDialog(int titleId, int messageId) { String helpUrl = "http://market.android.com/support/bin/answer.py?answer=1050566&hl=%lang%&dl=%region%"; helpUrl = replaceLanguageAndRegion(helpUrl); diff --git a/astrid/src/com/todoroo/astrid/billing/BillingConstants.java b/astrid/src/com/todoroo/astrid/billing/BillingConstants.java index 5643dcae6..7a3783f77 100644 --- a/astrid/src/com/todoroo/astrid/billing/BillingConstants.java +++ b/astrid/src/com/todoroo/astrid/billing/BillingConstants.java @@ -4,7 +4,7 @@ import com.todoroo.astrid.actfm.sync.ActFmPreferenceService; import com.todoroo.astrid.utility.Constants; -@SuppressWarnings("nls") + public class BillingConstants { /** diff --git a/astrid/src/com/todoroo/astrid/billing/BillingService.java b/astrid/src/com/todoroo/astrid/billing/BillingService.java index 181522d57..189e6fee5 100644 --- a/astrid/src/com/todoroo/astrid/billing/BillingService.java +++ b/astrid/src/com/todoroo/astrid/billing/BillingService.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.LinkedList; -@SuppressWarnings("nls") + public class BillingService extends Service implements ServiceConnection { private static final String TAG = "billing-service"; diff --git a/astrid/src/com/todoroo/astrid/billing/Security.java b/astrid/src/com/todoroo/astrid/billing/Security.java index ad3890615..d713d37b2 100644 --- a/astrid/src/com/todoroo/astrid/billing/Security.java +++ b/astrid/src/com/todoroo/astrid/billing/Security.java @@ -15,7 +15,7 @@ import java.util.HashSet; * * @author Sam */ -@SuppressWarnings("nls") + public class Security { private static final String TAG = "Security"; diff --git a/astrid/src/com/todoroo/astrid/dao/DaoReflectionHelpers.java b/astrid/src/com/todoroo/astrid/dao/DaoReflectionHelpers.java index 686ac1cf0..c24880ad1 100644 --- a/astrid/src/com/todoroo/astrid/dao/DaoReflectionHelpers.java +++ b/astrid/src/com/todoroo/astrid/dao/DaoReflectionHelpers.java @@ -6,7 +6,7 @@ import com.todoroo.astrid.data.RemoteModel; import java.lang.reflect.Field; -@SuppressWarnings("nls") + public class DaoReflectionHelpers { public static T getStaticFieldByReflection(Class cls, Class cast, String fieldName) { diff --git a/astrid/src/com/todoroo/astrid/dao/Database.java b/astrid/src/com/todoroo/astrid/dao/Database.java index ee60bf272..7fbafdf1f 100644 --- a/astrid/src/com/todoroo/astrid/dao/Database.java +++ b/astrid/src/com/todoroo/astrid/dao/Database.java @@ -42,7 +42,7 @@ import com.todoroo.astrid.widget.TasksWidget; * * @author Tim Su */ -@SuppressWarnings("nls") + public class Database extends AbstractDatabase { // --- constants diff --git a/astrid/src/com/todoroo/astrid/dao/TaskDao.java b/astrid/src/com/todoroo/astrid/dao/TaskDao.java index e45f1905c..c42913f41 100644 --- a/astrid/src/com/todoroo/astrid/dao/TaskDao.java +++ b/astrid/src/com/todoroo/astrid/dao/TaskDao.java @@ -163,7 +163,7 @@ public class TaskDao extends RemoteModelDao { /** * @return tasks that have a blank or null title */ - @SuppressWarnings("nls") + public static Criterion hasNoTitle() { return Criterion.or(Task.TITLE.isNull(), Task.TITLE.eq("")); } diff --git a/astrid/src/com/todoroo/astrid/data/ABTestEvent.java b/astrid/src/com/todoroo/astrid/data/ABTestEvent.java index 054b9c50d..849a11ead 100644 --- a/astrid/src/com/todoroo/astrid/data/ABTestEvent.java +++ b/astrid/src/com/todoroo/astrid/data/ABTestEvent.java @@ -22,7 +22,7 @@ import com.todoroo.astrid.api.AstridApiConstants; * * @author Sam */ -@SuppressWarnings("nls") + public class ABTestEvent extends AbstractModel { public static final int[] TIME_INTERVALS = {0, 1, 3, 7, 14, 21}; diff --git a/astrid/src/com/todoroo/astrid/legacy/AlarmDatabase.java b/astrid/src/com/todoroo/astrid/legacy/AlarmDatabase.java index 2584c3916..42a6b4ad1 100644 --- a/astrid/src/com/todoroo/astrid/legacy/AlarmDatabase.java +++ b/astrid/src/com/todoroo/astrid/legacy/AlarmDatabase.java @@ -14,7 +14,7 @@ import com.todoroo.andlib.data.Table; * * @author Tim Su */ -@SuppressWarnings("nls") + public class AlarmDatabase extends AbstractDatabase { // --- constants diff --git a/astrid/src/com/todoroo/astrid/legacy/LegacyAlertModel.java b/astrid/src/com/todoroo/astrid/legacy/LegacyAlertModel.java index 7bd081b55..30a9e5588 100644 --- a/astrid/src/com/todoroo/astrid/legacy/LegacyAlertModel.java +++ b/astrid/src/com/todoroo/astrid/legacy/LegacyAlertModel.java @@ -8,7 +8,7 @@ package com.todoroo.astrid.legacy; /** * Legacy alert class */ -@SuppressWarnings("nls") + abstract public class LegacyAlertModel { public static final String TASK = "task"; diff --git a/astrid/src/com/todoroo/astrid/legacy/LegacyTagModel.java b/astrid/src/com/todoroo/astrid/legacy/LegacyTagModel.java index f42b978b3..66bf21f8d 100644 --- a/astrid/src/com/todoroo/astrid/legacy/LegacyTagModel.java +++ b/astrid/src/com/todoroo/astrid/legacy/LegacyTagModel.java @@ -10,7 +10,7 @@ import com.timsu.astrid.data.LegacyAbstractModel; /** * Legacy tag model */ -@SuppressWarnings("nls") + abstract public class LegacyTagModel extends LegacyAbstractModel { public static final String NAME = "name"; diff --git a/astrid/src/com/todoroo/astrid/legacy/LegacyTaskModel.java b/astrid/src/com/todoroo/astrid/legacy/LegacyTaskModel.java index 6393ea3a1..8c51ebf6e 100644 --- a/astrid/src/com/todoroo/astrid/legacy/LegacyTaskModel.java +++ b/astrid/src/com/todoroo/astrid/legacy/LegacyTaskModel.java @@ -8,7 +8,7 @@ package com.todoroo.astrid.legacy; /** * Legacy task class */ -@SuppressWarnings("nls") + abstract public class LegacyTaskModel { public static final String ID = "_id"; diff --git a/astrid/src/com/todoroo/astrid/legacy/TransitionalAlarm.java b/astrid/src/com/todoroo/astrid/legacy/TransitionalAlarm.java index 7768d023d..1a7dcddbf 100644 --- a/astrid/src/com/todoroo/astrid/legacy/TransitionalAlarm.java +++ b/astrid/src/com/todoroo/astrid/legacy/TransitionalAlarm.java @@ -21,7 +21,7 @@ import com.todoroo.astrid.data.Task; * * @author Tim Su */ -@SuppressWarnings("nls") + public class TransitionalAlarm extends AbstractModel { // --- table diff --git a/astrid/src/com/todoroo/astrid/provider/Astrid2TaskProvider.java b/astrid/src/com/todoroo/astrid/provider/Astrid2TaskProvider.java index dc5404b6f..f9228ebfc 100644 --- a/astrid/src/com/todoroo/astrid/provider/Astrid2TaskProvider.java +++ b/astrid/src/com/todoroo/astrid/provider/Astrid2TaskProvider.java @@ -42,7 +42,7 @@ import java.security.NoSuchAlgorithmException; * * @author Tim Su */ -@SuppressWarnings("nls") + public class Astrid2TaskProvider extends ContentProvider { static { diff --git a/astrid/src/com/todoroo/astrid/provider/Astrid3ContentProvider.java b/astrid/src/com/todoroo/astrid/provider/Astrid3ContentProvider.java index f9d1548d1..e5dd101cc 100644 --- a/astrid/src/com/todoroo/astrid/provider/Astrid3ContentProvider.java +++ b/astrid/src/com/todoroo/astrid/provider/Astrid3ContentProvider.java @@ -66,7 +66,7 @@ import java.util.Set; * * @author Tim Su */ -@SuppressWarnings("nls") + public class Astrid3ContentProvider extends ContentProvider { static { diff --git a/astrid/src/com/todoroo/astrid/provider/SqlContentProvider.java b/astrid/src/com/todoroo/astrid/provider/SqlContentProvider.java index 8fb31a009..f436cdb9d 100644 --- a/astrid/src/com/todoroo/astrid/provider/SqlContentProvider.java +++ b/astrid/src/com/todoroo/astrid/provider/SqlContentProvider.java @@ -27,7 +27,7 @@ import com.todoroo.astrid.service.AstridDependencyInjector; * * @author Tim Su */ -@SuppressWarnings("nls") + public class SqlContentProvider extends ContentProvider { // --- instance variables diff --git a/astrid/src/com/todoroo/astrid/service/AddOnService.java b/astrid/src/com/todoroo/astrid/service/AddOnService.java index 6632085cc..a4d2dc293 100644 --- a/astrid/src/com/todoroo/astrid/service/AddOnService.java +++ b/astrid/src/com/todoroo/astrid/service/AddOnService.java @@ -23,7 +23,7 @@ import java.util.ArrayList; * * @author Tim Su */ -@SuppressWarnings("nls") + public class AddOnService { /** diff --git a/astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java b/astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java index 674589cf7..20c194c52 100644 --- a/astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java +++ b/astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java @@ -133,7 +133,7 @@ public class Astrid2To3UpgradeHelper { * * @param context2 */ - @SuppressWarnings("deprecation") + public void upgrade2To3(final Context context, final int from) { // if from < 1 (we don't know what version, and database exists, leave it alone) @@ -245,7 +245,7 @@ public class Astrid2To3UpgradeHelper { * * @author Tim Su */ - @SuppressWarnings("nls") + protected static final class ColumnUpgradeVisitor implements PropertyVisitor> { @Override public Void visitDouble(Property property, UpgradeVisitorContainer data) { @@ -329,7 +329,7 @@ public class Astrid2To3UpgradeHelper { * @param model * @param dao */ - @SuppressWarnings("nls") + private static void upgradeTable(Context context, String legacyTable, HashMap> propertyMap, TYPE model, DatabaseDao dao) { @@ -381,7 +381,7 @@ public class Astrid2To3UpgradeHelper { * both and adding to the Metadata table. This way, we are able to * do everything in one pass without loading too much into memory */ - @SuppressWarnings("nls") + private void migrateTagsToMetadata() { Context context = ContextManager.getContext(); diff --git a/astrid/src/com/todoroo/astrid/service/AstridDependencyInjector.java b/astrid/src/com/todoroo/astrid/service/AstridDependencyInjector.java index ea4b0acfc..877ec3743 100644 --- a/astrid/src/com/todoroo/astrid/service/AstridDependencyInjector.java +++ b/astrid/src/com/todoroo/astrid/service/AstridDependencyInjector.java @@ -66,7 +66,7 @@ public class AstridDependencyInjector extends AbstractDependencyInjector { * (i.e. {@link ErrorReporter}. */ @Override - @SuppressWarnings("nls") + protected void addInjectables() { injectables.put("debug", Constants.DEBUG); diff --git a/astrid/src/com/todoroo/astrid/service/TagDataService.java b/astrid/src/com/todoroo/astrid/service/TagDataService.java index ad885304b..2d50b3963 100644 --- a/astrid/src/com/todoroo/astrid/service/TagDataService.java +++ b/astrid/src/com/todoroo/astrid/service/TagDataService.java @@ -113,7 +113,7 @@ public class TagDataService { * @param properties * @return */ - @SuppressWarnings("nls") + public TodorooCursor fetchFiltered(String queryTemplate, CharSequence constraint, Property... properties) { Criterion whereConstraint = null; @@ -199,7 +199,7 @@ public class TagDataService { return userActivityDao.query(resultQuery); } - @SuppressWarnings("nls") + public void saveFeaturedList(JSONObject featObject) throws JSONException { TodorooCursor cursor = query(Query.select(TagData.PROPERTIES).where( Criterion.and(Functions.bitwiseAnd(TagData.FLAGS, TagData.FLAG_FEATURED).gt(0), TagData.UUID.eq(featObject.get("id"))))); diff --git a/astrid/src/com/todoroo/astrid/service/TaskService.java b/astrid/src/com/todoroo/astrid/service/TaskService.java index 2101411f6..65b0f761f 100644 --- a/astrid/src/com/todoroo/astrid/service/TaskService.java +++ b/astrid/src/com/todoroo/astrid/service/TaskService.java @@ -295,7 +295,7 @@ public class TaskService { * @param filter * @return */ - @SuppressWarnings("nls") + public TodorooCursor fetchFiltered(String queryTemplate, CharSequence constraint, Property... properties) { Criterion whereConstraint = null; diff --git a/astrid/src/com/todoroo/astrid/service/ThemeService.java b/astrid/src/com/todoroo/astrid/service/ThemeService.java index 380a936d9..f677020ec 100644 --- a/astrid/src/com/todoroo/astrid/service/ThemeService.java +++ b/astrid/src/com/todoroo/astrid/service/ThemeService.java @@ -17,7 +17,7 @@ import com.todoroo.andlib.utility.Preferences; import com.todoroo.astrid.utility.AstridPreferences; import com.todoroo.astrid.widget.TasksWidget; -@SuppressWarnings("nls") + public class ThemeService { public static final String THEME_WHITE = "white"; diff --git a/astrid/src/com/todoroo/astrid/service/UpdateMessagePreference.java b/astrid/src/com/todoroo/astrid/service/UpdateMessagePreference.java index ff4222b64..79bef3410 100644 --- a/astrid/src/com/todoroo/astrid/service/UpdateMessagePreference.java +++ b/astrid/src/com/todoroo/astrid/service/UpdateMessagePreference.java @@ -41,7 +41,7 @@ public class UpdateMessagePreference extends PreferenceActivity { } } - @SuppressWarnings("nls") + private void addPreferenceFromJSON(JSONObject obj) { String type = obj.optString("type", null); String key = obj.optString("key", null); diff --git a/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java b/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java index f81d0d611..a4bb41206 100644 --- a/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java +++ b/astrid/src/com/todoroo/astrid/service/UpdateMessageService.java @@ -54,7 +54,7 @@ import java.util.Locale; * * @author Tim Su */ -@SuppressWarnings("nls") + public class UpdateMessageService { private static final String URL = "http://blog.astrid.com/updates"; diff --git a/astrid/src/com/todoroo/astrid/service/UpgradeService.java b/astrid/src/com/todoroo/astrid/service/UpgradeService.java index ce56e4513..148727d23 100644 --- a/astrid/src/com/todoroo/astrid/service/UpgradeService.java +++ b/astrid/src/com/todoroo/astrid/service/UpgradeService.java @@ -332,7 +332,7 @@ public final class UpgradeService { * @param to * @return */ - @SuppressWarnings("nls") + public void showChangeLog(Context context, int from) { if (!(context instanceof Activity) || from == 0) { return; @@ -807,7 +807,7 @@ public final class UpgradeService { * @param version * @param changes */ - @SuppressWarnings("nls") + private void newVersionString(StringBuilder changeLog, String version, String[] changes) { if (Constants.ASTRID_LITE) { version = "0" + version.substring(1); @@ -824,7 +824,7 @@ public final class UpgradeService { /** * Fixes task filter missing tasks bug, migrate PDV/RTM notes */ - @SuppressWarnings("nls") + private void upgrade3To3_7() { TodorooCursor t = taskService.query(Query.select(Task.ID, Task.DUE_DATE).where(Task.DUE_DATE.gt(0))); Task task = new Task(); diff --git a/astrid/src/com/todoroo/astrid/service/abtesting/ABTestEventReportingService.java b/astrid/src/com/todoroo/astrid/service/abtesting/ABTestEventReportingService.java index 0a0f83962..b26f23c17 100644 --- a/astrid/src/com/todoroo/astrid/service/abtesting/ABTestEventReportingService.java +++ b/astrid/src/com/todoroo/astrid/service/abtesting/ABTestEventReportingService.java @@ -35,7 +35,7 @@ import java.util.Set; * * @author Sam */ -@SuppressWarnings("nls") + public final class ABTestEventReportingService { private static final String KEY_TEST = "test"; diff --git a/astrid/src/com/todoroo/astrid/service/abtesting/ABTestInvoker.java b/astrid/src/com/todoroo/astrid/service/abtesting/ABTestInvoker.java index 8830927ad..272a0ffd2 100644 --- a/astrid/src/com/todoroo/astrid/service/abtesting/ABTestInvoker.java +++ b/astrid/src/com/todoroo/astrid/service/abtesting/ABTestInvoker.java @@ -30,7 +30,7 @@ import java.util.List; * * @author Sam */ -@SuppressWarnings("nls") + public class ABTestInvoker { /** diff --git a/astrid/src/com/todoroo/astrid/ui/ContactListAdapter.java b/astrid/src/com/todoroo/astrid/ui/ContactListAdapter.java index f6cdb09dd..2fd28b467 100644 --- a/astrid/src/com/todoroo/astrid/ui/ContactListAdapter.java +++ b/astrid/src/com/todoroo/astrid/ui/ContactListAdapter.java @@ -39,7 +39,7 @@ import com.todoroo.astrid.service.TagDataService; import java.io.InputStream; -@SuppressWarnings({"nls", "deprecation"}) + public class ContactListAdapter extends CursorAdapter { @Autowired diff --git a/astrid/src/com/todoroo/astrid/ui/DateChangedAlerts.java b/astrid/src/com/todoroo/astrid/ui/DateChangedAlerts.java index fc2c66476..680fdddf1 100644 --- a/astrid/src/com/todoroo/astrid/ui/DateChangedAlerts.java +++ b/astrid/src/com/todoroo/astrid/ui/DateChangedAlerts.java @@ -272,7 +272,7 @@ public class DateChangedAlerts { } - @SuppressWarnings("nls") + private static Spanned constructSpeechBubbleTextForQuickAdd(Context context, Task task) { String[] priorityStrings = context.getResources().getStringArray(R.array.TLA_priority_strings); int[] colorsArray = new int[]{R.color.importance_1, R.color.importance_2, R.color.importance_3, R.color.importance_4}; @@ -310,7 +310,7 @@ public class DateChangedAlerts { return context.getString(R.string.TLA_repeat_scheduled_speech_bubble, recurrence); } - @SuppressWarnings("nls") + private static String getRelativeDateAndTimeString(Context context, long date) { String dueString = date > 0 ? DateUtilities.getRelativeDay(context, date, false) : ""; if (Task.hasDueTime(date)) { @@ -320,7 +320,7 @@ public class DateChangedAlerts { return dueString; } - @SuppressWarnings("nls") + private static String getRecurrenceString(Context context, Task task) { try { RRule rrule = new RRule(task.sanitizedRecurrence()); diff --git a/astrid/src/com/todoroo/astrid/ui/DeadlineTimePickerDialog.java b/astrid/src/com/todoroo/astrid/ui/DeadlineTimePickerDialog.java index c5830649c..498904df2 100644 --- a/astrid/src/com/todoroo/astrid/ui/DeadlineTimePickerDialog.java +++ b/astrid/src/com/todoroo/astrid/ui/DeadlineTimePickerDialog.java @@ -40,7 +40,7 @@ import java.util.Calendar; * This is similar to the Android {@link TimePickerDialog} class * except allows users to specify "no specific time". */ -@SuppressWarnings("nls") + public class DeadlineTimePickerDialog extends AlertDialog implements OnClickListener, OnTimeChangedListener { diff --git a/astrid/src/com/todoroo/astrid/ui/DraggableListView.java b/astrid/src/com/todoroo/astrid/ui/DraggableListView.java index 5069dca96..92cd05d84 100644 --- a/astrid/src/com/todoroo/astrid/ui/DraggableListView.java +++ b/astrid/src/com/todoroo/astrid/ui/DraggableListView.java @@ -111,7 +111,7 @@ public class DraggableListView extends ListView { this.mItemHeightNormal = itemHeightNormal; } - protected boolean isDraggableRow(@SuppressWarnings("unused") View view) { + protected boolean isDraggableRow( View view) { return true; } @@ -548,14 +548,14 @@ public class DraggableListView extends ListView { this.dragndropBackgroundColor = color; } - @SuppressWarnings("nls") + @Override final public void addHeaderView(View v, Object data, boolean isSelectable) { throw new RuntimeException( "Headers are not supported with TouchListView"); } - @SuppressWarnings("nls") + @Override final public void addHeaderView(View v) { throw new RuntimeException( diff --git a/astrid/src/com/todoroo/astrid/ui/FeedbackPromptDialogs.java b/astrid/src/com/todoroo/astrid/ui/FeedbackPromptDialogs.java index c11c84e77..52d2d6c6d 100644 --- a/astrid/src/com/todoroo/astrid/ui/FeedbackPromptDialogs.java +++ b/astrid/src/com/todoroo/astrid/ui/FeedbackPromptDialogs.java @@ -10,7 +10,7 @@ import com.todoroo.astrid.activity.AstridActivity; public class FeedbackPromptDialogs { - @SuppressWarnings("nls") + public static void showFeedbackDialog(final AstridActivity activity, boolean positive) { final AstridDialog d = new AstridDialog(activity, false); diff --git a/astrid/src/com/todoroo/astrid/ui/NumberPicker.java b/astrid/src/com/todoroo/astrid/ui/NumberPicker.java index 3533d95b8..abe2428ab 100644 --- a/astrid/src/com/todoroo/astrid/ui/NumberPicker.java +++ b/astrid/src/com/todoroo/astrid/ui/NumberPicker.java @@ -26,7 +26,7 @@ import android.widget.TextView; import com.timsu.astrid.R; import com.todoroo.andlib.utility.AndroidUtilities; -@SuppressWarnings({"nls", "unused"}) + public class NumberPicker extends LinearLayout implements OnClickListener, OnFocusChangeListener, OnLongClickListener { diff --git a/astrid/src/com/todoroo/astrid/ui/PeopleContainer.java b/astrid/src/com/todoroo/astrid/ui/PeopleContainer.java index 5b98b92c2..b6b8a86f2 100644 --- a/astrid/src/com/todoroo/astrid/ui/PeopleContainer.java +++ b/astrid/src/com/todoroo/astrid/ui/PeopleContainer.java @@ -150,7 +150,7 @@ public class PeopleContainer extends LinearLayout { // } - @SuppressWarnings("nls") + @Override public void onTextChanged(CharSequence s, int start, int before, int count) { @@ -172,7 +172,7 @@ public class PeopleContainer extends LinearLayout { }); textView.setOnEditorActionListener(new OnEditorActionListener() { - @SuppressWarnings("nls") + @Override public boolean onEditorAction(TextView arg0, int actionId, KeyEvent arg2) { if (actionId != EditorInfo.IME_NULL) { @@ -227,7 +227,7 @@ public class PeopleContainer extends LinearLayout { return people; } - @SuppressWarnings("nls") + public JSONObject parseSharedWithAndTags(Activity activity, boolean peopleAsJSON) throws JSONException, ParseSharedException { JSONObject sharedWith = new JSONObject(); @@ -295,7 +295,7 @@ public class PeopleContainer extends LinearLayout { * * @param people */ - @SuppressWarnings("nls") + public void fromJSONArray(JSONArray people) throws JSONException { for (int i = 0; i < people.length(); i++) { JSONObject person = people.getJSONObject(i); @@ -333,7 +333,7 @@ public class PeopleContainer extends LinearLayout { * @param textView * @return */ - @SuppressWarnings("nls") + public static JSONObject createUserJson(TextView textView) { if (textView.isEnabled() == false) { return (JSONObject) textView.getTag(); diff --git a/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java b/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java index 10dbecab9..0b5f9ad86 100644 --- a/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java +++ b/astrid/src/com/todoroo/astrid/ui/QuickAddBar.java @@ -285,7 +285,7 @@ public class QuickAddBar extends LinearLayout { * @param title * @return */ - @SuppressWarnings("nls") + public Task quickAddTask(String title, boolean selectNewTask) { TagData tagData = fragment.getActiveTagData(); if (tagData != null && (!tagData.containsNonNullValue(TagData.NAME) || diff --git a/astrid/src/com/todoroo/astrid/ui/TaskListFragmentPager.java b/astrid/src/com/todoroo/astrid/ui/TaskListFragmentPager.java index 4317a5432..d31c499fb 100644 --- a/astrid/src/com/todoroo/astrid/ui/TaskListFragmentPager.java +++ b/astrid/src/com/todoroo/astrid/ui/TaskListFragmentPager.java @@ -110,7 +110,7 @@ public class TaskListFragmentPager extends ViewPager { return false; } - @SuppressWarnings("nls") + public static void showSwipeBetweenHelper(Activity activity) { if (!Preferences.getBoolean(PREF_SHOWED_SWIPE_HELPER, false)) { String body = String.format("

%s



%s", diff --git a/astrid/src/com/todoroo/astrid/ui/TimeDurationControlSet.java b/astrid/src/com/todoroo/astrid/ui/TimeDurationControlSet.java index b69f02d37..620e392e3 100644 --- a/astrid/src/com/todoroo/astrid/ui/TimeDurationControlSet.java +++ b/astrid/src/com/todoroo/astrid/ui/TimeDurationControlSet.java @@ -17,7 +17,7 @@ import com.todoroo.andlib.service.DependencyInjectionService; import com.todoroo.astrid.data.Task; import com.todoroo.astrid.ui.NNumberPickerDialog.OnNNumberPickedListener; -@SuppressWarnings("nls") + public class TimeDurationControlSet implements OnNNumberPickedListener, View.OnClickListener { diff --git a/astrid/src/com/todoroo/astrid/utility/Constants.java b/astrid/src/com/todoroo/astrid/utility/Constants.java index 9408ec074..a379090ab 100644 --- a/astrid/src/com/todoroo/astrid/utility/Constants.java +++ b/astrid/src/com/todoroo/astrid/utility/Constants.java @@ -7,7 +7,7 @@ package com.todoroo.astrid.utility; import com.todoroo.astrid.service.MarketStrategy; -@SuppressWarnings("nls") + public final class Constants { // --- general application constants diff --git a/astrid/src/com/todoroo/astrid/utility/Entities.java b/astrid/src/com/todoroo/astrid/utility/Entities.java index 1da332db3..4c4b094cd 100644 --- a/astrid/src/com/todoroo/astrid/utility/Entities.java +++ b/astrid/src/com/todoroo/astrid/utility/Entities.java @@ -39,7 +39,7 @@ import java.util.TreeMap; * @see HTML 4.01 Code positions * @since 2.0 */ -@SuppressWarnings({"nls", "rawtypes", "unused"}) + class Entities { private static final String[][] BASIC_ARRAY = {{"quot", "34"}, // " - double-quote diff --git a/astrid/src/com/todoroo/astrid/utility/StringEscapeUtils.java b/astrid/src/com/todoroo/astrid/utility/StringEscapeUtils.java index 1c009c0c8..9d696ca3a 100644 --- a/astrid/src/com/todoroo/astrid/utility/StringEscapeUtils.java +++ b/astrid/src/com/todoroo/astrid/utility/StringEscapeUtils.java @@ -36,7 +36,7 @@ import java.io.Writer; * @version $Id: StringEscapeUtils.java 2696 2007-06-20 13:24:53Z damencho $ * @since 2.0 */ -@SuppressWarnings({"nls"}) + public class StringEscapeUtils { /** diff --git a/astrid/src/com/todoroo/astrid/utility/TitleParser.java b/astrid/src/com/todoroo/astrid/utility/TitleParser.java index 575b51067..4e08e3b34 100644 --- a/astrid/src/com/todoroo/astrid/utility/TitleParser.java +++ b/astrid/src/com/todoroo/astrid/utility/TitleParser.java @@ -22,7 +22,7 @@ import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; -@SuppressWarnings("nls") + public class TitleParser { public static boolean parse(Task task, ArrayList tags) { diff --git a/astrid/src/com/todoroo/astrid/voice/Api6VoiceOutputAssistant.java b/astrid/src/com/todoroo/astrid/voice/Api6VoiceOutputAssistant.java index bf7289b26..546be4def 100644 --- a/astrid/src/com/todoroo/astrid/voice/Api6VoiceOutputAssistant.java +++ b/astrid/src/com/todoroo/astrid/voice/Api6VoiceOutputAssistant.java @@ -20,7 +20,7 @@ import java.util.Locale; /** * @author Arne Jans */ -@SuppressWarnings("nls") + public class Api6VoiceOutputAssistant implements OnInitListener, VoiceOutputAssistant { private static final int MY_DATA_CHECK_CODE = 2534; diff --git a/astrid/src/com/todoroo/astrid/voice/VoiceInputAssistant.java b/astrid/src/com/todoroo/astrid/voice/VoiceInputAssistant.java index 11d2f2160..85cf5c76f 100644 --- a/astrid/src/com/todoroo/astrid/voice/VoiceInputAssistant.java +++ b/astrid/src/com/todoroo/astrid/voice/VoiceInputAssistant.java @@ -40,7 +40,7 @@ import java.util.ArrayList; * * @author Arne Jans */ -@SuppressWarnings("nls") + public class VoiceInputAssistant { /** diff --git a/astrid/src/com/todoroo/astrid/widget/TasksWidget.java b/astrid/src/com/todoroo/astrid/widget/TasksWidget.java index 4fcfedc8c..6d19ca290 100644 --- a/astrid/src/com/todoroo/astrid/widget/TasksWidget.java +++ b/astrid/src/com/todoroo/astrid/widget/TasksWidget.java @@ -171,7 +171,7 @@ public class TasksWidget extends AppWidgetProvider { return null; } - @SuppressWarnings("nls") + public RemoteViews buildUpdate(Context context, int widgetId) { DependencyInjectionService.getInstance().inject(this); @@ -337,7 +337,7 @@ public class TasksWidget extends AppWidgetProvider { * @param context * @return */ - @SuppressWarnings("nls") + private RemoteViews getThemedRemoteViews(Context context) { int theme = ThemeService.getWidgetTheme(); String packageName = context.getPackageName(); diff --git a/astrid/src/com/todoroo/astrid/widget/WidgetConfigActivity.java b/astrid/src/com/todoroo/astrid/widget/WidgetConfigActivity.java index e902825c2..a4395497b 100644 --- a/astrid/src/com/todoroo/astrid/widget/WidgetConfigActivity.java +++ b/astrid/src/com/todoroo/astrid/widget/WidgetConfigActivity.java @@ -24,7 +24,7 @@ import com.todoroo.astrid.api.FilterListItem; import com.todoroo.astrid.api.FilterWithCustomIntent; import com.todoroo.astrid.service.ThemeService; -@SuppressWarnings("nls") + abstract public class WidgetConfigActivity extends ListActivity { static final String PREF_TITLE = "widget-title-";