Clean up order of imports.

[Dictionary.git] / src / com / hughes / android / dictionary / engine / TransliteratorManager.java

diff --git a/src/com/hughes/android/dictionary/engine/TransliteratorManager.java b/src/com/hughes/android/dictionary/engine/TransliteratorManager.java
index 9613d9fccc8ba7a84328f11abfabb681fd48a200..4dfb2b67d9ccf85a114eb847b7e5b5171c16c48e 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/TransliteratorManager.java
+++ b/src/com/hughes/android/dictionary/engine/TransliteratorManager.java
@@ -14,29 +14,28 @@
 
 package com.hughes.android.dictionary.engine;
 
-import com.ibm.icu.text.Transliterator;
-
 import java.util.ArrayList;
 import java.util.List;
 
 import com.hughes.util.LRUCacheMap;
+import com.ibm.icu.text.Transliterator;
 
 public class TransliteratorManager {
 
     private static boolean starting = false;
     private static boolean ready = false;
     private static ThreadSetup threadSetup = null;
-    private static LRUCacheMap<String, Transliterator> cache = new LRUCacheMap<String, Transliterator>(4);
+    private static final LRUCacheMap<String, Transliterator> cache = new LRUCacheMap<>(4);
 
     // Whom to notify when we're all set up and ready to go.
-    private static List<Callback> callbacks = new ArrayList<TransliteratorManager.Callback>();
+    private static final List<Callback> callbacks = new ArrayList<>();
 
     public static Transliterator get(String rules) {
         // DO NOT make the method synchronized!
         // synchronizing on the class would break the whole
         // asynchronous init concept, since the runnable
         // then holds the same lock as the init function needs.
-        Transliterator result = null;
+        Transliterator result;
         synchronized (cache) {
             result = cache.get(rules);
             if (result == null) {
@@ -74,9 +73,9 @@ public class TransliteratorManager {
                 System.out.println("Wrong transliteration: " + transliterated);
             }
 
-            final List<Callback> callbacks = new ArrayList<TransliteratorManager.Callback>();
+            final List<Callback> callbacks;
             synchronized (TransliteratorManager.class) {
-                callbacks.addAll(TransliteratorManager.callbacks);
+                callbacks = new ArrayList<>(TransliteratorManager.callbacks);
                 ready = true;
             }
             for (final Callback callback : callbacks) {