diff --git a/android-aac-enc/build.gradle b/android-aac-enc/build.gradle index 66395fef1..25752169a 100644 --- a/android-aac-enc/build.gradle +++ b/android-aac-enc/build.gradle @@ -17,6 +17,11 @@ android { compileSdkVersion 19 buildToolsVersion "19" + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_7 + targetCompatibility JavaVersion.VERSION_1_7 + } + defaultConfig { minSdkVersion 7 targetSdkVersion 19 diff --git a/api/build.gradle b/api/build.gradle index 66395fef1..25752169a 100644 --- a/api/build.gradle +++ b/api/build.gradle @@ -17,6 +17,11 @@ android { compileSdkVersion 19 buildToolsVersion "19" + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_7 + targetCompatibility JavaVersion.VERSION_1_7 + } + defaultConfig { minSdkVersion 7 targetSdkVersion 19 diff --git a/api/src/main/java/com/todoroo/andlib/data/AbstractDatabase.java b/api/src/main/java/com/todoroo/andlib/data/AbstractDatabase.java index 54d4ea51b..7328622f3 100644 --- a/api/src/main/java/com/todoroo/andlib/data/AbstractDatabase.java +++ b/api/src/main/java/com/todoroo/andlib/data/AbstractDatabase.java @@ -93,7 +93,7 @@ abstract public class AbstractDatabase { public void onDatabaseUpdated(); } - private final ArrayList listeners = new ArrayList(); + private final ArrayList listeners = new ArrayList<>(); public void addListener(DatabaseUpdateListener listener) { listeners.add(listener); diff --git a/api/src/main/java/com/todoroo/andlib/data/AbstractModel.java b/api/src/main/java/com/todoroo/andlib/data/AbstractModel.java index af98ed3f3..e056a3092 100644 --- a/api/src/main/java/com/todoroo/andlib/data/AbstractModel.java +++ b/api/src/main/java/com/todoroo/andlib/data/AbstractModel.java @@ -379,7 +379,7 @@ public abstract class AbstractModel implements Parcelable, Cloneable { public synchronized void putTransitory(String key, Object value) { if(transitoryData == null) { - transitoryData = new HashMap(); + transitoryData = new HashMap<>(); } transitoryData.put(key, value); } @@ -415,7 +415,7 @@ public abstract class AbstractModel implements Parcelable, Cloneable { * Looks inside the given class and finds all declared properties */ protected static Property[] generateProperties(Class cls) { - ArrayList> properties = new ArrayList>(); + ArrayList> properties = new ArrayList<>(); if(cls.getSuperclass() != AbstractModel.class) { properties.addAll(Arrays.asList(generateProperties( (Class) cls.getSuperclass()))); @@ -434,9 +434,7 @@ public abstract class AbstractModel implements Parcelable, Cloneable { continue; } properties.add((Property) field.get(null)); - } catch (IllegalArgumentException e) { - throw new RuntimeException(e); - } catch (IllegalAccessException e) { + } catch (IllegalArgumentException | IllegalAccessException e) { throw new RuntimeException(e); } } @@ -524,9 +522,7 @@ public abstract class AbstractModel implements Parcelable, Cloneable { TYPE model; try { model = cls.newInstance(); - } catch (IllegalAccessException e) { - throw new RuntimeException(e); - } catch (InstantiationException e) { + } catch (IllegalAccessException | InstantiationException e) { throw new RuntimeException(e); } model.setValues = source.readParcelable(ContentValues.class.getClassLoader()); diff --git a/api/src/main/java/com/todoroo/andlib/data/DatabaseDao.java b/api/src/main/java/com/todoroo/andlib/data/DatabaseDao.java index 035ea213c..4e9684313 100644 --- a/api/src/main/java/com/todoroo/andlib/data/DatabaseDao.java +++ b/api/src/main/java/com/todoroo/andlib/data/DatabaseDao.java @@ -70,7 +70,7 @@ public class DatabaseDao { } private final ArrayList> listeners = - new ArrayList>(); + new ArrayList<>(); public void addListener(ModelUpdateListener listener) { listeners.add(listener); @@ -94,7 +94,7 @@ public class DatabaseDao { Log.i("SQL-" + modelClass.getSimpleName(), query.toString()); //$NON-NLS-1$ } Cursor cursor = database.rawQuery(query.toString()); - return new TodorooCursor(cursor, query.getFields()); + return new TodorooCursor<>(cursor, query.getFields()); } /** @@ -105,7 +105,7 @@ public class DatabaseDao { for(int i = 0; i < properties.length; i++) { fields[i] = properties[i].name; } - return new TodorooCursor(database.getDatabase().query(table.name, + return new TodorooCursor<>(database.getDatabase().query(table.name, fields, selection, selectionArgs, null, null, null), properties); } @@ -130,17 +130,7 @@ public class DatabaseDao { } Constructor constructor = modelClass.getConstructor(TodorooCursor.class); return constructor.newInstance(cursor); - } catch (SecurityException e) { - throw new RuntimeException(e); - } catch (NoSuchMethodException e) { - throw new RuntimeException(e); - } catch (IllegalArgumentException e) { - throw new RuntimeException(e); - } catch (InstantiationException e) { - throw new RuntimeException(e); - } catch (IllegalAccessException e) { - throw new RuntimeException(e); - } catch (InvocationTargetException e) { + } catch (SecurityException | InvocationTargetException | IllegalAccessException | InstantiationException | IllegalArgumentException | NoSuchMethodException e) { throw new RuntimeException(e); } finally { cursor.close(); @@ -280,7 +270,7 @@ public class DatabaseDao { TodorooCursor cursor = query( Query.select(properties).where(AbstractModel.ID_PROPERTY.eq(id))); cursor.moveToFirst(); - return new TodorooCursor(cursor, properties); + return new TodorooCursor<>(cursor, properties); } public int count(Query query) { diff --git a/api/src/main/java/com/todoroo/andlib/data/Table.java b/api/src/main/java/com/todoroo/andlib/data/Table.java index 66a404ab4..5274b077d 100644 --- a/api/src/main/java/com/todoroo/andlib/data/Table.java +++ b/api/src/main/java/com/todoroo/andlib/data/Table.java @@ -36,13 +36,7 @@ public final class Table extends SqlTable { public Property[] getProperties() { try { return (Property[])modelClass.getField("PROPERTIES").get(null); - } catch (IllegalArgumentException e) { - throw new RuntimeException(e); - } catch (SecurityException e) { - throw new RuntimeException(e); - } catch (IllegalAccessException e) { - throw new RuntimeException(e); - } catch (NoSuchFieldException e) { + } catch (IllegalArgumentException | NoSuchFieldException | IllegalAccessException | SecurityException e) { throw new RuntimeException(e); } } diff --git a/api/src/main/java/com/todoroo/andlib/data/TodorooCursor.java b/api/src/main/java/com/todoroo/andlib/data/TodorooCursor.java index 99c5326a6..8a12b38d1 100644 --- a/api/src/main/java/com/todoroo/andlib/data/TodorooCursor.java +++ b/api/src/main/java/com/todoroo/andlib/data/TodorooCursor.java @@ -43,7 +43,7 @@ public class TodorooCursor extends CursorWrapper { super(cursor); this.properties = properties; - columnIndexCache = new WeakHashMap(); + columnIndexCache = new WeakHashMap<>(); } /** diff --git a/api/src/main/java/com/todoroo/andlib/service/AbstractDependencyInjector.java b/api/src/main/java/com/todoroo/andlib/service/AbstractDependencyInjector.java index 67f5a36c4..00b3bb6de 100644 --- a/api/src/main/java/com/todoroo/andlib/service/AbstractDependencyInjector.java +++ b/api/src/main/java/com/todoroo/andlib/service/AbstractDependencyInjector.java @@ -42,13 +42,13 @@ abstract public class AbstractDependencyInjector { /** * Dependencies this class knows how to handle */ - protected final HashMap injectables = new HashMap(); + protected final HashMap injectables = new HashMap<>(); /** * Cache of classes that were instantiated by the injector */ protected final HashMap, WeakReference> createdObjects = - new HashMap, WeakReference>(); + new HashMap<>(); /** * Gets the injected object for this field. If implementing class does not @@ -71,14 +71,11 @@ abstract public class AbstractDependencyInjector { Class cls = (Class)injection; try { injection = cls.newInstance(); - } catch (IllegalAccessException e) { - throw new RuntimeException(e); - } catch (InstantiationException e) { + } catch (IllegalAccessException | InstantiationException e) { throw new RuntimeException(e); } - createdObjects.put(cls, - new WeakReference(injection)); + createdObjects.put(cls, new WeakReference<>(injection)); } } diff --git a/api/src/main/java/com/todoroo/andlib/service/DependencyInjectionService.java b/api/src/main/java/com/todoroo/andlib/service/DependencyInjectionService.java index 5ee35fedd..438b4f142 100644 --- a/api/src/main/java/com/todoroo/andlib/service/DependencyInjectionService.java +++ b/api/src/main/java/com/todoroo/andlib/service/DependencyInjectionService.java @@ -30,7 +30,7 @@ public class DependencyInjectionService { /** * Dependency injectors. Use getters and setters to modify this list */ - private final LinkedList injectors = new LinkedList(); + private final LinkedList injectors = new LinkedList<>(); /** * Perform dependency injection in the caller object @@ -55,13 +55,7 @@ public class DependencyInjectionService { field.setAccessible(true); try { handleField(caller, field); - } catch (IllegalStateException e) { - throw new RuntimeException(String.format("Unable to set field '%s' of type '%s'", - field.getName(), field.getType()), e); - } catch (IllegalArgumentException e) { - throw new RuntimeException(String.format("Unable to set field '%s' of type '%s'", - field.getName(), field.getType()), e); - } catch (IllegalAccessException e) { + } catch (IllegalStateException | IllegalAccessException | IllegalArgumentException e) { throw new RuntimeException(String.format("Unable to set field '%s' of type '%s'", field.getName(), field.getType()), e); } diff --git a/api/src/main/java/com/todoroo/andlib/sql/Order.java b/api/src/main/java/com/todoroo/andlib/sql/Order.java index fb36e3f8f..46212a0f7 100644 --- a/api/src/main/java/com/todoroo/andlib/sql/Order.java +++ b/api/src/main/java/com/todoroo/andlib/sql/Order.java @@ -22,7 +22,7 @@ public class Order { private Order(Object expression, OrderType orderType) { this.expression = expression; this.orderType = orderType; - this.secondaryExpressions = new ArrayList(); + this.secondaryExpressions = new ArrayList<>(); } public static Order asc(Object expression) { diff --git a/api/src/main/java/com/todoroo/andlib/sql/Query.java b/api/src/main/java/com/todoroo/andlib/sql/Query.java index a385efa23..7b1b8673e 100644 --- a/api/src/main/java/com/todoroo/andlib/sql/Query.java +++ b/api/src/main/java/com/todoroo/andlib/sql/Query.java @@ -27,11 +27,11 @@ public final class Query { private SqlTable table; private String queryTemplate = null; - private final ArrayList criterions = new ArrayList(); - private final ArrayList fields = new ArrayList(); - private final ArrayList joins = new ArrayList(); - private final ArrayList groupBies = new ArrayList(); - private final ArrayList orders = new ArrayList(); + private final ArrayList criterions = new ArrayList<>(); + private final ArrayList fields = new ArrayList<>(); + private final ArrayList joins = new ArrayList<>(); + private final ArrayList groupBies = new ArrayList<>(); + private final ArrayList orders = new ArrayList<>(); private int limits = -1; private boolean distinct = false; diff --git a/api/src/main/java/com/todoroo/andlib/sql/QueryTemplate.java b/api/src/main/java/com/todoroo/andlib/sql/QueryTemplate.java index a2bdb70d4..4ba2ccb6f 100644 --- a/api/src/main/java/com/todoroo/andlib/sql/QueryTemplate.java +++ b/api/src/main/java/com/todoroo/andlib/sql/QueryTemplate.java @@ -24,10 +24,10 @@ import static java.util.Arrays.asList; */ public final class QueryTemplate { - private final ArrayList criterions = new ArrayList(); - private final ArrayList joins = new ArrayList(); - private final ArrayList groupBies = new ArrayList(); - private final ArrayList orders = new ArrayList(); + private final ArrayList criterions = new ArrayList<>(); + private final ArrayList joins = new ArrayList<>(); + private final ArrayList groupBies = new ArrayList<>(); + private final ArrayList orders = new ArrayList<>(); private Integer limit = null; public QueryTemplate join(Join... join) { diff --git a/api/src/main/java/com/todoroo/astrid/data/Metadata.java b/api/src/main/java/com/todoroo/astrid/data/Metadata.java index 395a67652..54bc7c275 100644 --- a/api/src/main/java/com/todoroo/astrid/data/Metadata.java +++ b/api/src/main/java/com/todoroo/astrid/data/Metadata.java @@ -121,5 +121,5 @@ public class Metadata extends AbstractModel { // --- parcelable helpers - private static final Creator CREATOR = new ModelCreator(Metadata.class); + private static final Creator CREATOR = new ModelCreator<>(Metadata.class); } diff --git a/api/src/main/java/com/todoroo/astrid/data/RemoteModel.java b/api/src/main/java/com/todoroo/astrid/data/RemoteModel.java index ccd0e025a..70820a8c6 100644 --- a/api/src/main/java/com/todoroo/astrid/data/RemoteModel.java +++ b/api/src/main/java/com/todoroo/astrid/data/RemoteModel.java @@ -19,7 +19,6 @@ import org.json.JSONException; import org.json.JSONObject; import java.io.File; -import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; import java.util.Date; @@ -133,8 +132,6 @@ abstract public class RemoteModel extends AbstractModel { fos.flush(); fos.close(); jsonObject.put("path", file.getAbsolutePath()); - } catch (FileNotFoundException e) { - // } catch (IOException e) { // } diff --git a/api/src/main/java/com/todoroo/astrid/data/StoreObject.java b/api/src/main/java/com/todoroo/astrid/data/StoreObject.java index 3f02bc27e..59ab44fdf 100644 --- a/api/src/main/java/com/todoroo/astrid/data/StoreObject.java +++ b/api/src/main/java/com/todoroo/astrid/data/StoreObject.java @@ -95,5 +95,5 @@ public class StoreObject extends AbstractModel { // --- parcelable helpers - private static final Creator CREATOR = new ModelCreator(StoreObject.class); + private static final Creator CREATOR = new ModelCreator<>(StoreObject.class); } diff --git a/api/src/main/java/com/todoroo/astrid/data/TagData.java b/api/src/main/java/com/todoroo/astrid/data/TagData.java index 219d42e84..cd2d11896 100644 --- a/api/src/main/java/com/todoroo/astrid/data/TagData.java +++ b/api/src/main/java/com/todoroo/astrid/data/TagData.java @@ -197,7 +197,7 @@ public final class TagData extends RemoteModel { // --- parcelable helpers - public static final Creator CREATOR = new ModelCreator(TagData.class); + public static final Creator CREATOR = new ModelCreator<>(TagData.class); // --- data access methods diff --git a/api/src/main/java/com/todoroo/astrid/data/TagMetadata.java b/api/src/main/java/com/todoroo/astrid/data/TagMetadata.java index fe2dc25e0..b31ecc14f 100644 --- a/api/src/main/java/com/todoroo/astrid/data/TagMetadata.java +++ b/api/src/main/java/com/todoroo/astrid/data/TagMetadata.java @@ -75,5 +75,5 @@ public class TagMetadata extends AbstractModel { // --- parcelable helpers - private static final Creator CREATOR = new ModelCreator(TagMetadata.class); + private static final Creator CREATOR = new ModelCreator<>(TagMetadata.class); } diff --git a/api/src/main/java/com/todoroo/astrid/data/Task.java b/api/src/main/java/com/todoroo/astrid/data/Task.java index 8b2a9cc47..b8969e07c 100644 --- a/api/src/main/java/com/todoroo/astrid/data/Task.java +++ b/api/src/main/java/com/todoroo/astrid/data/Task.java @@ -301,7 +301,7 @@ public final class Task extends RemoteModel { // --- parcelable helpers - public static final Creator CREATOR = new ModelCreator(Task.class); + public static final Creator CREATOR = new ModelCreator<>(Task.class); // --- data access methods diff --git a/api/src/main/java/com/todoroo/astrid/data/TaskAttachment.java b/api/src/main/java/com/todoroo/astrid/data/TaskAttachment.java index 4ae7a4d4d..9b67921e5 100644 --- a/api/src/main/java/com/todoroo/astrid/data/TaskAttachment.java +++ b/api/src/main/java/com/todoroo/astrid/data/TaskAttachment.java @@ -167,5 +167,5 @@ public final class TaskAttachment extends RemoteModel { // --- parcelable helpers - public static final Creator CREATOR = new ModelCreator(TaskAttachment.class); + public static final Creator CREATOR = new ModelCreator<>(TaskAttachment.class); } diff --git a/api/src/main/java/com/todoroo/astrid/data/TaskListMetadata.java b/api/src/main/java/com/todoroo/astrid/data/TaskListMetadata.java index fd1f086a6..a3ac85156 100644 --- a/api/src/main/java/com/todoroo/astrid/data/TaskListMetadata.java +++ b/api/src/main/java/com/todoroo/astrid/data/TaskListMetadata.java @@ -118,5 +118,5 @@ public final class TaskListMetadata extends RemoteModel { // --- parcelable helpers - public static final Creator CREATOR = new ModelCreator(TaskListMetadata.class); + public static final Creator CREATOR = new ModelCreator<>(TaskListMetadata.class); } diff --git a/api/src/main/java/com/todoroo/astrid/data/Update.java b/api/src/main/java/com/todoroo/astrid/data/Update.java index a2983f9c4..bbc43a8d6 100644 --- a/api/src/main/java/com/todoroo/astrid/data/Update.java +++ b/api/src/main/java/com/todoroo/astrid/data/Update.java @@ -139,5 +139,5 @@ public class Update extends RemoteModel { // --- parcelable helpers - private static final Creator CREATOR = new ModelCreator(Update.class); + private static final Creator CREATOR = new ModelCreator<>(Update.class); } diff --git a/api/src/main/java/com/todoroo/astrid/data/UserActivity.java b/api/src/main/java/com/todoroo/astrid/data/UserActivity.java index d9e03a579..864147261 100644 --- a/api/src/main/java/com/todoroo/astrid/data/UserActivity.java +++ b/api/src/main/java/com/todoroo/astrid/data/UserActivity.java @@ -106,5 +106,5 @@ public class UserActivity extends RemoteModel { return getIdHelper(ID); } - private static final Creator CREATOR = new ModelCreator(UserActivity.class); + private static final Creator CREATOR = new ModelCreator<>(UserActivity.class); } diff --git a/api/src/main/java/com/todoroo/astrid/sync/SyncProviderPreferences.java b/api/src/main/java/com/todoroo/astrid/sync/SyncProviderPreferences.java index 89cb3a242..61b400105 100644 --- a/api/src/main/java/com/todoroo/astrid/sync/SyncProviderPreferences.java +++ b/api/src/main/java/com/todoroo/astrid/sync/SyncProviderPreferences.java @@ -247,7 +247,7 @@ abstract public class SyncProviderPreferences extends TodorooPreferenceActivity private static HashMap getExceptionMap() { if (exceptionsToDisplayMessages == null) { - exceptionsToDisplayMessages = new HashMap(); + exceptionsToDisplayMessages = new HashMap<>(); exceptionsToDisplayMessages.put("java.net.ConnectionException", R.string.sync_error_offline); exceptionsToDisplayMessages.put("java.net.UnknownHostException", R.string.sync_error_offline); } diff --git a/astrid/build.gradle b/astrid/build.gradle index dcb6e77e6..a9a891d0d 100644 --- a/astrid/build.gradle +++ b/astrid/build.gradle @@ -34,6 +34,11 @@ android { release } + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_7 + targetCompatibility JavaVersion.VERSION_1_7 + } + buildTypes { release { runProguard true diff --git a/astrid/src/instrumentTest/java/com/todoroo/astrid/gtasks/GtasksDetailExposerTest.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/gtasks/GtasksDetailExposerTest.java index e3ab84f18..f05e89e27 100644 --- a/astrid/src/instrumentTest/java/com/todoroo/astrid/gtasks/GtasksDetailExposerTest.java +++ b/astrid/src/instrumentTest/java/com/todoroo/astrid/gtasks/GtasksDetailExposerTest.java @@ -96,7 +96,7 @@ public class GtasksDetailExposerTest extends DatabaseTestCase { private void givenTwoListSetup() { TaskLists lists = new TaskLists(); - List newLists = new ArrayList(); + List newLists = new ArrayList<>(); TaskList list = new TaskList(); list.setId("listone-id"); list.setTitle("List One"); //new GoogleTaskListInfo("listone-id", "List One"); diff --git a/astrid/src/instrumentTest/java/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java index 9aa45fc7a..706d0248a 100644 --- a/astrid/src/instrumentTest/java/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java +++ b/astrid/src/instrumentTest/java/com/todoroo/astrid/gtasks/GtasksIndentActionTest.java @@ -137,7 +137,7 @@ public class GtasksIndentActionTest extends DatabaseTestCase { super.setUp(); TaskLists lists = new TaskLists(); - List items = new ArrayList(); + List items = new ArrayList<>(); TaskList list = new TaskList(); list.setId("list"); list.setTitle("Test Tasks"); diff --git a/astrid/src/instrumentTest/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdaterTest.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdaterTest.java index 4c3cd42ec..a04ba3d7a 100644 --- a/astrid/src/instrumentTest/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdaterTest.java +++ b/astrid/src/instrumentTest/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdaterTest.java @@ -124,7 +124,7 @@ public class GtasksTaskListUpdaterTest extends DatabaseTestCase { super.setUp(); TaskLists lists = new TaskLists(); - List items = new ArrayList(); + List items = new ArrayList<>(); TaskList list = new TaskList(); list.setId("1"); list.setTitle("Tim's Tasks"); diff --git a/astrid/src/instrumentTest/java/com/todoroo/astrid/gtasks/GtasksTaskMovingTest.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/gtasks/GtasksTaskMovingTest.java index cef7fb16e..c0ffa72cb 100644 --- a/astrid/src/instrumentTest/java/com/todoroo/astrid/gtasks/GtasksTaskMovingTest.java +++ b/astrid/src/instrumentTest/java/com/todoroo/astrid/gtasks/GtasksTaskMovingTest.java @@ -241,7 +241,7 @@ public class GtasksTaskMovingTest extends DatabaseTestCase { super.setUp(); TaskLists lists = new TaskLists(); - List items = new ArrayList(); + List items = new ArrayList<>(); TaskList taskList = new TaskList(); taskList.setId("1"); taskList.setTitle("Tim's Tasks"); diff --git a/astrid/src/instrumentTest/java/com/todoroo/astrid/model/TaskTests.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/model/TaskTests.java index ce560c7ee..77407eb87 100644 --- a/astrid/src/instrumentTest/java/com/todoroo/astrid/model/TaskTests.java +++ b/astrid/src/instrumentTest/java/com/todoroo/astrid/model/TaskTests.java @@ -28,13 +28,13 @@ public class TaskTests extends DatabaseTestCase { assertTrue(Task.IMPORTANCE_MUST_DO < Task.IMPORTANCE_SHOULD_DO); assertTrue(Task.IMPORTANCE_SHOULD_DO < Task.IMPORTANCE_NONE); - ArrayList reminderFlags = new ArrayList(); + ArrayList reminderFlags = new ArrayList<>(); reminderFlags.add(Task.NOTIFY_AFTER_DEADLINE); reminderFlags.add(Task.NOTIFY_AT_DEADLINE); reminderFlags.add(Task.NOTIFY_MODE_NONSTOP); // assert no duplicates - assertEquals(new TreeSet(reminderFlags).size(), + assertEquals(new TreeSet<>(reminderFlags).size(), reminderFlags.size()); } diff --git a/astrid/src/instrumentTest/java/com/todoroo/astrid/repeats/NewRepeatTests.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/repeats/NewRepeatTests.java index 8ddc5b15e..bcb5ef450 100644 --- a/astrid/src/instrumentTest/java/com/todoroo/astrid/repeats/NewRepeatTests.java +++ b/astrid/src/instrumentTest/java/com/todoroo/astrid/repeats/NewRepeatTests.java @@ -170,7 +170,7 @@ public class NewRepeatTests extends DatabaseTestCase { result += DateUtilities.ONE_WEEK * rrule.getInterval(); return result; } - HashSet weekdays = new HashSet(); + HashSet weekdays = new HashSet<>(); for (WeekdayNum curr : weekdayNums) { weekdays.add(curr.wday); } @@ -361,7 +361,7 @@ public class NewRepeatTests extends DatabaseTestCase { int interval = 1; rrule.setInterval(interval); - List weekdays = new ArrayList(); + List weekdays = new ArrayList<>(); weekdays.add(new WeekdayNum(0, Weekday.MO)); weekdays.add(new WeekdayNum(0, Weekday.WE)); rrule.setByDay(weekdays); @@ -374,7 +374,7 @@ public class NewRepeatTests extends DatabaseTestCase { int interval = 1; rrule.setInterval(interval); - List weekdays = new ArrayList(); + List weekdays = new ArrayList<>(); weekdays.add(new WeekdayNum(0, Weekday.MO)); weekdays.add(new WeekdayNum(0, Weekday.WE)); rrule.setByDay(weekdays); diff --git a/astrid/src/instrumentTest/java/com/todoroo/astrid/service/QuickAddMarkupTest.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/service/QuickAddMarkupTest.java index ea6449def..f06ae2537 100644 --- a/astrid/src/instrumentTest/java/com/todoroo/astrid/service/QuickAddMarkupTest.java +++ b/astrid/src/instrumentTest/java/com/todoroo/astrid/service/QuickAddMarkupTest.java @@ -70,7 +70,7 @@ public class QuickAddMarkupTest extends DatabaseTestCase { // --- helpers private Task task; - private final ArrayList tags = new ArrayList(); + private final ArrayList tags = new ArrayList<>(); private void assertTagsAre(String... expectedTags) { List expected = Arrays.asList(expectedTags); diff --git a/astrid/src/instrumentTest/java/com/todoroo/astrid/service/TitleParserTest.java b/astrid/src/instrumentTest/java/com/todoroo/astrid/service/TitleParserTest.java index 5d541bf3b..c0990a290 100644 --- a/astrid/src/instrumentTest/java/com/todoroo/astrid/service/TitleParserTest.java +++ b/astrid/src/instrumentTest/java/com/todoroo/astrid/service/TitleParserTest.java @@ -548,7 +548,7 @@ public class TitleParserTest extends DatabaseTestCase { for (String acceptedString : acceptedStrings) { task = new Task(); task.setValue(Task.TITLE, "Jog " + acceptedString); //test at end of task. should set importance. - ArrayList tags = new ArrayList(); + ArrayList tags = new ArrayList<>(); TitleParser.listHelper(task, tags); String tag = TitleParser.trimParenthesis(acceptedString); assertTrue("test pound at failed for string: " + acceptedString + " for tags: " + tags.toString(), tags.contains(tag)); @@ -567,7 +567,7 @@ public class TitleParserTest extends DatabaseTestCase { for (String acceptedString : acceptedStrings) { task = new Task(); task.setValue(Task.TITLE, "Jog " + acceptedString); //test at end of task. should set importance. - ArrayList tags = new ArrayList(); + ArrayList tags = new ArrayList<>(); TitleParser.listHelper(task, tags); String tag = TitleParser.trimParenthesis(acceptedString); assertTrue("testTagsAt failed for string: " + acceptedString+ " for tags: " + tags.toString(), tags.contains(tag)); diff --git a/astrid/src/main/java/com/mdimension/jchronic/AstridChronic.java b/astrid/src/main/java/com/mdimension/jchronic/AstridChronic.java index ab4bf1827..840eff0c7 100644 --- a/astrid/src/main/java/com/mdimension/jchronic/AstridChronic.java +++ b/astrid/src/main/java/com/mdimension/jchronic/AstridChronic.java @@ -91,7 +91,7 @@ public class AstridChronic { tokens = Separator.scan(tokens, options); tokens = TimeZone.scan(tokens, options); - List taggedTokens = new LinkedList(); + List taggedTokens = new LinkedList<>(); for (Token token : tokens) { if (token.isTagged()) { taggedTokens.add(token); @@ -156,7 +156,7 @@ public class AstridChronic { */ protected static List baseTokenize(String text) { String[] words = text.split(" "); - List tokens = new LinkedList(); + List tokens = new LinkedList<>(); for (String word : words) { tokens.add(new Token(word)); } diff --git a/astrid/src/main/java/com/todoroo/astrid/actfm/ActFmCameraModule.java b/astrid/src/main/java/com/todoroo/astrid/actfm/ActFmCameraModule.java index 5914c472a..a9acaeddf 100644 --- a/astrid/src/main/java/com/todoroo/astrid/actfm/ActFmCameraModule.java +++ b/astrid/src/main/java/com/todoroo/astrid/actfm/ActFmCameraModule.java @@ -39,7 +39,7 @@ public class ActFmCameraModule { } public static void showPictureLauncher(final Fragment fragment, final ClearImageCallback clearImageOption) { - ArrayList options = new ArrayList(); + ArrayList options = new ArrayList<>(); final Intent cameraIntent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE); PackageManager pm = fragment.getActivity().getPackageManager(); @@ -54,7 +54,7 @@ public class ActFmCameraModule { options.add(fragment.getString(R.string.actfm_picture_clear)); } - ArrayAdapter adapter = new ArrayAdapter(fragment.getActivity(), + ArrayAdapter adapter = new ArrayAdapter<>(fragment.getActivity(), android.R.layout.simple_spinner_dropdown_item, options.toArray(new String[options.size()])); DialogInterface.OnClickListener listener = new DialogInterface.OnClickListener() { diff --git a/astrid/src/main/java/com/todoroo/astrid/actfm/ActFmGoogleAuthActivity.java b/astrid/src/main/java/com/todoroo/astrid/actfm/ActFmGoogleAuthActivity.java index 58e4391d5..b517345a4 100644 --- a/astrid/src/main/java/com/todoroo/astrid/actfm/ActFmGoogleAuthActivity.java +++ b/astrid/src/main/java/com/todoroo/astrid/actfm/ActFmGoogleAuthActivity.java @@ -72,13 +72,13 @@ public class ActFmGoogleAuthActivity extends ListActivity { accountManager = new GoogleAccountManager(this); Account[] accounts = accountManager.getAccounts(); - ArrayList accountNames = new ArrayList(); + ArrayList accountNames = new ArrayList<>(); for (Account a : accounts) { accountNames.add(a.name); } nameArray = accountNames.toArray(new String[accountNames.size()]); - setListAdapter(new ArrayAdapter(this, android.R.layout.simple_list_item_1, nameArray)); + setListAdapter(new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, nameArray)); findViewById(R.id.empty_button).setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { diff --git a/astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/NameMaps.java b/astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/NameMaps.java index 10533f937..f0cab6bc7 100644 --- a/astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/NameMaps.java +++ b/astrid/src/main/java/com/todoroo/astrid/actfm/sync/messages/NameMaps.java @@ -52,10 +52,10 @@ public class NameMaps { static { // Hardcoded local columns mapped to corresponding server names - TASK_PROPERTIES_LOCAL_TO_SERVER = new HashMap, String>(); - TASK_COLUMNS_LOCAL_TO_SERVER = new HashMap(); - TASK_COLUMN_NAMES_TO_PROPERTIES = new HashMap>(); - TASK_PROPERTIES_EXCLUDED = new HashSet(); + TASK_PROPERTIES_LOCAL_TO_SERVER = new HashMap<>(); + TASK_COLUMNS_LOCAL_TO_SERVER = new HashMap<>(); + TASK_COLUMN_NAMES_TO_PROPERTIES = new HashMap<>(); + TASK_PROPERTIES_EXCLUDED = new HashSet<>(); putTaskPropertyToServerName(Task.TITLE, "title", true); putTaskPropertyToServerName(Task.IMPORTANCE, "importance", true); @@ -90,10 +90,10 @@ public class NameMaps { } static { // Hardcoded local columns mapped to corresponding server names - TAG_DATA_PROPERTIES_LOCAL_TO_SERVER = new HashMap, String>(); - TAG_DATA_COLUMNS_LOCAL_TO_SERVER = new HashMap(); - TAG_DATA_COLUMN_NAMES_TO_PROPERTIES = new HashMap>(); - TAG_PROPERTIES_EXCLUDED = new HashSet(); + TAG_DATA_PROPERTIES_LOCAL_TO_SERVER = new HashMap<>(); + TAG_DATA_COLUMNS_LOCAL_TO_SERVER = new HashMap<>(); + TAG_DATA_COLUMN_NAMES_TO_PROPERTIES = new HashMap<>(); + TAG_PROPERTIES_EXCLUDED = new HashSet<>(); putTagPropertyToServerName(TagData.USER_ID, "user_id", true); putTagPropertyToServerName(TagData.NAME, "name", true); @@ -120,10 +120,10 @@ public class NameMaps { } static { - USER_ACTIVITY_PROPERTIES_LOCAL_TO_SERVER = new HashMap, String>(); - USER_ACTIVITY_COLUMN_NAMES_TO_PROPERTIES = new HashMap>(); - USER_ACTIVITY_COLUMNS_LOCAL_TO_SERVER = new HashMap(); - USER_ACTIVITY_PROPERTIES_EXCLUDED = new HashSet(); + USER_ACTIVITY_PROPERTIES_LOCAL_TO_SERVER = new HashMap<>(); + USER_ACTIVITY_COLUMN_NAMES_TO_PROPERTIES = new HashMap<>(); + USER_ACTIVITY_COLUMNS_LOCAL_TO_SERVER = new HashMap<>(); + USER_ACTIVITY_PROPERTIES_EXCLUDED = new HashSet<>(); putUserActivityPropertyToServerName(UserActivity.UUID, "uuid", false); putUserActivityPropertyToServerName(UserActivity.USER_UUID, "user_id", false); @@ -150,10 +150,10 @@ public class NameMaps { } static { - TASK_ATTACHMENT_PROPERTIES_LOCAL_TO_SERVER = new HashMap, String>(); - TASK_ATTACHMENT_COLUMN_NAMES_TO_PROPERTIES = new HashMap>(); - TASK_ATTACHMENT_COLUMNS_LOCAL_TO_SERVER = new HashMap(); - TASK_ATTACHMENT_PROPERTIES_EXCLUDED = new HashSet(); + TASK_ATTACHMENT_PROPERTIES_LOCAL_TO_SERVER = new HashMap<>(); + TASK_ATTACHMENT_COLUMN_NAMES_TO_PROPERTIES = new HashMap<>(); + TASK_ATTACHMENT_COLUMNS_LOCAL_TO_SERVER = new HashMap<>(); + TASK_ATTACHMENT_PROPERTIES_EXCLUDED = new HashSet<>(); putTaskAttachmentPropertyToServerName(TaskAttachment.UUID, "uuid", false); putTaskAttachmentPropertyToServerName(TaskAttachment.USER_UUID, "user_id", false); @@ -180,10 +180,10 @@ public class NameMaps { } static { - TASK_LIST_METADATA_PROPERTIES_LOCAL_TO_SERVER = new HashMap, String>(); - TASK_LIST_METADATA_COLUMN_NAMES_TO_PROPERTIES = new HashMap>(); - TASK_LIST_METADATA_COLUMNS_LOCAL_TO_SERVER = new HashMap(); - TASK_LIST_METADATA_PROPERTIES_EXCLUDED = new HashSet(); + TASK_LIST_METADATA_PROPERTIES_LOCAL_TO_SERVER = new HashMap<>(); + TASK_LIST_METADATA_COLUMN_NAMES_TO_PROPERTIES = new HashMap<>(); + TASK_LIST_METADATA_COLUMNS_LOCAL_TO_SERVER = new HashMap<>(); + TASK_LIST_METADATA_PROPERTIES_EXCLUDED = new HashSet<>(); putTaskListMetadataPropertyToServerName(TaskListMetadata.UUID, "uuid", false); putTaskListMetadataPropertyToServerName(TaskListMetadata.TAG_UUID, "tag_id", true); diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/BeastModePreferences.java b/astrid/src/main/java/com/todoroo/astrid/activity/BeastModePreferences.java index b9ec9b0ef..2357500c0 100644 --- a/astrid/src/main/java/com/todoroo/astrid/activity/BeastModePreferences.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/BeastModePreferences.java @@ -100,7 +100,7 @@ public class BeastModePreferences extends ListActivity { setContentView(R.layout.beast_mode_pref_activity); setTitle(R.string.EPr_beastMode_desc); - prefsToDescriptions = new HashMap(); + prefsToDescriptions = new HashMap<>(); buildDescriptionMap(getResources()); TouchListView touchList = (TouchListView) getListView(); @@ -171,7 +171,7 @@ public class BeastModePreferences extends ListActivity { public static ArrayList constructOrderedControlList(Context context) { String order = Preferences.getStringValue(BEAST_MODE_ORDER_PREF); - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); String[] itemsArray; if (order == null) { itemsArray = context.getResources().getStringArray(R.array.TEA_control_sets_prefs); diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/EditPreferences.java b/astrid/src/main/java/com/todoroo/astrid/activity/EditPreferences.java index 623bcb6c0..da1a359e2 100644 --- a/astrid/src/main/java/com/todoroo/astrid/activity/EditPreferences.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/EditPreferences.java @@ -185,7 +185,7 @@ public class EditPreferences extends TodorooPreferenceActivity { startActivity(intent); } - private static final HashMap, Integer> PREFERENCE_REQUEST_CODES = new HashMap, Integer>(); + private static final HashMap, Integer> PREFERENCE_REQUEST_CODES = new HashMap<>(); static { PREFERENCE_REQUEST_CODES.put(SyncProviderPreferences.class, REQUEST_CODE_SYNC); } @@ -196,7 +196,7 @@ public class EditPreferences extends TodorooPreferenceActivity { List resolveInfoList = pm.queryIntentActivities(queryIntent, PackageManager.GET_META_DATA); LinkedHashMap> categoryPreferences = - new LinkedHashMap>(); + new LinkedHashMap<>(); // Loop through a list of all packages (including plugins, addons) // that have a settings action diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/FilterListFragment.java b/astrid/src/main/java/com/todoroo/astrid/activity/FilterListFragment.java index a6caaeba8..20cd411dd 100644 --- a/astrid/src/main/java/com/todoroo/astrid/activity/FilterListFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/FilterListFragment.java @@ -189,7 +189,7 @@ public class FilterListFragment extends ListFragment { final Filter filter = adapter.getItem(position); final String[] labels = filter.contextMenuLabels; final Intent[] intents = filter.contextMenuIntents; - ArrayAdapter intentAdapter = new ArrayAdapter(getActivity(), android.R.layout.simple_list_item_1); + ArrayAdapter intentAdapter = new ArrayAdapter<>(getActivity(), android.R.layout.simple_list_item_1); intentAdapter.add(getString(R.string.FLA_context_shortcut)); for (String l : labels) { intentAdapter.add(l); diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java index a2d3aebdd..3d31e953a 100755 --- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditFragment.java @@ -184,7 +184,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { private EditText title; private EditNoteActivity editNotes; private ViewPager mPager; - private HashMap controlSetMap = new HashMap(); + private HashMap controlSetMap = new HashMap<>(); private final List controls = Collections.synchronizedList(new ArrayList()); @@ -353,7 +353,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { constructWhenDialog(whenDialogView); - controlSetMap = new HashMap(); + controlSetMap = new HashMap<>(); // populate control set EditTitleControlSet editTitle = new EditTitleControlSet(getActivity(), @@ -829,11 +829,11 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { } private void startAttachFile() { - ArrayList options = new ArrayList(); + ArrayList options = new ArrayList<>(); options.add(getString(R.string.file_add_picture)); options.add(getString(R.string.file_add_sdcard)); - ArrayAdapter adapter = new ArrayAdapter(getActivity(), + ArrayAdapter adapter = new ArrayAdapter<>(getActivity(), android.R.layout.simple_spinner_dropdown_item, options.toArray(new String[options.size()])); DialogInterface.OnClickListener listener = new DialogInterface.OnClickListener() { @@ -893,7 +893,7 @@ ViewPager.OnPageChangeListener, EditNoteActivity.UpdatesChangedListener { private void attachImage(Bitmap bitmap) { - AtomicReference nameRef = new AtomicReference(); + AtomicReference nameRef = new AtomicReference<>(); String path = FileUtilities.getNewImageAttachmentPath(getActivity(), nameRef); try { diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditViewPager.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditViewPager.java index fffc1e9f1..3a40998db 100644 --- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditViewPager.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskEditViewPager.java @@ -23,7 +23,7 @@ public class TaskEditViewPager extends PagerAdapter { public static final int TAB_SHOW_ACTIVITY = 1; public TaskEditViewPager(Context context, int tabStyleMask) { - ArrayList titleList = new ArrayList(); + ArrayList titleList = new ArrayList<>(); if ((tabStyleMask & TAB_SHOW_ACTIVITY) > 0) { titleList.add(context.getString(R.string.TEA_tab_activity)); } diff --git a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java index 145622392..8ec1a7170 100644 --- a/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/activity/TaskListFragment.java @@ -159,7 +159,7 @@ public class TaskListFragment extends ListFragment implements OnSortSelectedList protected TaskAdapter taskAdapter = null; protected DetailReceiver detailReceiver = new DetailReceiver(); protected RefreshReceiver refreshReceiver = new RefreshReceiver(); - protected final AtomicReference sqlQueryTemplate = new AtomicReference(); + protected final AtomicReference sqlQueryTemplate = new AtomicReference<>(); protected SyncActionHelper syncActionHelper; protected Filter filter; protected int sortFlags; diff --git a/astrid/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java b/astrid/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java index 820440b9b..b6e5c6e9a 100644 --- a/astrid/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java +++ b/astrid/src/main/java/com/todoroo/astrid/adapter/FilterAdapter.java @@ -122,7 +122,7 @@ public class FilterAdapter extends ArrayAdapter { this.layout = rowLayout; this.skipIntentFilters = skipIntentFilters; this.selectable = selectable; - this.filterCounts = new HashMap(); + this.filterCounts = new HashMap<>(); inflater = (LayoutInflater) activity.getSystemService( Context.LAYOUT_INFLATER_SERVICE); diff --git a/astrid/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java b/astrid/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java index eb452e45b..0f06d7fbf 100644 --- a/astrid/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java +++ b/astrid/src/main/java/com/todoroo/astrid/adapter/TaskAdapter.java @@ -189,7 +189,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable { protected final Context context; protected final TaskListFragment fragment; protected final Resources resources; - protected final HashMap completedItems = new HashMap(0); + protected final HashMap completedItems = new HashMap<>(0); protected OnCompletedTaskListener onCompletedTaskListener = null; protected final int resource; protected final LayoutInflater inflater; @@ -563,7 +563,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable { protected TaskRowListener listener = new TaskRowListener(); - private Pair lastTouchYRawY = new Pair(0f, 0f); + private Pair lastTouchYRawY = new Pair<>(0f, 0f); /** * Set listeners for this view. This is called once per view when it is @@ -576,7 +576,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable { OnTouchListener otl = new OnTouchListener() { @Override public boolean onTouch(View v, MotionEvent event) { - lastTouchYRawY = new Pair(event.getY(), event.getRawY()); + lastTouchYRawY = new Pair<>(event.getY(), event.getRawY()); return false; } }; @@ -655,7 +655,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable { * ============================================================== details * ====================================================================== */ - private final HashMap htmlCache = new HashMap(8); + private final HashMap htmlCache = new HashMap<>(8); private Spanned convertToHtml(String string, ImageGetter imageGetter) { if(!htmlCache.containsKey(string)) { @@ -671,7 +671,7 @@ public class TaskAdapter extends CursorAdapter implements Filterable { return htmlCache.get(string); } - private final HashMap dateCache = new HashMap(8); + private final HashMap dateCache = new HashMap<>(8); private String formatDate(long date) { if(dateCache.containsKey(date)) { @@ -812,18 +812,23 @@ public class TaskAdapter extends CursorAdapter implements Filterable { private final ImageGetter detailImageGetter = new ImageGetter() { private final HashMap cache = - new HashMap(3); + new HashMap<>(3); @Override public Drawable getDrawable(String source) { int drawable = 0; - if(source.equals("silk_clock")) { - drawable = R.drawable.details_alarm; - } else if(source.equals("silk_tag_pink")) { - drawable = R.drawable.details_tag; - } else if(source.equals("silk_date")) { - drawable = R.drawable.details_repeat; - } else if(source.equals("silk_note")) { - drawable = R.drawable.details_note; + switch (source) { + case "silk_clock": + drawable = R.drawable.details_alarm; + break; + case "silk_tag_pink": + drawable = R.drawable.details_tag; + break; + case "silk_date": + drawable = R.drawable.details_repeat; + break; + case "silk_note": + drawable = R.drawable.details_note; + break; } if (drawable == 0) { diff --git a/astrid/src/main/java/com/todoroo/astrid/alarms/AlarmControlSet.java b/astrid/src/main/java/com/todoroo/astrid/alarms/AlarmControlSet.java index 3f6a68ad3..3a84b320f 100644 --- a/astrid/src/main/java/com/todoroo/astrid/alarms/AlarmControlSet.java +++ b/astrid/src/main/java/com/todoroo/astrid/alarms/AlarmControlSet.java @@ -81,7 +81,7 @@ public final class AlarmControlSet extends TaskEditControlSet { @Override protected void writeToModelAfterInitialized(Task task) { - LinkedHashSet alarms = new LinkedHashSet(); + LinkedHashSet alarms = new LinkedHashSet<>(); for(int i = 0; i < alertsContainer.getChildCount(); i++) { Long dateValue = (Long) alertsContainer.getChildAt(i).getTag(); if(dateValue == null) { diff --git a/astrid/src/main/java/com/todoroo/astrid/alarms/AlarmService.java b/astrid/src/main/java/com/todoroo/astrid/alarms/AlarmService.java index 8cc29b1be..7c56e97f3 100644 --- a/astrid/src/main/java/com/todoroo/astrid/alarms/AlarmService.java +++ b/astrid/src/main/java/com/todoroo/astrid/alarms/AlarmService.java @@ -72,7 +72,7 @@ public class AlarmService { public boolean synchronizeAlarms(final long taskId, LinkedHashSet alarms) { MetadataService service = PluginServices.getMetadataService(); - ArrayList metadata = new ArrayList(); + ArrayList metadata = new ArrayList<>(); for(Long alarm : alarms) { Metadata item = new Metadata(); item.setValue(Metadata.KEY, AlarmFields.METADATA_KEY); diff --git a/astrid/src/main/java/com/todoroo/astrid/alarms/AlarmTaskRepeatListener.java b/astrid/src/main/java/com/todoroo/astrid/alarms/AlarmTaskRepeatListener.java index 4d60cc78d..8f5cdcb3d 100644 --- a/astrid/src/main/java/com/todoroo/astrid/alarms/AlarmTaskRepeatListener.java +++ b/astrid/src/main/java/com/todoroo/astrid/alarms/AlarmTaskRepeatListener.java @@ -43,7 +43,7 @@ public class AlarmTaskRepeatListener extends BroadcastReceiver { } Metadata metadata = new Metadata(); - LinkedHashSet alarms = new LinkedHashSet(cursor.getCount()); + LinkedHashSet alarms = new LinkedHashSet<>(cursor.getCount()); for(cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) { metadata.readFromCursor(cursor); alarms.add(metadata.getValue(AlarmFields.TIME) + (newDueDate - oldDueDate)); diff --git a/astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlExporter.java b/astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlExporter.java index be57ad6be..cad763dc9 100644 --- a/astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlExporter.java +++ b/astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlExporter.java @@ -285,11 +285,7 @@ public class TasksXmlExporter { xml.attribute(null, property.name, valueString); } catch (UnsupportedOperationException e) { // didn't read this value, do nothing - } catch (IllegalArgumentException e) { - throw new RuntimeException(e); - } catch (IllegalStateException e) { - throw new RuntimeException(e); - } catch (IOException e) { + } catch (IllegalArgumentException | IOException | IllegalStateException e) { throw new RuntimeException(e); } return null; @@ -303,11 +299,7 @@ public class TasksXmlExporter { xml.attribute(null, property.name, valueString); } catch (UnsupportedOperationException e) { // didn't read this value, do nothing - } catch (IllegalArgumentException e) { - throw new RuntimeException(e); - } catch (IllegalStateException e) { - throw new RuntimeException(e); - } catch (IOException e) { + } catch (IllegalArgumentException | IOException | IllegalStateException e) { throw new RuntimeException(e); } return null; @@ -323,11 +315,7 @@ public class TasksXmlExporter { xml.attribute(null, property.name, value); } catch (UnsupportedOperationException e) { // didn't read this value, do nothing - } catch (IllegalArgumentException e) { - throw new RuntimeException(e); - } catch (IllegalStateException e) { - throw new RuntimeException(e); - } catch (IOException e) { + } catch (IllegalArgumentException | IOException | IllegalStateException e) { throw new RuntimeException(e); } return null; diff --git a/astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java b/astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java index cbe3ee86e..791cbe067 100644 --- a/astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java +++ b/astrid/src/main/java/com/todoroo/astrid/backup/TasksXmlImporter.java @@ -121,10 +121,7 @@ public class TasksXmlImporter { public void run() { try { performImport(); - } catch (IOException e) { - exceptionService.displayAndReportError(context, - context.getString(R.string.backup_TXI_error), e); - } catch (XmlPullParserException e) { + } catch (IOException | XmlPullParserException e) { exceptionService.displayAndReportError(context, context.getString(R.string.backup_TXI_error), e); } @@ -391,12 +388,16 @@ public class TasksXmlImporter { } try { - if (tag.equals(BackupConstants.TASK_TAG)) { - parseTask(); - } else if (tag.equals(BackupConstants.METADATA_TAG)) { - parseMetadata(3); - } else if (tag.equals(BackupConstants.TAGDATA_TAG)) { - parseTagdata(); + switch (tag) { + case BackupConstants.TASK_TAG: + parseTask(); + break; + case BackupConstants.METADATA_TAG: + parseMetadata(3); + break; + case BackupConstants.TAGDATA_TAG: + parseTagdata(); + break; } } catch (Exception e) { errorCount++; @@ -424,7 +425,7 @@ public class TasksXmlImporter { private String upgradeNotes = null; private boolean syncOnComplete = false; - private final LinkedHashSet tags = new LinkedHashSet(); + private final LinkedHashSet tags = new LinkedHashSet<>(); public Format1TaskImporter(XmlPullParser xpp) throws XmlPullParserException, IOException { this.xpp = xpp; @@ -551,101 +552,102 @@ public class TasksXmlImporter { /** helper method to set field on a task */ private boolean setTaskField(Task task, String field, String value) { - if(field.equals(LegacyTaskModel.ID)) { - // ignore - } - else if(field.equals(LegacyTaskModel.NAME)) { - task.setValue(Task.TITLE, value); - } - else if(field.equals(LegacyTaskModel.NOTES)) { - task.setValue(Task.NOTES, value); - } - else if(field.equals(LegacyTaskModel.PROGRESS_PERCENTAGE)) { - // ignore - } - else if(field.equals(LegacyTaskModel.IMPORTANCE)) { - task.setValue(Task.IMPORTANCE, LegacyImportance.valueOf(value).ordinal()); - } - else if(field.equals(LegacyTaskModel.ESTIMATED_SECONDS)) { - task.setValue(Task.ESTIMATED_SECONDS, Integer.parseInt(value)); - } - else if(field.equals(LegacyTaskModel.ELAPSED_SECONDS)) { - task.setValue(Task.ELAPSED_SECONDS, Integer.parseInt(value)); - } - else if(field.equals(LegacyTaskModel.TIMER_START)) { - task.setValue(Task.TIMER_START, - BackupDateUtilities.getDateFromIso8601String(value).getTime()); - } - else if(field.equals(LegacyTaskModel.DEFINITE_DUE_DATE)) { - String preferred = xpp.getAttributeValue(null, LegacyTaskModel.PREFERRED_DUE_DATE); - if(preferred != null) { - Date preferredDate = BackupDateUtilities.getDateFromIso8601String(value); - upgradeNotes = "Project Deadline: " + - DateUtilities.getDateString(preferredDate); - } - task.setValue(Task.DUE_DATE, - BackupDateUtilities.getTaskDueDateFromIso8601String(value).getTime()); - } - else if(field.equals(LegacyTaskModel.PREFERRED_DUE_DATE)) { - String definite = xpp.getAttributeValue(null, LegacyTaskModel.DEFINITE_DUE_DATE); - if(definite != null) { - // handled above - } else { + switch (field) { + case LegacyTaskModel.ID: + // ignore + break; + case LegacyTaskModel.NAME: + task.setValue(Task.TITLE, value); + break; + case LegacyTaskModel.NOTES: + task.setValue(Task.NOTES, value); + break; + case LegacyTaskModel.PROGRESS_PERCENTAGE: + // ignore + break; + case LegacyTaskModel.IMPORTANCE: + task.setValue(Task.IMPORTANCE, LegacyImportance.valueOf(value).ordinal()); + break; + case LegacyTaskModel.ESTIMATED_SECONDS: + task.setValue(Task.ESTIMATED_SECONDS, Integer.parseInt(value)); + break; + case LegacyTaskModel.ELAPSED_SECONDS: + task.setValue(Task.ELAPSED_SECONDS, Integer.parseInt(value)); + break; + case LegacyTaskModel.TIMER_START: + task.setValue(Task.TIMER_START, + BackupDateUtilities.getDateFromIso8601String(value).getTime()); + break; + case LegacyTaskModel.DEFINITE_DUE_DATE: + String preferred = xpp.getAttributeValue(null, LegacyTaskModel.PREFERRED_DUE_DATE); + if (preferred != null) { + Date preferredDate = BackupDateUtilities.getDateFromIso8601String(value); + upgradeNotes = "Project Deadline: " + + DateUtilities.getDateString(preferredDate); + } task.setValue(Task.DUE_DATE, BackupDateUtilities.getTaskDueDateFromIso8601String(value).getTime()); - } - } - else if(field.equals(LegacyTaskModel.HIDDEN_UNTIL)) { - task.setValue(Task.HIDE_UNTIL, - BackupDateUtilities.getDateFromIso8601String(value).getTime()); - } - else if(field.equals(LegacyTaskModel.BLOCKING_ON)) { - // ignore - } - else if(field.equals(LegacyTaskModel.POSTPONE_COUNT)) { - task.setValue(Task.POSTPONE_COUNT, Integer.parseInt(value)); - } - else if(field.equals(LegacyTaskModel.NOTIFICATIONS)) { - task.setValue(Task.REMINDER_PERIOD, Integer.parseInt(value) * 1000L); - } - else if(field.equals(LegacyTaskModel.CREATION_DATE)) { - task.setValue(Task.CREATION_DATE, - BackupDateUtilities.getDateFromIso8601String(value).getTime()); - } - else if(field.equals(LegacyTaskModel.COMPLETION_DATE)) { - String completion = xpp.getAttributeValue(null, LegacyTaskModel.PROGRESS_PERCENTAGE); - if("100".equals(completion)) { - task.setValue(Task.COMPLETION_DATE, - BackupDateUtilities.getDateFromIso8601String(value).getTime()); - } - } - else if(field.equals(LegacyTaskModel.NOTIFICATION_FLAGS)) { - task.setValue(Task.REMINDER_FLAGS, Integer.parseInt(value)); - } - else if(field.equals(LegacyTaskModel.LAST_NOTIFIED)) { - task.setValue(Task.REMINDER_LAST, - BackupDateUtilities.getDateFromIso8601String(value).getTime()); - } - else if(field.equals("repeat_interval")) { - // handled below - } - else if(field.equals("repeat_value")) { - int repeatValue = Integer.parseInt(value); - String repeatInterval = xpp.getAttributeValue(null, "repeat_interval"); - if(repeatValue > 0 && repeatInterval != null) { - LegacyRepeatInterval interval = LegacyRepeatInterval.valueOf(repeatInterval); - LegacyRepeatInfo repeatInfo = new LegacyRepeatInfo(interval, repeatValue); - RRule rrule = repeatInfo.toRRule(); - task.setValue(Task.RECURRENCE, rrule.toIcal()); - } - } - else if(field.equals(LegacyTaskModel.FLAGS)) { - if(Integer.parseInt(value) == LegacyTaskModel.FLAG_SYNC_ON_COMPLETE) { - syncOnComplete = true; - } - } - else { - return false; + break; + case LegacyTaskModel.PREFERRED_DUE_DATE: + String definite = xpp.getAttributeValue(null, LegacyTaskModel.DEFINITE_DUE_DATE); + if (definite != null) { + // handled above + } else { + task.setValue(Task.DUE_DATE, + BackupDateUtilities.getTaskDueDateFromIso8601String(value).getTime()); + } + break; + case LegacyTaskModel.HIDDEN_UNTIL: + task.setValue(Task.HIDE_UNTIL, + BackupDateUtilities.getDateFromIso8601String(value).getTime()); + break; + case LegacyTaskModel.BLOCKING_ON: + // ignore + break; + case LegacyTaskModel.POSTPONE_COUNT: + task.setValue(Task.POSTPONE_COUNT, Integer.parseInt(value)); + break; + case LegacyTaskModel.NOTIFICATIONS: + task.setValue(Task.REMINDER_PERIOD, Integer.parseInt(value) * 1000L); + break; + case LegacyTaskModel.CREATION_DATE: + task.setValue(Task.CREATION_DATE, + BackupDateUtilities.getDateFromIso8601String(value).getTime()); + break; + case LegacyTaskModel.COMPLETION_DATE: + String completion = xpp.getAttributeValue(null, LegacyTaskModel.PROGRESS_PERCENTAGE); + if ("100".equals(completion)) { + task.setValue(Task.COMPLETION_DATE, + BackupDateUtilities.getDateFromIso8601String(value).getTime()); + } + break; + case LegacyTaskModel.NOTIFICATION_FLAGS: + task.setValue(Task.REMINDER_FLAGS, Integer.parseInt(value)); + break; + case LegacyTaskModel.LAST_NOTIFIED: + task.setValue(Task.REMINDER_LAST, + BackupDateUtilities.getDateFromIso8601String(value).getTime()); + break; + case "repeat_interval": + // handled below + break; + case "repeat_value": + int repeatValue = Integer.parseInt(value); + String repeatInterval = xpp.getAttributeValue(null, "repeat_interval"); + if (repeatValue > 0 && repeatInterval != null) { + LegacyRepeatInterval interval = LegacyRepeatInterval.valueOf(repeatInterval); + LegacyRepeatInfo repeatInfo = new LegacyRepeatInfo(interval, repeatValue); + RRule rrule = repeatInfo.toRRule(); + task.setValue(Task.RECURRENCE, rrule.toIcal()); + } + break; + case LegacyTaskModel.FLAGS: + if (Integer.parseInt(value) == LegacyTaskModel.FLAG_SYNC_ON_COMPLETE) { + syncOnComplete = true; + } + break; + default: + return false; } return true; diff --git a/astrid/src/main/java/com/todoroo/astrid/core/CoreFilterExposer.java b/astrid/src/main/java/com/todoroo/astrid/core/CoreFilterExposer.java index 7a5b6920d..0ca82d888 100644 --- a/astrid/src/main/java/com/todoroo/astrid/core/CoreFilterExposer.java +++ b/astrid/src/main/java/com/todoroo/astrid/core/CoreFilterExposer.java @@ -57,7 +57,7 @@ public final class CoreFilterExposer extends BroadcastReceiver implements Astrid private FilterListItem[] prepareFilters(Resources r) { // core filters - List filters = new ArrayList(3); + List filters = new ArrayList<>(3); filters.add(buildInboxFilter(r)); if (Preferences.getBoolean(R.string.p_show_today_filter, true)) { diff --git a/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java b/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java index 1b1e7871a..e0657cc0b 100644 --- a/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java +++ b/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterActivity.java @@ -168,7 +168,7 @@ public class CustomFilterActivity extends ActionBarActivity { populateCriteria(); filterName = (TextView)findViewById(R.id.filterName); - List startingCriteria = new ArrayList(); + List startingCriteria = new ArrayList<>(); startingCriteria.add(getStartingUniverse()); adapter = new CustomFilterAdapter(this, startingCriteria); listView.setAdapter(adapter); diff --git a/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterAdapter.java b/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterAdapter.java index 436cfa09a..693251063 100644 --- a/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterAdapter.java +++ b/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterAdapter.java @@ -113,7 +113,7 @@ public class CustomFilterAdapter extends ArrayAdapter { if(item.criterion instanceof MultipleSelectCriterion) { MultipleSelectCriterion multiSelectCriterion = (MultipleSelectCriterion) item.criterion; final String[] titles = multiSelectCriterion.entryTitles; - ArrayAdapter adapter = new ArrayAdapter(activity, + ArrayAdapter adapter = new ArrayAdapter<>(activity, android.R.layout.simple_spinner_dropdown_item, titles); DialogInterface.OnClickListener listener = new DialogInterface.OnClickListener() { @Override diff --git a/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java b/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java index 472ffdd0d..a82fd7670 100644 --- a/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java +++ b/astrid/src/main/java/com/todoroo/astrid/core/CustomFilterExposer.java @@ -74,7 +74,7 @@ public final class CustomFilterExposer extends BroadcastReceiver implements Astr StoreObject.TYPE.eq(SavedFilter.TYPE)).orderBy(Order.asc(SavedFilter.NAME))); } try { - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); // stock filters if (Preferences.getBoolean(R.string.p_show_recently_modified_filter, true)) { diff --git a/astrid/src/main/java/com/todoroo/astrid/core/LinkActionExposer.java b/astrid/src/main/java/com/todoroo/astrid/core/LinkActionExposer.java index ed5c8d20d..05b961c70 100644 --- a/astrid/src/main/java/com/todoroo/astrid/core/LinkActionExposer.java +++ b/astrid/src/main/java/com/todoroo/astrid/core/LinkActionExposer.java @@ -114,7 +114,7 @@ public class LinkActionExposer { return new TaskAction(PendingIntent.getActivity(context, (int)id, actionIntent, 0), (BitmapDrawable)icon); } - private static final HashMap IMAGE_CACHE = new HashMap(); + private static final HashMap IMAGE_CACHE = new HashMap<>(); private static BitmapDrawable getBitmapDrawable(int resId, Resources resources) { if (IMAGE_CACHE.containsKey(resId)) { diff --git a/astrid/src/main/java/com/todoroo/astrid/dao/MetadataDao.java b/astrid/src/main/java/com/todoroo/astrid/dao/MetadataDao.java index 83fc6b41a..2f51af8c2 100644 --- a/astrid/src/main/java/com/todoroo/astrid/dao/MetadataDao.java +++ b/astrid/src/main/java/com/todoroo/astrid/dao/MetadataDao.java @@ -79,7 +79,7 @@ public class MetadataDao extends DatabaseDao { */ public void synchronizeMetadata(long taskId, ArrayList metadata, Criterion metadataCriteria) { - HashSet newMetadataValues = new HashSet(); + HashSet newMetadataValues = new HashSet<>(); for(Metadata metadatum : metadata) { metadatum.setValue(Metadata.TASK, taskId); metadatum.clearValue(Metadata.ID); @@ -142,7 +142,7 @@ public class MetadataDao extends DatabaseDao { Query sql = Query.select(properties).from(Metadata.TABLE).join(Join.left(Task.TABLE, Metadata.TASK.eq(Task.ID))).where(Task.TITLE.isNull()); Cursor cursor = database.rawQuery(sql.toString()); - return new TodorooCursor(cursor, properties); + return new TodorooCursor<>(cursor, properties); } } diff --git a/astrid/src/main/java/com/todoroo/astrid/dao/RemoteModelDao.java b/astrid/src/main/java/com/todoroo/astrid/dao/RemoteModelDao.java index 12aa1a87e..0d41da06e 100644 --- a/astrid/src/main/java/com/todoroo/astrid/dao/RemoteModelDao.java +++ b/astrid/src/main/java/com/todoroo/astrid/dao/RemoteModelDao.java @@ -49,7 +49,7 @@ public class RemoteModelDao extends DatabaseDao cursor = query( Query.select(properties).where(RemoteModel.UUID_PROPERTY.eq(uuid))); cursor.moveToFirst(); - return new TodorooCursor(cursor, properties); + return new TodorooCursor<>(cursor, properties); } public String uuidFromLocalId(long localId) { diff --git a/astrid/src/main/java/com/todoroo/astrid/dao/TagMetadataDao.java b/astrid/src/main/java/com/todoroo/astrid/dao/TagMetadataDao.java index f1fb1e83c..880dba4df 100644 --- a/astrid/src/main/java/com/todoroo/astrid/dao/TagMetadataDao.java +++ b/astrid/src/main/java/com/todoroo/astrid/dao/TagMetadataDao.java @@ -89,10 +89,10 @@ public class TagMetadataDao extends DatabaseDao { public void synchronizeMembers(TagData tagData, String legacyMembersString, String tagUuid, JSONArray members) { long tagId = tagData.getId(); - Set emails = new HashSet(); - Set ids = new HashSet(); + Set emails = new HashSet<>(); + Set ids = new HashSet<>(); - HashMap idToEmail = new HashMap(); + HashMap idToEmail = new HashMap<>(); for (int i = 0; i < members.length(); i++) { JSONObject person = members.optJSONObject(i); diff --git a/astrid/src/main/java/com/todoroo/astrid/files/AACRecordingActivity.java b/astrid/src/main/java/com/todoroo/astrid/files/AACRecordingActivity.java index e8f9e03fa..b77b8994e 100644 --- a/astrid/src/main/java/com/todoroo/astrid/files/AACRecordingActivity.java +++ b/astrid/src/main/java/com/todoroo/astrid/files/AACRecordingActivity.java @@ -87,7 +87,7 @@ public class AACRecordingActivity extends Activity implements AACRecorderCallbac public void encodingFinished() { try { - AtomicReference nameRef = new AtomicReference(); + AtomicReference nameRef = new AtomicReference<>(); String outFile = FileUtilities.getNewAudioAttachmentPath(this, nameRef); new AACToM4A().convert(this, tempFile, outFile); diff --git a/astrid/src/main/java/com/todoroo/astrid/files/FileExplore.java b/astrid/src/main/java/com/todoroo/astrid/files/FileExplore.java index a67d9cbd6..bfcb24d19 100644 --- a/astrid/src/main/java/com/todoroo/astrid/files/FileExplore.java +++ b/astrid/src/main/java/com/todoroo/astrid/files/FileExplore.java @@ -37,7 +37,7 @@ import java.util.ArrayList; public class FileExplore extends Activity { // Stores names of traversed directories - ArrayList str = new ArrayList(); + ArrayList str = new ArrayList<>(); // Check if the first level of the directory structure is the one showing private Boolean firstLvl = true; diff --git a/astrid/src/main/java/com/todoroo/astrid/files/FilesControlSet.java b/astrid/src/main/java/com/todoroo/astrid/files/FilesControlSet.java index 257424b1f..f5fd913e4 100644 --- a/astrid/src/main/java/com/todoroo/astrid/files/FilesControlSet.java +++ b/astrid/src/main/java/com/todoroo/astrid/files/FilesControlSet.java @@ -57,7 +57,7 @@ public class FilesControlSet extends PopupControlSet { @Autowired private TaskAttachmentDao taskAttachmentDao; - private final ArrayList files = new ArrayList(); + private final ArrayList files = new ArrayList<>(); private final LinearLayout fileDisplayList; private final LayoutInflater inflater; private final ImageView image; diff --git a/astrid/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmReceiver.java b/astrid/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmReceiver.java index b49436427..04a10acc7 100644 --- a/astrid/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmReceiver.java +++ b/astrid/src/main/java/com/todoroo/astrid/gcal/CalendarAlarmReceiver.java @@ -113,11 +113,11 @@ public class CalendarAlarmReceiver extends BroadcastReceiver { int emailIndex = attendees.getColumnIndexOrThrow(Calendars.ATTENDEES_EMAIL_COL); int nameIndex = attendees.getColumnIndexOrThrow(Calendars.ATTENDEES_NAME_COL); - ArrayList names = new ArrayList(); - ArrayList emails = new ArrayList(); + ArrayList names = new ArrayList<>(); + ArrayList emails = new ArrayList<>(); Account[] accountArray = AccountManager.get(context).getAccounts(); - Set phoneAccounts = new HashSet(); + Set phoneAccounts = new HashSet<>(); for (Account a : accountArray) { phoneAccounts.add(a.name); } diff --git a/astrid/src/main/java/com/todoroo/astrid/gcal/Calendars.java b/astrid/src/main/java/com/todoroo/astrid/gcal/Calendars.java index 21167b06a..17e6704a9 100644 --- a/astrid/src/main/java/com/todoroo/astrid/gcal/Calendars.java +++ b/astrid/src/main/java/com/todoroo/astrid/gcal/Calendars.java @@ -71,12 +71,13 @@ public class Calendars { } private static Uri getIcsUri(String table) { - if (CALENDAR_CONTENT_CALENDARS.equals(table)) { - return CalendarContract.Calendars.CONTENT_URI; - } else if (CALENDAR_CONTENT_EVENTS.equals(table)) { - return CalendarContract.Events.CONTENT_URI; - } else if (CALENDAR_CONTENT_ATTENDEES.equals(table)) { - return CalendarContract.Attendees.CONTENT_URI; + switch (table) { + case CALENDAR_CONTENT_CALENDARS: + return CalendarContract.Calendars.CONTENT_URI; + case CALENDAR_CONTENT_EVENTS: + return CalendarContract.Events.CONTENT_URI; + case CALENDAR_CONTENT_ATTENDEES: + return CalendarContract.Attendees.CONTENT_URI; } return null; } @@ -179,11 +180,11 @@ public class Calendars { int currentSettingIndex = -1; - ArrayList entries = new ArrayList(); + ArrayList entries = new ArrayList<>(); entries.addAll(Arrays.asList(r.getStringArray(R.array.EPr_default_addtocalendar))); entries.addAll(Arrays.asList(calendars.calendars)); - ArrayList entryValues = new ArrayList(); + ArrayList entryValues = new ArrayList<>(); entryValues.addAll(Arrays.asList(r.getStringArray(R.array.EPr_default_addtocalendar_values))); entryValues.addAll(Arrays.asList(calendars.calendarIds)); diff --git a/astrid/src/main/java/com/todoroo/astrid/gcal/GCalControlSet.java b/astrid/src/main/java/com/todoroo/astrid/gcal/GCalControlSet.java index aa79fc851..b71277392 100644 --- a/astrid/src/main/java/com/todoroo/astrid/gcal/GCalControlSet.java +++ b/astrid/src/main/java/com/todoroo/astrid/gcal/GCalControlSet.java @@ -73,11 +73,11 @@ public class GCalControlSet extends PopupControlSet { ((LinearLayout) getDisplayView()).addView(getView()); //hack for spinner this.calendarSelector = (Spinner) getView().findViewById(R.id.calendars); - ArrayList items = new ArrayList(); + ArrayList items = new ArrayList<>(); Collections.addAll(items, calendars.calendars); items.add(0, activity.getString(R.string.gcal_TEA_nocal)); - ArrayAdapter adapter = new ArrayAdapter(activity, + ArrayAdapter adapter = new ArrayAdapter<>(activity, android.R.layout.simple_spinner_item, items.toArray(new String[items.size()])); adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListFragment.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListFragment.java index f5d7f9224..7cfecf309 100644 --- a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListFragment.java @@ -55,7 +55,7 @@ public class GtasksListFragment extends SubtasksListFragment { @Override protected OrderedListFragmentHelperInterface createFragmentHelper() { - return new OrderedMetadataListFragmentHelper(this, gtasksTaskListUpdater); + return new OrderedMetadataListFragmentHelper<>(this, gtasksTaskListUpdater); } @Override diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListService.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListService.java index 83daa5d15..952eb17c3 100644 --- a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListService.java +++ b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksListService.java @@ -76,7 +76,7 @@ public class GtasksListService { public synchronized void updateLists(TaskLists remoteLists) { readLists(); - HashSet previousLists = new HashSet(lists.length); + HashSet previousLists = new HashSet<>(lists.length); for(StoreObject list : lists) { previousLists.add(list.getId()); } diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksMetadataService.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksMetadataService.java index 49bbc5010..1ab6cca77 100644 --- a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksMetadataService.java +++ b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksMetadataService.java @@ -107,7 +107,7 @@ public final class GtasksMetadataService extends SyncMetadataService filterLocallyUpdated(TodorooCursor tasks, long lastSyncDate) { - HashSet taskIds = new HashSet(); + HashSet taskIds = new HashSet<>(); for(tasks.moveToFirst(); !tasks.isAfterLast(); tasks.moveToNext()) { taskIds.add(tasks.get(Task.ID)); } @@ -182,7 +182,7 @@ public final class GtasksMetadataService extends SyncMetadataService sibling = new AtomicReference(); + final AtomicReference sibling = new AtomicReference<>(); OrderedListIterator iterator = new OrderedListIterator() { @Override public void processTask(long taskId, Metadata metadata) { diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java index 4556a4db0..1ff93ef49 100644 --- a/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java +++ b/astrid/src/main/java/com/todoroo/astrid/gtasks/GtasksTaskListUpdater.java @@ -32,13 +32,13 @@ import java.util.concurrent.atomic.AtomicLong; public class GtasksTaskListUpdater extends OrderedMetadataListUpdater { /** map of task -> parent task */ - final HashMap parents = new HashMap(); + final HashMap parents = new HashMap<>(); /** map of task -> prior sibling */ - final HashMap siblings = new HashMap(); + final HashMap siblings = new HashMap<>(); final HashMap localToRemoteIdMap = - new HashMap(); + new HashMap<>(); @Autowired private GtasksListService gtasksListService; @Autowired private GtasksMetadataService gtasksMetadataService; diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java index 3ce13763f..d64b03e8b 100644 --- a/astrid/src/main/java/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java +++ b/astrid/src/main/java/com/todoroo/astrid/gtasks/auth/GtasksLoginActivity.java @@ -82,14 +82,14 @@ public class GtasksLoginActivity extends ListActivity { accountManager = new GoogleAccountManager(this); Account[] accounts = accountManager.getAccounts(); - ArrayList accountNames = new ArrayList(); + ArrayList accountNames = new ArrayList<>(); for (Account a : accounts) { accountNames.add(a.name); } nameArray = accountNames.toArray(new String[accountNames.size()]); - setListAdapter(new ArrayAdapter(this, android.R.layout.simple_list_item_1, nameArray)); + setListAdapter(new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, nameArray)); findViewById(R.id.empty_button).setOnClickListener(new OnClickListener() { @Override public void onClick(View v) { diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java index 3a8c0e8bf..2fa6d27dc 100644 --- a/astrid/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java +++ b/astrid/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncService.java @@ -48,7 +48,7 @@ public final class GtasksSyncService { DependencyInjectionService.getInstance().inject(this); } - private final LinkedBlockingQueue operationQueue = new LinkedBlockingQueue(); + private final LinkedBlockingQueue operationQueue = new LinkedBlockingQueue<>(); private abstract class SyncOnSaveOperation { abstract public void op(GtasksInvoker invoker) throws IOException; diff --git a/astrid/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java b/astrid/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java index 373c37401..63b119346 100644 --- a/astrid/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java +++ b/astrid/src/main/java/com/todoroo/astrid/gtasks/sync/GtasksSyncV2Provider.java @@ -242,7 +242,7 @@ public class GtasksSyncV2Provider extends SyncV2Provider { List tasks = taskList.getItems(); if (tasks != null) { callback.incrementMax(tasks.size() * 10); - HashSet localIds = new HashSet(tasks.size()); + HashSet localIds = new HashSet<>(tasks.size()); for (com.google.api.services.tasks.model.Task t : tasks) { GtasksTaskContainer container = parseRemoteTask(t, listId); gtasksMetadataService.findLocalMatch(container); @@ -287,7 +287,7 @@ public class GtasksSyncV2Provider extends SyncV2Provider { private GtasksTaskContainer parseRemoteTask(com.google.api.services.tasks.model.Task remoteTask, String listId) { Task task = new Task(); - ArrayList metadata = new ArrayList(); + ArrayList metadata = new ArrayList<>(); task.setValue(Task.TITLE, remoteTask.getTitle()); task.setValue(Task.CREATION_DATE, DateUtilities.now()); diff --git a/astrid/src/main/java/com/todoroo/astrid/helper/SyncActionHelper.java b/astrid/src/main/java/com/todoroo/astrid/helper/SyncActionHelper.java index 05fa2fa6c..1620a1713 100644 --- a/astrid/src/main/java/com/todoroo/astrid/helper/SyncActionHelper.java +++ b/astrid/src/main/java/com/todoroo/astrid/helper/SyncActionHelper.java @@ -54,7 +54,7 @@ public class SyncActionHelper { public static final String PREF_LAST_AUTO_SYNC = "taskListLastAutoSync"; //$NON-NLS-1$ - private final LinkedHashSet syncActions = new LinkedHashSet(); + private final LinkedHashSet syncActions = new LinkedHashSet<>(); public final SyncResultCallback syncResultCallback; @@ -179,7 +179,7 @@ public class SyncActionHelper { PackageManager pm = activity.getPackageManager(); List resolveInfoList = pm.queryIntentActivities( queryIntent, PackageManager.GET_META_DATA); - ArrayList syncIntents = new ArrayList(); + ArrayList syncIntents = new ArrayList<>(); // Loop through a list of all packages (including plugins, addons) // that have a settings action: filter to sync actions @@ -239,7 +239,7 @@ public class SyncActionHelper { return; } - ArrayAdapter adapter = new ArrayAdapter(activity, + ArrayAdapter adapter = new ArrayAdapter<>(activity, android.R.layout.simple_spinner_dropdown_item, items); // show a menu of available options diff --git a/astrid/src/main/java/com/todoroo/astrid/notes/EditNoteActivity.java b/astrid/src/main/java/com/todoroo/astrid/notes/EditNoteActivity.java index 106f8ec02..b2cafaeda 100644 --- a/astrid/src/main/java/com/todoroo/astrid/notes/EditNoteActivity.java +++ b/astrid/src/main/java/com/todoroo/astrid/notes/EditNoteActivity.java @@ -75,7 +75,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene @Autowired UserActivityDao userActivityDao; @Autowired TaskService taskService; - private final ArrayList items = new ArrayList(); + private final ArrayList items = new ArrayList<>(); private EditText commentField; private final View commentsBar; private View timerView; @@ -93,7 +93,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene private static boolean respondToPicture = false; - private final List listeners = new LinkedList(); + private final List listeners = new LinkedList<>(); public interface UpdatesChangedListener { public void updatesChanged(); diff --git a/astrid/src/main/java/com/todoroo/astrid/provider/Astrid3ContentProvider.java b/astrid/src/main/java/com/todoroo/astrid/provider/Astrid3ContentProvider.java index cb4f8756d..a8798e5df 100644 --- a/astrid/src/main/java/com/todoroo/astrid/provider/Astrid3ContentProvider.java +++ b/astrid/src/main/java/com/todoroo/astrid/provider/Astrid3ContentProvider.java @@ -179,25 +179,25 @@ public class Astrid3ContentProvider extends ContentProvider { private UriHelper generateHelper(Uri uri, boolean populateModel) { if(uri.toString().startsWith(Task.CONTENT_URI.toString())) { - UriHelper helper = new UriHelper(); + UriHelper helper = new UriHelper<>(); helper.model = populateModel ? new Task() : null; helper.dao = taskDao; helper.dao.setDatabase(getDatabase()); return helper; } else if(uri.toString().startsWith(Metadata.CONTENT_URI.toString())) { - UriHelper helper = new UriHelper(); + UriHelper helper = new UriHelper<>(); helper.model = populateModel ? new Metadata() : null; helper.dao = metadataDao; helper.dao.setDatabase(getDatabase()); return helper; } else if(uri.toString().startsWith(StoreObject.CONTENT_URI.toString())) { - UriHelper helper = new UriHelper(); + UriHelper helper = new UriHelper<>(); helper.model = populateModel ? new StoreObject() : null; helper.dao = storeObjectDao; helper.dao.setDatabase(getDatabase()); return helper; } else if(uri.toString().startsWith(UserActivity.CONTENT_URI.toString())) { - UriHelper helper = new UriHelper(); + UriHelper helper = new UriHelper<>(); helper.model = populateModel ? new UserActivity() : null; helper.dao = userActivityDao; helper.dao.setDatabase(getDatabase()); @@ -358,7 +358,7 @@ public class Astrid3ContentProvider extends ContentProvider { ContentValues setValues = model.getSetValues(); if (setValues != null) { Set> entries = setValues.valueSet(); - Set keysToRemove = new HashSet(); + Set keysToRemove = new HashSet<>(); for (Entry entry: entries) { String key = entry.getKey(); if (key.startsWith(AbstractModel.RETAIN_TRANSITORY_PREFIX)) { diff --git a/astrid/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java b/astrid/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java index e9a7f3271..632a6b933 100644 --- a/astrid/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java +++ b/astrid/src/main/java/com/todoroo/astrid/repeats/RepeatControlSet.java @@ -83,7 +83,7 @@ public class RepeatControlSet extends PopupControlSet { private long repeatUntilValue; - private final List listeners = new LinkedList(); + private final List listeners = new LinkedList<>(); public interface RepeatChangedListener { public void repeatChanged(boolean repeat); @@ -333,7 +333,7 @@ public class RepeatControlSet extends PopupControlSet { case INTERVAL_WEEKS: { rrule.setFreq(Frequency.WEEKLY); - ArrayList days = new ArrayList(); + ArrayList days = new ArrayList<>(); for (CompoundButton dayOfWeek : daysOfWeek) { if (dayOfWeek.isChecked()) { days.add(new WeekdayNum(0, (Weekday) dayOfWeek.getTag())); diff --git a/astrid/src/main/java/com/todoroo/astrid/service/MetadataService.java b/astrid/src/main/java/com/todoroo/astrid/service/MetadataService.java index b3f4bd434..14ab83e09 100644 --- a/astrid/src/main/java/com/todoroo/astrid/service/MetadataService.java +++ b/astrid/src/main/java/com/todoroo/astrid/service/MetadataService.java @@ -102,7 +102,7 @@ public class MetadataService { public boolean synchronizeMetadata(long taskId, ArrayList metadata, Criterion metadataCriterion, SynchronizeMetadataCallback callback) { boolean dirty = false; - HashSet newMetadataValues = new HashSet(); + HashSet newMetadataValues = new HashSet<>(); for(Metadata metadatum : metadata) { metadatum.setValue(Metadata.TASK, taskId); metadatum.clearValue(Metadata.CREATION_DATE); diff --git a/astrid/src/main/java/com/todoroo/astrid/service/SyncV2Service.java b/astrid/src/main/java/com/todoroo/astrid/service/SyncV2Service.java index a9ebf47ba..20d353763 100644 --- a/astrid/src/main/java/com/todoroo/astrid/service/SyncV2Service.java +++ b/astrid/src/main/java/com/todoroo/astrid/service/SyncV2Service.java @@ -36,7 +36,7 @@ public class SyncV2Service { * Returns active sync providers */ public List activeProviders() { - ArrayList actives = new ArrayList(); + ArrayList actives = new ArrayList<>(); for(SyncV2Provider provider : providers) { if(provider.isActive()) { actives.add(provider); diff --git a/astrid/src/main/java/com/todoroo/astrid/service/TaskService.java b/astrid/src/main/java/com/todoroo/astrid/service/TaskService.java index 2e5d8b147..f580d9a43 100644 --- a/astrid/src/main/java/com/todoroo/astrid/service/TaskService.java +++ b/astrid/src/main/java/com/todoroo/astrid/service/TaskService.java @@ -383,7 +383,7 @@ public class TaskService { task.setValue(Task.TITLE, title); } - ArrayList tags = new ArrayList(); + ArrayList tags = new ArrayList<>(); boolean quickAddMarkup = false; try { quickAddMarkup = parseQuickAddMarkup(task, tags); diff --git a/astrid/src/main/java/com/todoroo/astrid/service/UpdateScreenFlow.java b/astrid/src/main/java/com/todoroo/astrid/service/UpdateScreenFlow.java index e74527528..a166f27d8 100644 --- a/astrid/src/main/java/com/todoroo/astrid/service/UpdateScreenFlow.java +++ b/astrid/src/main/java/com/todoroo/astrid/service/UpdateScreenFlow.java @@ -48,10 +48,7 @@ public class UpdateScreenFlow extends Activity { Class activityClass = Class.forName(className); Intent intent = new Intent(this, activityClass); startActivityForResult(intent, REQUEST_CODE_SCREEN_FLOW); - } catch (ClassNotFoundException e) { - e.printStackTrace(); - finish(); - } catch (ActivityNotFoundException e) { + } catch (ClassNotFoundException | ActivityNotFoundException e) { e.printStackTrace(); finish(); } diff --git a/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java b/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java index e5015f614..72fde0b80 100644 --- a/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java +++ b/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListFragmentHelper.java @@ -261,7 +261,7 @@ public class AstridOrderedListFragmentHelper implements OrderedListFragmen return; } - final ArrayList chained = new ArrayList(); + final ArrayList chained = new ArrayList<>(); updater.applyToDescendants(itemId, new AstridOrderedListUpdater.OrderedListNodeVisitor() { @Override public void visitNode(AstridOrderedListUpdater.Node node) { diff --git a/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListUpdater.java b/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListUpdater.java index 55fc6edf9..2a49b4995 100644 --- a/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListUpdater.java +++ b/astrid/src/main/java/com/todoroo/astrid/subtasks/AstridOrderedListUpdater.java @@ -26,7 +26,7 @@ public abstract class AstridOrderedListUpdater { public AstridOrderedListUpdater() { DependencyInjectionService.getInstance().inject(this); - idToNode = new HashMap(); + idToNode = new HashMap<>(); } public interface OrderedListNodeVisitor { @@ -37,7 +37,7 @@ public abstract class AstridOrderedListUpdater { public String uuid; public Node parent; public int indent; - public final ArrayList children = new ArrayList(); + public final ArrayList children = new ArrayList<>(); public Node(String uuid, Node parent, int indent) { this.uuid = uuid; @@ -80,11 +80,11 @@ public abstract class AstridOrderedListUpdater { private void verifyTreeModel(LIST list, Filter filter) { boolean changedThings = false; Set keySet = idToNode.keySet(); - Set currentIds = new HashSet(); + Set currentIds = new HashSet<>(); for (String id : keySet) { currentIds.add(id); } - Set idsInQuery = new HashSet(); + Set idsInQuery = new HashSet<>(); String sql = filter.getSqlQuery().replaceAll("ORDER BY .*", ""); //$NON-NLS-1$//$NON-NLS-2$ sql = sql + String.format(" ORDER BY %s", Task.CREATION_DATE); //$NON-NLS-1$ TodorooCursor tasks = taskService.fetchFiltered(sql, null, Task.UUID); @@ -138,7 +138,7 @@ public abstract class AstridOrderedListUpdater { } private String[] getOrderedIds() { - ArrayList ids = new ArrayList(); + ArrayList ids = new ArrayList<>(); orderedIdHelper(treeRoot, ids); return ids.toArray(new String[ids.size()]); } diff --git a/astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java b/astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java index a0b5650a2..ada1f1a4c 100644 --- a/astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java +++ b/astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListFragmentHelper.java @@ -123,7 +123,7 @@ public class OrderedMetadataListFragmentHelper implements OrderedListFragm baseProperties = TaskAdapter.BASIC_PROPERTIES; } - ArrayList> properties = new ArrayList>(Arrays.asList(baseProperties)); + ArrayList> properties = new ArrayList<>(Arrays.asList(baseProperties)); properties.add(updater.indentProperty()); properties.add(updater.orderProperty()); return properties.toArray(new Property[properties.size()]); @@ -272,7 +272,7 @@ public class OrderedMetadataListFragmentHelper implements OrderedListFragm return; } - final ArrayList chained = new ArrayList(); + final ArrayList chained = new ArrayList<>(); final int parentIndent = item.getValue(updater.indentProperty()); updater.applyToChildren(list, itemId, new OrderedListNodeVisitor() { @Override diff --git a/astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListUpdater.java b/astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListUpdater.java index 4b91a1794..32f99818f 100644 --- a/astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListUpdater.java +++ b/astrid/src/main/java/com/todoroo/astrid/subtasks/OrderedMetadataListUpdater.java @@ -202,7 +202,7 @@ abstract public class OrderedMetadataListUpdater { protected static class Node { public final long taskId; public Node parent; - public final ArrayList children = new ArrayList(); + public final ArrayList children = new ArrayList<>(); public Node(long taskId, Node parent) { this.taskId = taskId; @@ -251,7 +251,7 @@ abstract public class OrderedMetadataListUpdater { protected Node buildTreeModel(LIST list) { final Node root = new Node(Task.NO_ID, null); final AtomicInteger previoustIndent = new AtomicInteger(-1); - final AtomicReference currentNode = new AtomicReference(root); + final AtomicReference currentNode = new AtomicReference<>(root); iterateThroughList(list, new OrderedListIterator() { @Override diff --git a/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksHelper.java b/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksHelper.java index eef9ee8a5..f67127ba2 100644 --- a/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksHelper.java +++ b/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksHelper.java @@ -103,7 +103,7 @@ public class SubtasksHelper { @Deprecated private static Long[] getIdArray(String serializedTree) { - ArrayList ids = new ArrayList(); + ArrayList ids = new ArrayList<>(); String[] digitsOnly = serializedTree.split("[\\[\\],\\s]"); // Split on [ ] , or whitespace chars for (String idString : digitsOnly) { try { @@ -118,7 +118,7 @@ public class SubtasksHelper { } public static String[] getStringIdArray(String serializedTree) { - ArrayList ids = new ArrayList(); + ArrayList ids = new ArrayList<>(); String[] values = serializedTree.split("[\\[\\],\"\\s]"); // Split on [ ] , or whitespace chars for (String idString : values) { if (!TextUtils.isEmpty(idString)) { @@ -176,7 +176,7 @@ public class SubtasksHelper { } private static HashMap getIdMap(A[] keys, Property keyProperty, Property valueProperty) { - HashMap map = new HashMap(); + HashMap map = new HashMap<>(); TodorooCursor tasks = PluginServices.getTaskService().query(Query.select(keyProperty, valueProperty).where(keyProperty.in(keys))); try { for (tasks.moveToFirst(); !tasks.isAfterLast(); tasks.moveToNext()) { diff --git a/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksListFragment.java b/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksListFragment.java index 0c714e2aa..801eed730 100644 --- a/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksListFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksListFragment.java @@ -36,7 +36,7 @@ public class SubtasksListFragment extends TaskListFragment { } protected OrderedListFragmentHelperInterface createFragmentHelper() { - return new AstridOrderedListFragmentHelper(this, new SubtasksFilterUpdater()); + return new AstridOrderedListFragmentHelper<>(this, new SubtasksFilterUpdater()); } @Override diff --git a/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java b/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java index b2f081576..f312b19ef 100644 --- a/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java +++ b/astrid/src/main/java/com/todoroo/astrid/subtasks/SubtasksTagListFragment.java @@ -24,7 +24,7 @@ public class SubtasksTagListFragment extends TagViewFragment { public SubtasksTagListFragment() { super(); - helper = new AstridOrderedListFragmentHelper(this, new SubtasksTagUpdater(isBeingFiltered)); + helper = new AstridOrderedListFragmentHelper<>(this, new SubtasksTagUpdater(isBeingFiltered)); } @Override diff --git a/astrid/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java b/astrid/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java index 743cd8021..f2b71fef5 100644 --- a/astrid/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java +++ b/astrid/src/main/java/com/todoroo/astrid/tags/TagFilterExposer.java @@ -127,7 +127,7 @@ public class TagFilterExposer extends BroadcastReceiver implements AstridFilterE protected FilterListItem[] prepareFilters(Context context) { ContextManager.setContext(context); - ArrayList list = new ArrayList(); + ArrayList list = new ArrayList<>(); addTags(list); @@ -149,7 +149,7 @@ public class TagFilterExposer extends BroadcastReceiver implements AstridFilterE boolean shouldAddUntagged = addUntaggedFilter && Preferences.getBoolean(R.string.p_show_not_in_list_filter, true); - ArrayList filters = new ArrayList(tags.length); + ArrayList filters = new ArrayList<>(tags.length); Context context = ContextManager.getContext(); Resources r = context.getResources(); diff --git a/astrid/src/main/java/com/todoroo/astrid/tags/TagService.java b/astrid/src/main/java/com/todoroo/astrid/tags/TagService.java index 1eba2534d..7a482b4b7 100644 --- a/astrid/src/main/java/com/todoroo/astrid/tags/TagService.java +++ b/astrid/src/main/java/com/todoroo/astrid/tags/TagService.java @@ -171,7 +171,7 @@ public final class TagService { orderBy(order).groupBy(TaskToTagMetadata.TAG_NAME); TodorooCursor cursor = metadataDao.query(query); try { - ArrayList array = new ArrayList(); + ArrayList array = new ArrayList<>(); for (int i = 0; i < cursor.getCount(); i++) { cursor.moveToNext(); Tag tag = Tag.tagFromUUID(cursor.get(TaskToTagMetadata.TAG_UUID)); @@ -293,7 +293,7 @@ public final class TagService { * Return all tags (including metadata tags and TagData tags) in an array list */ public ArrayList getTagList() { - ArrayList tagList = new ArrayList(); + ArrayList tagList = new ArrayList<>(); TodorooCursor cursor = tagDataService.query(Query.select(TagData.PROPERTIES).where(Criterion.and(TagData.DELETION_DATE.eq(0), Criterion.or(TagData.IS_FOLDER.isNull(), TagData.IS_FOLDER.neq(1)), TagData.NAME.isNotNull())).orderBy(Order.asc(Functions.upper(TagData.NAME)))); try { @@ -316,7 +316,7 @@ public final class TagService { * Save the given array of tags into the database */ public void synchronizeTags(long taskId, String taskUuid, Set tags) { - HashSet existingLinks = new HashSet(); + HashSet existingLinks = new HashSet<>(); TodorooCursor links = metadataDao.query(Query.select(Metadata.PROPERTIES) .where(Criterion.and(TaskToTagMetadata.TASK_UUID.eq(taskUuid), Metadata.DELETION_DATE.eq(0)))); try { diff --git a/astrid/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java b/astrid/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java index 36739a90b..3dc2343d5 100644 --- a/astrid/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java +++ b/astrid/src/main/java/com/todoroo/astrid/tags/TagsControlSet.java @@ -77,7 +77,7 @@ public final class TagsControlSet extends PopupControlSet { } private HashMap buildTagIndices(ArrayList tagNames) { - HashMap indices = new HashMap(); + HashMap indices = new HashMap<>(); for (int i = 0; i < tagNames.size(); i++) { indices.put(tagNames.get(i), i); } @@ -85,7 +85,7 @@ public final class TagsControlSet extends PopupControlSet { } private ArrayList getTagNames(Tag[] tags) { - ArrayList names = new ArrayList(); + ArrayList names = new ArrayList<>(); for (Tag tag : tags) { names.add(tag.toString()); } @@ -119,7 +119,7 @@ public final class TagsControlSet extends PopupControlSet { } private LinkedHashSet getTagSet() { - LinkedHashSet tags = new LinkedHashSet(); + LinkedHashSet tags = new LinkedHashSet<>(); if (initialized) { for(int i = 0; i < selectedTags.getAdapter().getCount(); i++) { if (selectedTags.isItemChecked(i)) { @@ -236,7 +236,7 @@ public final class TagsControlSet extends PopupControlSet { super.readFromTask(task); if(model.getId() != AbstractModel.NO_ID) { TodorooCursor cursor = tagService.getTags(model.getId()); - LinkedHashSet tags = new LinkedHashSet(cursor.getCount()); + LinkedHashSet tags = new LinkedHashSet<>(cursor.getCount()); try { for(cursor.moveToFirst(); !cursor.isAfterLast(); cursor.moveToNext()) { String tag = cursor.get(TaskToTagMetadata.TAG_NAME); @@ -287,7 +287,7 @@ public final class TagsControlSet extends PopupControlSet { tagIndices = buildTagIndices(allTagNames); selectedTags = (ListView) getView().findViewById(R.id.existingTags); - selectedTags.setAdapter(new ArrayAdapter(activity, + selectedTags.setAdapter(new ArrayAdapter<>(activity, R.layout.simple_list_item_multiple_choice_themed, allTagNames)); selectedTags.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE); diff --git a/astrid/src/main/java/com/todoroo/astrid/timers/TimerActionControlSet.java b/astrid/src/main/java/com/todoroo/astrid/timers/TimerActionControlSet.java index d725c721d..90d026f6e 100644 --- a/astrid/src/main/java/com/todoroo/astrid/timers/TimerActionControlSet.java +++ b/astrid/src/main/java/com/todoroo/astrid/timers/TimerActionControlSet.java @@ -29,7 +29,7 @@ public class TimerActionControlSet extends TaskEditControlSet { private final ImageView timerButton; private final Chronometer chronometer; private boolean timerActive; - private final List listeners = new LinkedList(); + private final List listeners = new LinkedList<>(); public TimerActionControlSet(final Activity activity, View parent) { super(activity, -1); diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/DateAndTimePicker.java b/astrid/src/main/java/com/todoroo/astrid/ui/DateAndTimePicker.java index da69f0548..88cba123c 100644 --- a/astrid/src/main/java/com/todoroo/astrid/ui/DateAndTimePicker.java +++ b/astrid/src/main/java/com/todoroo/astrid/ui/DateAndTimePicker.java @@ -150,7 +150,7 @@ public class DateAndTimePicker extends LinearLayout { } String[] labels = context.getResources().getStringArray(arrayResource); - ArrayList urgencyValues = new ArrayList(); + ArrayList urgencyValues = new ArrayList<>(); todayUrgency = new UrgencyValue(labels[2], Task.URGENCY_TODAY); if (useShortcuts) { diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java b/astrid/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java index 8c8acb709..6893cb1ee 100644 --- a/astrid/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java +++ b/astrid/src/main/java/com/todoroo/astrid/ui/HideUntilControlSet.java @@ -162,7 +162,7 @@ public class HideUntilControlSet extends PopupControlSet implements OnItemSelect private void customDateFinished() { HideUntilValue[] list = createHideUntilList(customDate.getTime()); - adapter = new ArrayAdapter( + adapter = new ArrayAdapter<>( activity, android.R.layout.simple_spinner_item, list); adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); @@ -246,7 +246,7 @@ public class HideUntilControlSet extends PopupControlSet implements OnItemSelect } HideUntilValue[] list = createHideUntilList(date); - adapter = new ArrayAdapter( + adapter = new ArrayAdapter<>( activity, android.R.layout.simple_spinner_item, list); super.readFromTask(task); diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/ImportanceControlSet.java b/astrid/src/main/java/com/todoroo/astrid/ui/ImportanceControlSet.java index e7e13fabd..93b1260e8 100644 --- a/astrid/src/main/java/com/todoroo/astrid/ui/ImportanceControlSet.java +++ b/astrid/src/main/java/com/todoroo/astrid/ui/ImportanceControlSet.java @@ -29,9 +29,9 @@ import java.util.List; * */ public class ImportanceControlSet extends TaskEditControlSet { - private final List buttons = new LinkedList(); + private final List buttons = new LinkedList<>(); private final int[] colors; - private final List listeners = new LinkedList(); + private final List listeners = new LinkedList<>(); private static final int TEXT_SIZE = 18; diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/NNumberPickerDialog.java b/astrid/src/main/java/com/todoroo/astrid/ui/NNumberPickerDialog.java index 11ff7be8e..aedecd300 100644 --- a/astrid/src/main/java/com/todoroo/astrid/ui/NNumberPickerDialog.java +++ b/astrid/src/main/java/com/todoroo/astrid/ui/NNumberPickerDialog.java @@ -28,7 +28,7 @@ public class NNumberPickerDialog extends AlertDialog implements OnClickListener void onNumbersPicked(int[] number); } - private final List pickers = new LinkedList(); + private final List pickers = new LinkedList<>(); private final OnNNumberPickedListener mCallback; /** Instantiate the dialog box. diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/QuickAddBar.java b/astrid/src/main/java/com/todoroo/astrid/ui/QuickAddBar.java index cfb8490da..06b39a54e 100644 --- a/astrid/src/main/java/com/todoroo/astrid/ui/QuickAddBar.java +++ b/astrid/src/main/java/com/todoroo/astrid/ui/QuickAddBar.java @@ -233,7 +233,7 @@ public class QuickAddBar extends LinearLayout { Task empty = new Task(); TagData tagData = fragment.getActiveTagData(); if (tagData != null) { - HashSet tagsTransitory = new HashSet(); + HashSet tagsTransitory = new HashSet<>(); tagsTransitory.add(tagData.getValue(TagData.NAME)); empty.putTransitory(TaskService.TRANS_TAGS, tagsTransitory); } @@ -298,7 +298,7 @@ public class QuickAddBar extends LinearLayout { if (currentVoiceFile != null) { - AtomicReference nameRef = new AtomicReference(); + AtomicReference nameRef = new AtomicReference<>(); String path = FileUtilities.getNewAudioAttachmentPath(activity, nameRef); voiceRecognizer.convert(path); diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/RandomReminderControlSet.java b/astrid/src/main/java/com/todoroo/astrid/ui/RandomReminderControlSet.java index d812d917c..69a779da5 100644 --- a/astrid/src/main/java/com/todoroo/astrid/ui/RandomReminderControlSet.java +++ b/astrid/src/main/java/com/todoroo/astrid/ui/RandomReminderControlSet.java @@ -54,7 +54,7 @@ public class RandomReminderControlSet extends TaskEditControlSet { }); // create adapter - ArrayAdapter adapter = new ArrayAdapter( + ArrayAdapter adapter = new ArrayAdapter<>( activity, android.R.layout.simple_spinner_item, activity.getResources().getStringArray(R.array.TEA_reminder_random)); adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); diff --git a/astrid/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java b/astrid/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java index 6034e10b0..c03d536e7 100644 --- a/astrid/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java +++ b/astrid/src/main/java/com/todoroo/astrid/ui/ReminderControlSet.java @@ -46,7 +46,7 @@ public class ReminderControlSet extends PopupControlSet { public ReminderControlSet(Activity activity, int viewLayout, int displayViewLayout) { super(activity, viewLayout, displayViewLayout, R.string.TEA_reminders_group_label); - extraViews = new ArrayList(); + extraViews = new ArrayList<>(); label = (TextView) getDisplayView().findViewById(R.id.display_row_edit); image = (ImageView) getDisplayView().findViewById(R.id.display_row_icon); @@ -123,7 +123,7 @@ public class ReminderControlSet extends PopupControlSet { activity.getString(R.string.TEA_reminder_mode_five), activity.getString(R.string.TEA_reminder_mode_nonstop), }; - final ArrayAdapter adapter = new ArrayAdapter( + final ArrayAdapter adapter = new ArrayAdapter<>( activity, android.R.layout.simple_spinner_item, list); adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item); mode.setOnItemSelectedListener(new OnItemSelectedListener() { diff --git a/astrid/src/main/java/com/todoroo/astrid/utility/SyncMetadataService.java b/astrid/src/main/java/com/todoroo/astrid/utility/SyncMetadataService.java index d82614a94..0d9f1d57f 100644 --- a/astrid/src/main/java/com/todoroo/astrid/utility/SyncMetadataService.java +++ b/astrid/src/main/java/com/todoroo/astrid/utility/SyncMetadataService.java @@ -108,7 +108,7 @@ abstract public class SyncMetadataService { try { TodorooCursor metadata = getRemoteTaskMetadata(); try { - ArrayList matchingRows = new ArrayList(); + ArrayList matchingRows = new ArrayList<>(); joinRows(tasks, metadata, matchingRows, both); return diff --git a/astrid/src/main/java/com/todoroo/astrid/utility/TitleParser.java b/astrid/src/main/java/com/todoroo/astrid/utility/TitleParser.java index 94f4790ed..fb16a3dde 100644 --- a/astrid/src/main/java/com/todoroo/astrid/utility/TitleParser.java +++ b/astrid/src/main/java/com/todoroo/astrid/utility/TitleParser.java @@ -47,7 +47,7 @@ public class TitleParser { Pattern tagPattern = Pattern.compile("(\\s|^)#(\\(.*\\)|[^\\s]+)"); Pattern contextPattern = Pattern.compile("(\\s|^)@(\\(.*\\)|[^\\s]+)"); - Set addedTags = new HashSet(); + Set addedTags = new HashSet<>(); TagService tagService = TagService.getInstance(); while(true) { @@ -262,7 +262,7 @@ public class TitleParser { inputText = removeIfParenthetical(match, inputText); } - HashMap dayTimes = new HashMap(); + HashMap dayTimes = new HashMap<>(); dayTimes.put("(?i)\\bbreakfast\\b", 8); dayTimes.put("(?i)\\blunch\\b", 12); dayTimes.put("(?i)\\bsupper\\b", 18); @@ -375,7 +375,7 @@ public class TitleParser { return false; } String inputText = task.getValue(Task.TITLE); - HashMap repeatTimes = new HashMap(); + HashMap repeatTimes = new HashMap<>(); repeatTimes.put("(?i)\\bevery ?\\w{0,6} days?\\b" , Frequency.DAILY); repeatTimes.put("(?i)\\bevery ?\\w{0,6} ?nights?\\b" , Frequency.DAILY); repeatTimes.put("(?i)\\bevery ?\\w{0,6} ?mornings?\\b" , Frequency.DAILY); @@ -386,7 +386,7 @@ public class TitleParser { repeatTimes.put("(?i)\\bevery \\w{0,6} ?months?\\b", Frequency.MONTHLY); repeatTimes.put("(?i)\\bevery \\w{0,6} ?years?\\b", Frequency.YEARLY); - HashMap repeatTimesIntervalOne = new HashMap(); + HashMap repeatTimesIntervalOne = new HashMap<>(); //pre-determined intervals of 1 repeatTimesIntervalOne.put( "(?i)\\bdaily\\b" , Frequency.DAILY); repeatTimesIntervalOne.put( "(?i)\\beveryday\\b" , Frequency.DAILY); @@ -426,7 +426,7 @@ public class TitleParser { //helper method for repeatHelper. private static int findInterval(String inputText) { - HashMap wordsToNum = new HashMap(); + HashMap wordsToNum = new HashMap<>(); String[] words = new String[] { "one", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten", "eleven", "twelve" diff --git a/astrid/src/main/java/com/todoroo/astrid/voice/Api6VoiceOutputAssistant.java b/astrid/src/main/java/com/todoroo/astrid/voice/Api6VoiceOutputAssistant.java index 248194866..8840204ff 100644 --- a/astrid/src/main/java/com/todoroo/astrid/voice/Api6VoiceOutputAssistant.java +++ b/astrid/src/main/java/com/todoroo/astrid/voice/Api6VoiceOutputAssistant.java @@ -30,7 +30,7 @@ public class Api6VoiceOutputAssistant implements OnInitListener, VoiceOutputAssi private boolean isTTSInitialized; private boolean retryLastSpeak; private String lastTextToSpeak; - private static final HashMap ttsParams = new HashMap(); + private static final HashMap ttsParams = new HashMap<>(); static { ttsParams.put(TextToSpeech.Engine.KEY_PARAM_STREAM,