From a91561aa58db1c43092c1caecc051a11fa5391c7 Mon Sep 17 00:00:00 2001 From: "Tadashi G. Takaoka" Date: Fri, 23 May 2014 20:18:17 +0900 Subject: Use Java 7 diamond operator Change-Id: If16ef50ae73147594615d0f49d6a22621eaf1aef --- .../inputmethod/keyboard/internal/KeyboardTextsTable.tmpl | 10 +++------- .../src/com/android/inputmethod/keyboard/tools/JarUtils.java | 2 +- .../com/android/inputmethod/keyboard/tools/LocaleUtils.java | 2 +- .../android/inputmethod/keyboard/tools/MakeKeyboardText.java | 2 +- .../android/inputmethod/keyboard/tools/MoreKeysResources.java | 7 +++---- .../android/inputmethod/keyboard/tools/StringResourceMap.java | 4 ++-- 6 files changed, 11 insertions(+), 16 deletions(-) (limited to 'tools/make-keyboard-text') diff --git a/tools/make-keyboard-text/res/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.tmpl b/tools/make-keyboard-text/res/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.tmpl index 2b5494fa5..6a7469ccb 100644 --- a/tools/make-keyboard-text/res/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.tmpl +++ b/tools/make-keyboard-text/res/src/com/android/inputmethod/keyboard/internal/KeyboardTextsTable.tmpl @@ -16,8 +16,6 @@ package com.android.inputmethod.keyboard.internal; -import com.android.inputmethod.latin.utils.CollectionUtils; - import java.util.HashMap; import java.util.Locale; @@ -44,14 +42,12 @@ import java.util.Locale; */ public final class KeyboardTextsTable { // Name to index map. - private static final HashMap sNameToIndexesMap = CollectionUtils.newHashMap(); + private static final HashMap sNameToIndexesMap = new HashMap<>(); // Locale to texts table map. - private static final HashMap sLocaleToTextsTableMap = - CollectionUtils.newHashMap(); + private static final HashMap sLocaleToTextsTableMap = new HashMap<>(); // TODO: Remove this variable after debugging. // Texts table to locale maps. - private static final HashMap sTextsTableToLocaleMap = - CollectionUtils.newHashMap(); + private static final HashMap sTextsTableToLocaleMap = new HashMap<>(); public static String getText(final String name, final String[] textsTable) { final Integer indexObj = sNameToIndexesMap.get(name); diff --git a/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/JarUtils.java b/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/JarUtils.java index c947a63bf..abb33397b 100644 --- a/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/JarUtils.java +++ b/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/JarUtils.java @@ -61,7 +61,7 @@ public final class JarUtils { } public static ArrayList getEntryNameListing(final JarFile jar, final JarFilter filter) { - final ArrayList result = new ArrayList(); + final ArrayList result = new ArrayList<>(); final Enumeration entries = jar.entries(); while (entries.hasMoreElements()) { final JarEntry entry = entries.nextElement(); diff --git a/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/LocaleUtils.java b/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/LocaleUtils.java index 0dfa37667..c1a7ec5eb 100644 --- a/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/LocaleUtils.java +++ b/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/LocaleUtils.java @@ -35,7 +35,7 @@ public final class LocaleUtils { // Intentional empty constructor for utility class. } - private static final HashMap sLocaleCache = new HashMap(); + private static final HashMap sLocaleCache = new HashMap<>(); private static final int INDEX_LANGUAGE = 0; private static final int INDEX_SCRIPT = 1; diff --git a/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/MakeKeyboardText.java b/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/MakeKeyboardText.java index 36a03f8dc..6c15ce6bf 100644 --- a/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/MakeKeyboardText.java +++ b/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/MakeKeyboardText.java @@ -36,7 +36,7 @@ public class MakeKeyboardText { } public Options(final String[] argsArray) { - final LinkedList args = new LinkedList(Arrays.asList(argsArray)); + final LinkedList args = new LinkedList<>(Arrays.asList(argsArray)); String arg = null; String java = null; try { diff --git a/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/MoreKeysResources.java b/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/MoreKeysResources.java index c8cb4acec..563acc57e 100644 --- a/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/MoreKeysResources.java +++ b/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/MoreKeysResources.java @@ -43,12 +43,11 @@ public class MoreKeysResources { private final JarFile mJar; // String resources maps sorted by its language. The language is determined from the jar entry // name by calling {@link JarUtils#getLocaleFromEntryName(String)}. - private final TreeMap mResourcesMap = - new TreeMap(); + private final TreeMap mResourcesMap = new TreeMap<>(); // Default string resources map. private final StringResourceMap mDefaultResourceMap; // Histogram of string resource names. This is used to sort {@link #mSortedResourceNames}. - private final HashMap mNameHistogram = new HashMap(); + private final HashMap mNameHistogram = new HashMap<>(); // Sorted string resource names array; Descending order of histogram count. // The string resource name is specified as an attribute "name" in string resource files. // The string resource can be accessed by specifying name "!text/" @@ -68,7 +67,7 @@ public class MoreKeysResources { // Initialize name histogram and names list. final HashMap nameHistogram = mNameHistogram; - final ArrayList resourceNamesList = new ArrayList(); + final ArrayList resourceNamesList = new ArrayList<>(); for (final StringResource res : mDefaultResourceMap.getResources()) { nameHistogram.put(res.mName, 0); // Initialize histogram value. resourceNamesList.add(res.mName); diff --git a/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/StringResourceMap.java b/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/StringResourceMap.java index 6a79268e5..cf44f2cad 100644 --- a/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/StringResourceMap.java +++ b/tools/make-keyboard-text/src/com/android/inputmethod/keyboard/tools/StringResourceMap.java @@ -73,7 +73,7 @@ public class StringResourceMap { } mResources = Collections.unmodifiableList(handler.mResources); - final HashMap map = new HashMap(); + final HashMap map = new HashMap<>(); for (final StringResource res : mResources) { map.put(res.mName, res); } @@ -105,7 +105,7 @@ public class StringResourceMap { private static final String TAG_STRING = "string"; private static final String ATTR_NAME = "name"; - final ArrayList mResources = new ArrayList(); + final ArrayList mResources = new ArrayList<>(); private String mName; private final StringBuilder mValue = new StringBuilder(); -- cgit v1.2.3-83-g751a