Minor code simplifications.

diff --git a/Util b/Util
index 585113b2b62a7cfb8daac6936f55082fbb1bca12..321d89c38e54fcdfeffbfaba0161668610cb5f6c 160000 (submodule)
--- a/Util
+++ b/Util
@@ -1 +1 @@
-Subproject commit 585113b2b62a7cfb8daac6936f55082fbb1bca12
+Subproject commit 321d89c38e54fcdfeffbfaba0161668610cb5f6c

diff --git a/src/com/hughes/android/dictionary/CollatorWrapper.java b/src/com/hughes/android/dictionary/CollatorWrapper.java
index 2aaf238417670ce8df309c79f3a06c2cd07f259b..8f492f9d7d85f550a48ed1cee5e5125e89650098 100644 (file)
--- a/src/com/hughes/android/dictionary/CollatorWrapper.java
+++ b/src/com/hughes/android/dictionary/CollatorWrapper.java
@@ -18,11 +18,11 @@ import java.util.Locale;
 
 import java.text.Collator;
 
-final public class CollatorWrapper {
-static public Collator getInstance() {
+public final class CollatorWrapper {
+public static Collator getInstance() {
     return Collator.getInstance();
 }
-static public Collator getInstanceStrengthIdentical(Locale l) {
+public static Collator getInstanceStrengthIdentical(Locale l) {
     Collator c = Collator.getInstance(l);
     c.setStrength(Collator.IDENTICAL);
     return c;

diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index 02286155532c187bf366a1cf86ffcdec1e034db6..12839caeddcf3d6c351e0a2a137fe4508c38fc1a 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -285,7 +285,7 @@ public class DictionaryActivity extends AppCompatActivity {
          *         -> language in which the phrase is written to -> to which
          *         language shall be translated
          */
-        if (intentAction != null && intentAction.equals("com.hughes.action.ACTION_SEARCH_DICT")) {
+        if ("com.hughes.action.ACTION_SEARCH_DICT".equals(intentAction)) {
             String query = intent.getStringExtra(SearchManager.QUERY);
             String from = intent.getStringExtra("from");
             if (from != null)
@@ -1243,7 +1243,7 @@ public class DictionaryActivity extends AppCompatActivity {
         try {
             wordList.getParentFile().mkdirs();
             final PrintWriter out = new PrintWriter(new FileWriter(wordList, true));
-            out.println(rawText.toString());
+            out.println(rawText);
             out.close();
         } catch (Exception e) {
             Log.e(LOG, "Unable to append to " + wordList.getAbsolutePath(), e);
@@ -1373,7 +1373,7 @@ public class DictionaryActivity extends AppCompatActivity {
         }, 20);
     }
 
-    private final void jumpToRow(final int row) {
+    private void jumpToRow(final int row) {
         Log.d(LOG, "jumpToRow: " + row + ", refocusSearchText=" + false);
         // getListView().requestFocusFromTouch();
         getListView().setSelectionFromTop(row, 0);
@@ -1406,7 +1406,7 @@ public class DictionaryActivity extends AppCompatActivity {
         }
 
         public String toString() {
-            return String.format("SearchOperation(%s,%s)", searchText, interrupted.toString());
+            return String.format("SearchOperation(%s,%s)", searchText, interrupted);
         }
 
         @Override

diff --git a/src/com/hughes/android/dictionary/DictionaryApplication.java b/src/com/hughes/android/dictionary/DictionaryApplication.java
index c17c7ef82975e407f707d4da0cf8e67963edb2da..859f463a1413071b8b14a9f05eed4cebba58458a 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryApplication.java
+++ b/src/com/hughes/android/dictionary/DictionaryApplication.java
@@ -29,7 +29,6 @@ import android.view.Menu;
 import android.view.MenuItem;
 import android.view.MenuItem.OnMenuItemClickListener;
 
-import com.hughes.android.dictionary.CollatorWrapper;
 import com.hughes.android.dictionary.DictionaryInfo.IndexInfo;
 import com.hughes.android.dictionary.engine.Dictionary;
 import com.hughes.android.dictionary.engine.TransliteratorManager;
@@ -64,9 +63,9 @@ public enum DictionaryApplication {
     // Leave it enabled by default for correctness except
     // for my known broken development/performance test device config.
     //static public final boolean USE_COLLATOR = !android.os.Build.FINGERPRINT.equals("Samsung/cm_tassve/tassve:4.4.4/KTU84Q/20150211:userdebug/release-keys");
-    static public final boolean USE_COLLATOR = true;
+    public static final boolean USE_COLLATOR = true;
 
-    static public final TransliteratorManager.ThreadSetup threadBackground = new TransliteratorManager.ThreadSetup() {
+    public static final TransliteratorManager.ThreadSetup threadBackground = new TransliteratorManager.ThreadSetup() {
         @Override
         public void onThreadStart() {
             // THREAD_PRIORITY_BACKGROUND seemed like a good idea, but it
@@ -289,7 +288,7 @@ public enum DictionaryApplication {
         return dictDir;
     }
 
-    static public boolean checkFileCreate(File dir) {
+    public static boolean checkFileCreate(File dir) {
         boolean res = false;
         File testfile = new File(dir, "quickdic_writetest");
         try {
@@ -382,7 +381,7 @@ public enum DictionaryApplication {
     }
 
     public synchronized void sortDictionaries() {
-        Collections.sort(dictionaryConfig.dictionaryFilesOrdered, uncompressedFilenameComparator);
+        dictionaryConfig.dictionaryFilesOrdered.sort(uncompressedFilenameComparator);
         PersistentObjectCache.getInstance().write(C.DICTIONARY_CONFIGS, dictionaryConfig);
     }
 
@@ -406,7 +405,7 @@ public enum DictionaryApplication {
                         && !name2.startsWith(defaultLangName + "-")) {
                     return -1;
                 } else if (name2.startsWith(defaultLangName + "-")
-                           && !name1.startsWith(defaultLangName + "-")) {
+                        && !name1.startsWith(defaultLangName + "-")) {
                     return 1;
                 }
             }
@@ -479,7 +478,7 @@ public enum DictionaryApplication {
                     Log.w(LOG, "dictDir is not a directory: " + getDictDir().getPath());
                 }
                 if (!toAddSorted.isEmpty()) {
-                    Collections.sort(toAddSorted, uncompressedFilenameComparator);
+                    toAddSorted.sort(uncompressedFilenameComparator);
                     newDictionaryConfig.dictionaryFilesOrdered.addAll(toAddSorted);
                 }
 
@@ -541,7 +540,7 @@ public enum DictionaryApplication {
                 result.add(dictionaryInfo);
             }
         }
-        Collections.sort(result, dictionaryInfoComparator);
+        result.sort(dictionaryInfoComparator);
         return result;
     }
 

diff --git a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
index f9a084f706f69deec2c7d956f4dcd16dde0e8e27..cd40483ff7b8009919b03116b7fb33f65bcbee97 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
@@ -144,7 +144,7 @@ public class DictionaryManagerActivity extends AppCompatActivity {
             final String action = intent.getAction();
 
             if (DownloadManager.ACTION_NOTIFICATION_CLICKED.equals(action)) {
-                startActivity(DictionaryManagerActivity.getLaunchIntent(getApplicationContext()).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP));
+                startActivity(getLaunchIntent(getApplicationContext()).addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP));
             }
             if (DownloadManager.ACTION_DOWNLOAD_COMPLETE.equals(action)) {
                 final long downloadId = intent.getLongExtra(
@@ -688,7 +688,7 @@ public class DictionaryManagerActivity extends AppCompatActivity {
         if (cursor == null) {
             if (cancel) {
                 String msg = getString(R.string.downloadManagerQueryFailed);
-                new AlertDialog.Builder(DictionaryManagerActivity.this).setTitle(getString(R.string.error))
+                new AlertDialog.Builder(this).setTitle(getString(R.string.error))
                 .setMessage(getString(R.string.downloadFailed, msg))
                 .setNeutralButton("Close", null).show();
             }
@@ -851,7 +851,7 @@ public class DictionaryManagerActivity extends AppCompatActivity {
 
         if (downloadManager == null) {
             String msg = getString(R.string.downloadManagerQueryFailed);
-            new AlertDialog.Builder(DictionaryManagerActivity.this).setTitle(getString(R.string.error))
+            new AlertDialog.Builder(this).setTitle(getString(R.string.error))
                     .setMessage(getString(R.string.downloadFailed, msg))
                     .setNeutralButton("Close", null).show();
             return;

diff --git a/src/com/hughes/android/dictionary/HtmlDisplayActivity.java b/src/com/hughes/android/dictionary/HtmlDisplayActivity.java
index f8899b4cbdaadf0398e5bfaf237a2408e864eb45..5e9815902aef187cedd70d4fc288da95686c2974 100644 (file)
--- a/src/com/hughes/android/dictionary/HtmlDisplayActivity.java
+++ b/src/com/hughes/android/dictionary/HtmlDisplayActivity.java
@@ -31,7 +31,6 @@ import com.hughes.util.StringUtil;
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;
 
 public final class HtmlDisplayActivity extends AppCompatActivity {

diff --git a/src/com/hughes/android/dictionary/engine/Dictionary.java b/src/com/hughes/android/dictionary/engine/Dictionary.java
index c8e6cb197d6e51c5fe5a06e0d209762c1697ccd9..6539bc9b0f0a52afce3eae135fa681bf527ddc53 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/Dictionary.java
+++ b/src/com/hughes/android/dictionary/engine/Dictionary.java
@@ -15,17 +15,13 @@
 package com.hughes.android.dictionary.engine;
 
 import java.io.DataInput;
-import java.io.DataInputStream;
 import java.io.DataOutput;
 import java.io.File;
 import java.io.IOException;
-import java.io.ObjectOutputStream;
 import java.io.PrintStream;
 import java.io.RandomAccessFile;
 import java.nio.MappedByteBuffer;
-import java.nio.channels.Channels;
 import java.nio.channels.FileChannel;
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;

diff --git a/src/com/hughes/android/dictionary/engine/HtmlEntry.java b/src/com/hughes/android/dictionary/engine/HtmlEntry.java
index 1b191a93ac4b80000672876b4f453cfe5c1c097e..87a3172d0ddfae929136001f6dff673474a18842 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/HtmlEntry.java
+++ b/src/com/hughes/android/dictionary/engine/HtmlEntry.java
@@ -6,8 +6,6 @@ import java.io.DataOutput;
 import java.io.IOException;
 import java.io.PrintStream;
 import java.lang.ref.SoftReference;
-import java.nio.ByteBuffer;
-import java.nio.channels.FileChannel;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.regex.Pattern;
@@ -121,7 +119,7 @@ public class HtmlEntry extends AbstractEntry implements Comparable<HtmlEntry> {
     static final class DataDeserializer implements RAFListSerializer<DataInputBuffer> {
         @Override
         public DataInputBuffer read(DataInput raf, final int index) throws IOException {
-            return HtmlEntry.readData(raf);
+            return readData(raf);
         }
 
         @Override

diff --git a/src/com/hughes/android/dictionary/engine/Index.java b/src/com/hughes/android/dictionary/engine/Index.java
index db44b41546569ee39e178511fdbf5f5bf92b4bea..364f5b857accdbf8f6ea2224ef99413627137937 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/Index.java
+++ b/src/com/hughes/android/dictionary/engine/Index.java
@@ -225,6 +225,7 @@ public final class Index implements RAFSerializable<Index> {
                         public HtmlEntry get(int i) {
                             return index.dict.htmlEntries.get(htmlEntryIndices[i]);
                         }
+
                         @Override
                         public int size() {
                             return htmlEntryIndices.length;
@@ -367,7 +368,7 @@ public final class Index implements RAFSerializable<Index> {
         return result;
     }
 
-    private final int windBackCase(final String token, int result, final AtomicBoolean interrupted) {
+    private int windBackCase(final String token, int result, final AtomicBoolean interrupted) {
         while (result > 0 && sortedIndexEntries.get(result - 1).normalizedToken().equals(token)) {
             --result;
             if (interrupted.get()) {
@@ -385,8 +386,8 @@ public final class Index implements RAFSerializable<Index> {
 
     private final Map<String, Integer> prefixToNumRows = new HashMap<>();
 
-    private synchronized final int getUpperBoundOnRowsStartingWith(final String normalizedPrefix,
-            final int maxRows, final AtomicBoolean interrupted) {
+    private synchronized int getUpperBoundOnRowsStartingWith(final String normalizedPrefix,
+                                                             final int maxRows, final AtomicBoolean interrupted) {
         final Integer numRows = prefixToNumRows.get(normalizedPrefix);
         if (numRows != null) {
             return numRows;
@@ -525,7 +526,7 @@ public final class Index implements RAFSerializable<Index> {
             swapPairEntries);
         for (final Collection<RowBase> rows : matches.values()) {
             final List<RowBase> ordered = new ArrayList<>(rows);
-            Collections.sort(ordered, lengthComparator);
+            ordered.sort(lengthComparator);
             result.addAll(ordered);
         }
 

diff --git a/src/com/hughes/android/dictionary/engine/Language.java b/src/com/hughes/android/dictionary/engine/Language.java
index d572d39e05b930f2fd33309ff35c1120d9247e44..2dd88d34845102ee8f222e336141dd8d1b909ab0 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/Language.java
+++ b/src/com/hughes/android/dictionary/engine/Language.java
@@ -66,7 +66,7 @@ public class Language {
             return new Comparator<Object>() {
                 @Override
                 public int compare(Object o, Object t1) {
-                    return ((String)o).compareToIgnoreCase((String)t1);
+                    return ((String) o).compareToIgnoreCase((String) t1);
                 }
             };
         // TODO: consider if this should be cached - but must be thread-safe