From 085bb7a94c2c459f356bc95bb20eca255128b092 Mon Sep 17 00:00:00 2001 From: Stefan Niedermann Date: Thu, 29 Jul 2021 18:13:12 +0200 Subject: Make use of Java 10 var keyword Signed-off-by: Stefan Niedermann --- .../notes/persistence/migration/Migration_10_11.java | 12 ++++++------ .../notes/persistence/migration/Migration_13_14.java | 10 +++++----- .../notes/persistence/migration/Migration_14_15.java | 16 ++++++++-------- .../notes/persistence/migration/Migration_15_16.java | 12 ++++++------ .../notes/persistence/migration/Migration_20_21.java | 20 ++++++++++---------- .../notes/persistence/migration/Migration_21_22.java | 4 ++-- .../notes/persistence/migration/Migration_22_23.java | 8 ++++---- .../notes/persistence/migration/Migration_9_10.java | 4 ++-- 8 files changed, 43 insertions(+), 43 deletions(-) (limited to 'app/src/main/java/it/niedermann/owncloud/notes/persistence/migration') diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_10_11.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_10_11.java index 5a739b7d..84ef2105 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_10_11.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_10_11.java @@ -26,14 +26,14 @@ public class Migration_10_11 extends Migration { */ @Override public void migrate(@NonNull SupportSQLiteDatabase database) { - SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context); - SharedPreferences.Editor editor = sharedPreferences.edit(); - Map prefs = sharedPreferences.getAll(); - for (Map.Entry pref : prefs.entrySet()) { - String key = pref.getKey(); + final var sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context); + final var editor = sharedPreferences.edit(); + final var prefs = sharedPreferences.getAll(); + for (final var pref : prefs.entrySet()) { + final String key = pref.getKey(); final String DARK_THEME_KEY = "NLW_darkTheme"; if ("darkTheme".equals(key) || key.startsWith(DARK_THEME_KEY) || key.startsWith("SNW_darkTheme")) { - Boolean darkTheme = (Boolean) pref.getValue(); + final Boolean darkTheme = (Boolean) pref.getValue(); editor.putString(pref.getKey(), darkTheme ? DarkModeSetting.DARK.name() : DarkModeSetting.LIGHT.name()); } } diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_13_14.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_13_14.java index 3d0147fb..805204f6 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_13_14.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_13_14.java @@ -47,10 +47,10 @@ public class Migration_13_14 extends Migration { final String SP_WIDGET_KEY = "single_note_widget"; final String SP_ACCOUNT_ID_KEY = "SNW_accountId"; final String SP_DARK_THEME_KEY = "SNW_darkTheme"; - SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context); - SharedPreferences.Editor editor = sharedPreferences.edit(); - Map prefs = sharedPreferences.getAll(); - for (Map.Entry pref : prefs.entrySet()) { + final var sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context); + final var editor = sharedPreferences.edit(); + final var prefs = sharedPreferences.getAll(); + for (final var pref : prefs.entrySet()) { final String key = pref.getKey(); Integer widgetId = null; Long noteId = null; @@ -69,7 +69,7 @@ public class Migration_13_14 extends Migration { themeMode = sharedPreferences.getBoolean(SP_DARK_THEME_KEY + widgetId, false) ? DarkModeSetting.DARK.getModeId() : DarkModeSetting.LIGHT.getModeId(); } - ContentValues migratedWidgetValues = new ContentValues(); + final var migratedWidgetValues = new ContentValues(); migratedWidgetValues.put("ID", widgetId); migratedWidgetValues.put("ACCOUNT_ID", accountId); migratedWidgetValues.put("NOTE_ID", noteId); diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_14_15.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_14_15.java index a66fc0e9..bda4d046 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_14_15.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_14_15.java @@ -27,7 +27,7 @@ public class Migration_14_15 extends Migration { @Override public void migrate(@NonNull SupportSQLiteDatabase db) { // Rename a tmp_NOTES table. - String tmpTableNotes = String.format("tmp_%s", "NOTES"); + final String tmpTableNotes = String.format("tmp_%s", "NOTES"); db.execSQL("ALTER TABLE NOTES RENAME TO " + tmpTableNotes); db.execSQL("CREATE TABLE NOTES ( " + "ID INTEGER PRIMARY KEY AUTOINCREMENT, " + @@ -53,14 +53,14 @@ public class Migration_14_15 extends Migration { createIndex(db, "CATEGORIES", "CATEGORY_ID", "CATEGORY_ACCOUNT_ID", "CATEGORY_TITLE"); // A hashtable storing categoryTitle - categoryId Mapping // This is used to prevent too many searches in database - Hashtable categoryTitleIdMap = new Hashtable<>(); + final var categoryTitleIdMap = new Hashtable(); int id = 1; - Cursor tmpNotesCursor = db.query("SELECT * FROM " + tmpTableNotes, null); + final var tmpNotesCursor = db.query("SELECT * FROM " + tmpTableNotes, null); while (tmpNotesCursor.moveToNext()) { - String categoryTitle = tmpNotesCursor.getString(8); - int accountId = tmpNotesCursor.getInt(2); + final String categoryTitle = tmpNotesCursor.getString(8); + final int accountId = tmpNotesCursor.getInt(2); Log.e("###", accountId + ""); - Integer categoryId; + final Integer categoryId; if (categoryTitleIdMap.containsKey(categoryTitle) && categoryTitleIdMap.get(categoryTitle) != null) { categoryId = categoryTitleIdMap.get(categoryTitle); } else { @@ -74,7 +74,7 @@ public class Migration_14_15 extends Migration { categoryTitleIdMap.put(categoryTitle, categoryId); } // Move the data in tmp_NOTES to NOTES - ContentValues values = new ContentValues(); + final ContentValues values = new ContentValues(); values.put("ID", tmpNotesCursor.getInt(0)); values.put("REMOTEID", tmpNotesCursor.getInt(1)); values.put("ACCOUNT_ID", tmpNotesCursor.getInt(2)); @@ -99,7 +99,7 @@ public class Migration_14_15 extends Migration { } private static void createIndex(@NonNull SupportSQLiteDatabase db, @NonNull String table, @NonNull String column) { - String indexName = table + "_" + column + "_idx"; + final String indexName = table + "_" + column + "_idx"; Log.v(TAG, "Creating database index: CREATE INDEX IF NOT EXISTS " + indexName + " ON " + table + "(" + column + ")"); db.execSQL("CREATE INDEX " + indexName + " ON " + table + "(" + column + ")"); } diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_15_16.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_15_16.java index 48b7195b..7be78511 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_15_16.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_15_16.java @@ -51,10 +51,10 @@ public class Migration_15_16 extends Migration { final String SP_DARK_THEME_KEY = "NLW_darkTheme"; final String SP_CATEGORY_KEY = "NLW_cat"; - SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context); - SharedPreferences.Editor editor = sharedPreferences.edit(); - Map prefs = sharedPreferences.getAll(); - for (Map.Entry pref : prefs.entrySet()) { + final var sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context); + final var editor = sharedPreferences.edit(); + final var prefs = sharedPreferences.getAll(); + for (final var pref : prefs.entrySet()) { final String key = pref.getKey(); Integer widgetId = null; Integer mode = null; @@ -76,7 +76,7 @@ public class Migration_15_16 extends Migration { if (mode == 2) { final String categoryTitle = sharedPreferences.getString(SP_CATEGORY_KEY + widgetId, null); - Cursor cursor = db.query("SELECT CATEGORY_ID FROM CATEGORIES WHERE CATEGORY_TITLE = ? AND CATEGORY_ACCOUNT_ID = ?", new String[]{categoryTitle, String.valueOf(accountId)}); + final var cursor = db.query("SELECT CATEGORY_ID FROM CATEGORIES WHERE CATEGORY_TITLE = ? AND CATEGORY_ACCOUNT_ID = ?", new String[]{categoryTitle, String.valueOf(accountId)}); if (cursor.moveToNext()) { categoryId = cursor.getInt(0); } else { @@ -85,7 +85,7 @@ public class Migration_15_16 extends Migration { cursor.close(); } - ContentValues migratedWidgetValues = new ContentValues(); + final var migratedWidgetValues = new ContentValues(); migratedWidgetValues.put("ID", widgetId); migratedWidgetValues.put("ACCOUNT_ID", accountId); migratedWidgetValues.put("CATEGORY_ID", categoryId); diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_20_21.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_20_21.java index d9ed2041..32ede8b1 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_20_21.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_20_21.java @@ -90,8 +90,8 @@ public final class Migration_20_21 extends Migration { } private static void migrateAccounts(@NonNull SupportSQLiteDatabase db) { - final Cursor cursor = db.query("SELECT * FROM ACCOUNTS", null); - final ContentValues values = new ContentValues(10); + final var cursor = db.query("SELECT * FROM ACCOUNTS", null); + final var values = new ContentValues(10); final int COLUMN_POSITION_ID = cursor.getColumnIndex("ID"); final int COLUMN_POSITION_URL = cursor.getColumnIndex("URL"); @@ -131,8 +131,8 @@ public final class Migration_20_21 extends Migration { } private static void migrateCategories(@NonNull SupportSQLiteDatabase db) { - final Cursor cursor = db.query("SELECT * FROM CATEGORIES", null); - final ContentValues values = new ContentValues(3); + final var cursor = db.query("SELECT * FROM CATEGORIES", null); + final var values = new ContentValues(3); final int COLUMN_POSITION_ACCOUNT_ID = cursor.getColumnIndex("CATEGORY_ACCOUNT_ID"); final int COLUMN_POSITION_TITLE = cursor.getColumnIndex("CATEGORY_TITLE"); @@ -148,8 +148,8 @@ public final class Migration_20_21 extends Migration { } private static void migrateNotes(@NonNull SupportSQLiteDatabase db) { - final Cursor cursor = db.query("SELECT NOTES.*, CATEGORIES.category_title as `CAT_TITLE` FROM NOTES LEFT JOIN CATEGORIES ON NOTES.category = CATEGORIES.category_id", null); - final ContentValues values = new ContentValues(12); + final var cursor = db.query("SELECT NOTES.*, CATEGORIES.category_title as `CAT_TITLE` FROM NOTES LEFT JOIN CATEGORIES ON NOTES.category = CATEGORIES.category_id", null); + final var values = new ContentValues(12); final int COLUMN_POSITION_ID = cursor.getColumnIndex("ID"); final int COLUMN_POSITION_REMOTEID = cursor.getColumnIndex("REMOTEID"); @@ -183,8 +183,8 @@ public final class Migration_20_21 extends Migration { } private static void migrateNotesListWidgets(@NonNull SupportSQLiteDatabase db) { - final Cursor cursor = db.query("SELECT WIDGET_NOTE_LISTS.*, CATEGORIES.category_title as `CATEGORY` FROM WIDGET_NOTE_LISTS LEFT JOIN CATEGORIES ON WIDGET_NOTE_LISTS.CATEGORY_ID = CATEGORIES.category_id", null); - final ContentValues values = new ContentValues(5); + final var cursor = db.query("SELECT WIDGET_NOTE_LISTS.*, CATEGORIES.category_title as `CATEGORY` FROM WIDGET_NOTE_LISTS LEFT JOIN CATEGORIES ON WIDGET_NOTE_LISTS.CATEGORY_ID = CATEGORIES.category_id", null); + final var values = new ContentValues(5); final int COLUMN_POSITION_ID = cursor.getColumnIndex("ID"); final int COLUMN_POSITION_ACCOUNT_ID = cursor.getColumnIndex("ACCOUNT_ID"); @@ -204,8 +204,8 @@ public final class Migration_20_21 extends Migration { } private static void migrateSingleNotesWidgets(@NonNull SupportSQLiteDatabase db) { - final Cursor cursor = db.query("SELECT * FROM WIDGET_SINGLE_NOTES", null); - final ContentValues values = new ContentValues(4); + final var cursor = db.query("SELECT * FROM WIDGET_SINGLE_NOTES", null); + final var values = new ContentValues(4); final int COLUMN_POSITION_ID = cursor.getColumnIndex("ID"); final int COLUMN_POSITION_ACCOUNT_ID = cursor.getColumnIndex("ACCOUNT_ID"); diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_21_22.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_21_22.java index f4413bba..c076d38e 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_21_22.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_21_22.java @@ -25,8 +25,8 @@ public class Migration_21_22 extends Migration { @Override public void migrate(@NonNull SupportSQLiteDatabase database) { - SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context); - SharedPreferences.Editor editor = sharedPreferences.edit(); + final var sharedPreferences = PreferenceManager.getDefaultSharedPreferences(context); + final var editor = sharedPreferences.edit(); if (sharedPreferences.contains("backgroundSync")) { editor.remove("backgroundSync"); if (sharedPreferences.getString("backgroundSync", "").equals("off")) { diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_22_23.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_22_23.java index b6a7494b..1ba08a3c 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_22_23.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_22_23.java @@ -46,8 +46,8 @@ public class Migration_22_23 extends Migration { } private static void sanitizeAccounts(@NonNull SupportSQLiteDatabase db) { - final Cursor cursor = db.query("SELECT id, apiVersion FROM ACCOUNT", null); - final ContentValues values = new ContentValues(1); + final var cursor = db.query("SELECT id, apiVersion FROM ACCOUNT", null); + final var values = new ContentValues(1); final int COLUMN_POSITION_ID = cursor.getColumnIndex("id"); final int COLUMN_POSITION_API_VERSION = cursor.getColumnIndex("apiVersion"); @@ -77,10 +77,10 @@ public class Migration_22_23 extends Migration { } } - final Collection result = new ArrayList<>(); + final var result = new ArrayList(); for (int i = 0; i < a.length(); i++) { try { - final ApiVersion version = ApiVersion.of(a.getString(i)); + final var version = ApiVersion.of(a.getString(i)); if (version.getMajor() != 0 || version.getMinor() != 0) { result.add(version); } diff --git a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_9_10.java b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_9_10.java index 7cdab8c0..9b4b328f 100644 --- a/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_9_10.java +++ b/app/src/main/java/it/niedermann/owncloud/notes/persistence/migration/Migration_9_10.java @@ -24,9 +24,9 @@ public class Migration_9_10 extends Migration { @Override public void migrate(@NonNull SupportSQLiteDatabase db) { db.execSQL("ALTER TABLE NOTES ADD COLUMN EXCERPT INTEGER NOT NULL DEFAULT ''"); - Cursor cursor = db.query("NOTES", new String[]{"ID", "CONTENT", "TITLE"}); + final var cursor = db.query("NOTES", new String[]{"ID", "CONTENT", "TITLE"}); while (cursor.moveToNext()) { - ContentValues values = new ContentValues(); + final var values = new ContentValues(); values.put("EXCERPT", NoteUtil.generateNoteExcerpt(cursor.getString(1), cursor.getString(2))); db.update("NOTES", OnConflictStrategy.REPLACE, values, "ID" + " = ? ", new String[]{cursor.getString(0)}); } -- cgit v1.2.3