From 2a18ab8b97ba0254a0655d595f05c492eb0eecd4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Reimar=20D=C3=B6ffinger?= Date: Wed, 15 Apr 2020 18:06:37 +0200 Subject: [PATCH] Minor code simplifications. --- Util | 2 +- .../android/dictionary/CollatorWrapper.java | 6 +++--- .../android/dictionary/DictionaryActivity.java | 8 ++++---- .../android/dictionary/DictionaryApplication.java | 15 +++++++-------- .../dictionary/DictionaryManagerActivity.java | 6 +++--- .../android/dictionary/HtmlDisplayActivity.java | 1 - .../android/dictionary/engine/Dictionary.java | 4 ---- .../android/dictionary/engine/HtmlEntry.java | 4 +--- .../hughes/android/dictionary/engine/Index.java | 9 +++++---- .../android/dictionary/engine/Language.java | 2 +- 10 files changed, 25 insertions(+), 32 deletions(-) diff --git a/Util b/Util index 585113b..321d89c 160000 --- 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 2aaf238..8f492f9 100644 --- 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 0228615..12839ca 100644 --- 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 c17c7ef..859f463 100644 --- 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 f9a084f..cd40483 100644 --- 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 f8899b4..5e98159 100644 --- 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 c8e6cb1..6539bc9 100644 --- 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 1b191a9..87a3172 100644 --- 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 { static final class DataDeserializer implements RAFListSerializer { @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 db44b41..364f5b8 100644 --- 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 { 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 { 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 { private final Map 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 { swapPairEntries); for (final Collection rows : matches.values()) { final List 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 d572d39..2dd88d3 100644 --- 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() { @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 -- 2.43.0