Apply result of "code cleanup" run.

diff --git a/src/com/hughes/android/dictionary/C.java b/src/com/hughes/android/dictionary/C.java
index f60e6f2c232073a5450e2c154dac6de786c1aeb0..76ce541a4f9df80622f8ffd7bfc209758bf9f53d 100644 (file)
--- 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 62e3a0a589a6af97b4a1b91d995142ea90637e07..74d170a810228ca0028f524467c4b2fdfdaf21bc 100644 (file)
--- 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 ae2a7c272db67ececee0a9e1e3c0c36170380fe6..b38e4bbe2117034fde3798a30887a40134451fd0 100644 (file)
--- 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 7f9fce641baed948f27b6d95f58f475c20ab4501..9ed16a19960d00ce50569c59009f3efcacd434da 100644 (file)
--- 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 d1136e494088d8e26bffbcbbaad54c2d5e0ec4d7..de77e3c013d0692ac1edf88b890e5be5d193e2f2 100644 (file)
--- 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 6e65a684e0045462fc94bbba2fd16f31eaa56ef2..ca582073fe3eafe8330ab6f46018d1ca4d20a0a9 100644 (file)
--- 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 24fb9bf13389f8b3ff634a3378926a170a80cf9e..f4666ccf11bcd9a6a5da590206f5755e5dbe0907 100644 (file)
--- 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 be61289b6d145b7866a305dab1c75630604c2b8b..6e95d32a203cadf2e5cf5e5585da988a436d8bde 100644 (file)
--- 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 28376267bbb0f301343a223b450afc2dc6bcb7ca..fdd66b54b41937ca699b27f24cab64b372206acf 100644 (file)
--- 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) {