From b51d6d5fd02ee3678dcbd3fcf0678946cc5c86e0 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Reimar=20D=C3=B6ffinger?= <Reimar.Doeffinger@gmx.de>
Date: Fri, 21 Aug 2015 01:10:22 +0200
Subject: [PATCH] Apply result of "code cleanup" run.

---
 src/com/hughes/android/dictionary/C.java                  | 8 ++++----
 src/com/hughes/android/dictionary/DictionaryActivity.java | 4 ++--
 .../hughes/android/dictionary/DictionaryApplication.java  | 1 -
 src/com/hughes/android/dictionary/engine/EntrySource.java | 2 +-
 .../hughes/android/dictionary/engine/EntryTypeName.java   | 6 +++---
 src/com/hughes/android/dictionary/engine/HtmlEntry.java   | 2 +-
 src/com/hughes/android/dictionary/engine/Index.java       | 2 +-
 src/com/hughes/android/dictionary/engine/PairEntry.java   | 2 +-
 src/com/hughes/android/dictionary/engine/TextEntry.java   | 2 +-
 9 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/com/hughes/android/dictionary/C.java b/src/com/hughes/android/dictionary/C.java
index f60e6f2..76ce541 100644
--- a/src/com/hughes/android/dictionary/C.java
+++ b/src/com/hughes/android/dictionary/C.java
@@ -41,10 +41,10 @@ public class C {
                 R.drawable.theme_light_token_row_other_bg,
                 R.drawable.theme_light_normal_row_bg);
 
-        private Theme(final int themeId, final int tokenRowFg,
-                final int tokenRowFgColor,
-                final int tokenRowMainBg, final int tokenRowOtherBg,
-                final int normalRowBg) {
+        Theme(final int themeId, final int tokenRowFg,
+              final int tokenRowFgColor,
+              final int tokenRowMainBg, final int tokenRowOtherBg,
+              final int normalRowBg) {
             this.themeId = themeId;
             this.tokenRowFg = tokenRowFg;
             this.tokenRowFgColor = tokenRowFgColor;
diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index 62e3a0a..74d170a 100644
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -695,7 +695,7 @@ public class DictionaryActivity extends ActionBarActivity {
             protected void onGo() {
                 dialog.dismiss();
                 DictionaryActivity.this.finish();
-            };
+            }
         };
         button.setOnClickListener(intentLauncher);
         listView.addHeaderView(button);
@@ -719,7 +719,7 @@ public class DictionaryActivity extends ActionBarActivity {
                         protected void onGo() {
                             dialog.dismiss();
                             DictionaryActivity.this.finish();
-                        };
+                        }
                     };
                     button.setOnClickListener(intentLauncher);
                     result.addView(button);
diff --git a/src/com/hughes/android/dictionary/DictionaryApplication.java b/src/com/hughes/android/dictionary/DictionaryApplication.java
index ae2a7c2..b38e4bb 100644
--- a/src/com/hughes/android/dictionary/DictionaryApplication.java
+++ b/src/com/hughes/android/dictionary/DictionaryApplication.java
@@ -484,7 +484,6 @@ public class DictionaryApplication extends Application {
     public synchronized void deleteDictionary(final DictionaryInfo dictionaryInfo) {
         while (dictionaryConfig.dictionaryFilesOrdered.remove(dictionaryInfo.uncompressedFilename)) {
         }
-        ;
         dictionaryConfig.uncompressedFilenameToDictionaryInfo
                 .remove(dictionaryInfo.uncompressedFilename);
         getPath(dictionaryInfo.uncompressedFilename).delete();
diff --git a/src/com/hughes/android/dictionary/engine/EntrySource.java b/src/com/hughes/android/dictionary/engine/EntrySource.java
index 7f9fce6..9ed16a1 100644
--- a/src/com/hughes/android/dictionary/engine/EntrySource.java
+++ b/src/com/hughes/android/dictionary/engine/EntrySource.java
@@ -68,6 +68,6 @@ public class EntrySource extends IndexedObject implements Serializable {
             raf.writeUTF(t.name);
             raf.writeInt(t.numEntries);
         }
-    };
+    }
 
 }
diff --git a/src/com/hughes/android/dictionary/engine/EntryTypeName.java b/src/com/hughes/android/dictionary/engine/EntryTypeName.java
index d1136e4..de77e3c 100644
--- a/src/com/hughes/android/dictionary/engine/EntryTypeName.java
+++ b/src/com/hughes/android/dictionary/engine/EntryTypeName.java
@@ -70,12 +70,12 @@ public enum EntryTypeName {
     final boolean overridesStopList;
     final EntryTypeName singleWordInstance;
 
-    private EntryTypeName() {
+    EntryTypeName() {
         this(false, false, null);
     }
 
-    private EntryTypeName(final boolean mainWord, final boolean overridesStopList,
-            final EntryTypeName singleWordInstance) {
+    EntryTypeName(final boolean mainWord, final boolean overridesStopList,
+                  final EntryTypeName singleWordInstance) {
         this.mainWord = mainWord;
         this.overridesStopList = overridesStopList;
         this.singleWordInstance = singleWordInstance == null ? this : singleWordInstance;
diff --git a/src/com/hughes/android/dictionary/engine/HtmlEntry.java b/src/com/hughes/android/dictionary/engine/HtmlEntry.java
index 6e65a68..ca58207 100644
--- a/src/com/hughes/android/dictionary/engine/HtmlEntry.java
+++ b/src/com/hughes/android/dictionary/engine/HtmlEntry.java
@@ -81,7 +81,7 @@ public class HtmlEntry extends AbstractEntry implements RAFSerializable<HtmlEntr
         public void write(RandomAccessFile raf, HtmlEntry t) throws IOException {
             t.write(raf);
         }
-    };
+    }
 
     public String getRawText(final boolean compact) {
         return title + ":\n" + getHtml();
diff --git a/src/com/hughes/android/dictionary/engine/Index.java b/src/com/hughes/android/dictionary/engine/Index.java
index 24fb9bf..f4666cc 100644
--- a/src/com/hughes/android/dictionary/engine/Index.java
+++ b/src/com/hughes/android/dictionary/engine/Index.java
@@ -153,7 +153,7 @@ public final class Index implements RAFSerializable<Index> {
         }
         RAFList.write(raf, sortedIndexEntries, indexEntrySerializer);
         new SerializableSerializer<Set<String>>().write(raf, stoplist);
-        UniformRAFList.write(raf, (Collection<RowBase>) rows, new RowBase.Serializer(this), 5 /*
+        UniformRAFList.write(raf, rows, new RowBase.Serializer(this), 5 /*
                                                                                                * bytes
                                                                                                * per
                                                                                                * entry
diff --git a/src/com/hughes/android/dictionary/engine/PairEntry.java b/src/com/hughes/android/dictionary/engine/PairEntry.java
index be61289..6e95d32 100644
--- a/src/com/hughes/android/dictionary/engine/PairEntry.java
+++ b/src/com/hughes/android/dictionary/engine/PairEntry.java
@@ -79,7 +79,7 @@ public class PairEntry extends AbstractEntry implements RAFSerializable<PairEntr
         public void write(RandomAccessFile raf, PairEntry t) throws IOException {
             t.write(raf);
         }
-    };
+    }
 
     @Override
     public void addToDictionary(final Dictionary dictionary) {
diff --git a/src/com/hughes/android/dictionary/engine/TextEntry.java b/src/com/hughes/android/dictionary/engine/TextEntry.java
index 2837626..fdd66b5 100644
--- a/src/com/hughes/android/dictionary/engine/TextEntry.java
+++ b/src/com/hughes/android/dictionary/engine/TextEntry.java
@@ -58,7 +58,7 @@ public class TextEntry extends AbstractEntry implements RAFSerializable<TextEntr
         public void write(RandomAccessFile raf, TextEntry t) throws IOException {
             t.write(raf);
         }
-    };
+    }
 
     @Override
     public void addToDictionary(final Dictionary dictionary) {
-- 
2.43.0