Run automated code cleanup.

diff --git a/Util b/Util
index 1923f0d7df985ebcf5a7bc01d8a2f9ceabd21550..ad3bdc6d114c4714e14985d7526036e50cbadbc6 160000 (submodule)
--- a/Util
+++ b/Util
@@ -1 +1 @@
-Subproject commit 1923f0d7df985ebcf5a7bc01d8a2f9ceabd21550
+Subproject commit ad3bdc6d114c4714e14985d7526036e50cbadbc6

diff --git a/src/com/hughes/android/dictionary/AboutActivity.java b/src/com/hughes/android/dictionary/AboutActivity.java
index d6a5c1d06300c1fe13ea6d726ca3082da0c3968c..60234d7e71f4b94b1a52312ad9f931e2004e06fd 100644 (file)
--- a/src/com/hughes/android/dictionary/AboutActivity.java
+++ b/src/com/hughes/android/dictionary/AboutActivity.java
@@ -41,7 +41,7 @@ public final class AboutActivity extends Activity {
             }
         } catch (Exception e) {
         }
-        TextView titleView = (TextView)findViewById(R.id.titleText);
+        TextView titleView = findViewById(R.id.titleText);
         titleView.setText("QuickDic " + ver);
     }
 

diff --git a/src/com/hughes/android/dictionary/DictionaryActivity.java b/src/com/hughes/android/dictionary/DictionaryActivity.java
index 8ab56277b2b6832ae274353f73d1adc8982498d2..76915dfa9c48f90affb7eb896877e74d28166834 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryActivity.java
@@ -820,7 +820,7 @@ public class DictionaryActivity extends ActionBarActivity {
 
         final List<DictionaryInfo> installedDicts = application.getDictionariesOnDevice(null);
 
-        ListView listView = (ListView) dialog.findViewById(android.R.id.list);
+        ListView listView = dialog.findViewById(android.R.id.list);
         final Button button = new Button(listView.getContext());
         final String name = getString(R.string.dictionaryManager);
         button.setText(name);
@@ -995,7 +995,7 @@ public class DictionaryActivity extends ActionBarActivity {
                     final Context context = getListView().getContext();
                     final Dialog dialog = new Dialog(context);
                     dialog.setContentView(R.layout.about_dictionary_dialog);
-                    final TextView textView = (TextView) dialog.findViewById(R.id.text);
+                    final TextView textView = dialog.findViewById(R.id.text);
 
                     dialog.setTitle(dictFileTitleName);
 
@@ -1045,7 +1045,7 @@ public class DictionaryActivity extends ActionBarActivity {
             });
         }
 
-        application.onCreateGlobalOptionsMenu(this, menu);
+        DictionaryApplication.onCreateGlobalOptionsMenu(this, menu);
 
         return true;
     }
@@ -1062,7 +1062,7 @@ public class DictionaryActivity extends ActionBarActivity {
         if (clickOpensContextMenu && (row instanceof HtmlEntry.Row ||
             (row instanceof TokenRow && ((TokenRow)row).getIndexEntry().htmlEntries.size() > 0))) {
             final List<HtmlEntry> html = row instanceof TokenRow ? ((TokenRow)row).getIndexEntry().htmlEntries : Collections.singletonList(((HtmlEntry.Row)row).getEntry());
-            final String highlight = row instanceof HtmlEntry.Row ? ((HtmlEntry.Row)row).getTokenRow(true).getToken() : null;
+            final String highlight = row instanceof HtmlEntry.Row ? row.getTokenRow(true).getToken() : null;
             final MenuItem open = menu.add("Open");
             open.setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
                 public boolean onMenuItemClick(MenuItem item) {
@@ -1831,7 +1831,7 @@ public class DictionaryActivity extends ActionBarActivity {
             final Dialog dialog = new Dialog(getListView().getContext());
             dialog.setContentView(R.layout.thadolina_dialog);
             dialog.setTitle("Ti amo, amore mio!");
-            final ImageView imageView = (ImageView) dialog.findViewById(R.id.thadolina_image);
+            final ImageView imageView = dialog.findViewById(R.id.thadolina_image);
             imageView.setOnClickListener(new OnClickListener() {
                 @Override
                 public void onClick(View v) {

diff --git a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
index 69e5645333c87315bafe38e086353141310740c7..3ca7a6d9a8b1c6a5826fcb92fbb3c7f636a5049a 100644 (file)
--- a/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
+++ b/src/com/hughes/android/dictionary/DictionaryManagerActivity.java
@@ -241,7 +241,7 @@ public class DictionaryManagerActivity extends ActionBarActivity {
         } catch (Exception e) {
             String msg = getString(R.string.unzippingFailed, dest + ": " + e.getMessage());
             File dir = application.getDictDir();
-            if (!dir.canWrite() || !application.checkFileCreate(dir)) {
+            if (!dir.canWrite() || !DictionaryApplication.checkFileCreate(dir)) {
                 msg = getString(R.string.notWritable, dir.getAbsolutePath());
             }
             new AlertDialog.Builder(context).setTitle(getString(R.string.error)).setMessage(msg).setNeutralButton("Close", null).show();
@@ -326,7 +326,7 @@ public class DictionaryManagerActivity extends ActionBarActivity {
                                                 getListView().getContext()).inflate(
                                                 R.layout.dictionary_manager_header_row_downloadable, getListView(), false);
 
-        showDownloadable = (ToggleButton) downloadableDictionariesHeaderRow
+        showDownloadable = downloadableDictionariesHeaderRow
                            .findViewById(R.id.hideDownloadable);
         showDownloadable.setOnCheckedChangeListener(new OnCheckedChangeListener() {
             @Override
@@ -513,7 +513,7 @@ public class DictionaryManagerActivity extends ActionBarActivity {
             }
         });
 
-        application.onCreateGlobalOptionsMenu(this, menu);
+        DictionaryApplication.onCreateGlobalOptionsMenu(this, menu);
         return true;
     }
 
@@ -669,12 +669,12 @@ public class DictionaryManagerActivity extends ActionBarActivity {
             row = LayoutInflater.from(parent.getContext()).inflate(
                        R.layout.dictionary_manager_row, parent, false);
         }
-        final TextView name = (TextView) row.findViewById(R.id.dictionaryName);
-        final TextView details = (TextView) row.findViewById(R.id.dictionaryDetails);
+        final TextView name = row.findViewById(R.id.dictionaryName);
+        final TextView details = row.findViewById(R.id.dictionaryDetails);
         name.setText(application.getDictionaryName(dictionaryInfo.uncompressedFilename));
 
         final boolean updateAvailable = application.updateAvailable(dictionaryInfo);
-        final Button downloadButton = (Button) row.findViewById(R.id.downloadButton);
+        final Button downloadButton = row.findViewById(R.id.downloadButton);
         final DictionaryInfo downloadable = application.getDownloadable(dictionaryInfo.uncompressedFilename);
         boolean broken = false;
         if (!dictionaryInfo.isValid()) {
@@ -698,7 +698,7 @@ public class DictionaryManagerActivity extends ActionBarActivity {
             downloadButton.setVisibility(View.GONE);
         }
 
-        LinearLayout buttons = (LinearLayout) row.findViewById(R.id.dictionaryLauncherButtons);
+        LinearLayout buttons = row.findViewById(R.id.dictionaryLauncherButtons);
 
         final List<IndexInfo> sortedIndexInfos = application
                 .sortedIndexInfos(dictionaryInfo.indexInfos);

diff --git a/src/com/hughes/android/dictionary/IsoUtils.java b/src/com/hughes/android/dictionary/IsoUtils.java
index 9b381fbb456384ec28aacc3d891487ead984cd88..ad8808e09407770fa23be7f85bc72791e05aad50 100644 (file)
--- a/src/com/hughes/android/dictionary/IsoUtils.java
+++ b/src/com/hughes/android/dictionary/IsoUtils.java
@@ -36,7 +36,7 @@ public enum IsoUtils {
     // Useful:
     // http://www.loc.gov/standards/iso639-2/php/code_list.php
     private final Map<String, LanguageResources> isoCodeToResources = new HashMap<String, LanguageResources>();
-    private IsoUtils() {
+    IsoUtils() {
         isoCodeToResources.put("AF", new LanguageResources("Afrikaans", R.string.AF,
                                R.drawable.flag_of_south_africa));
         isoCodeToResources.put("SQ", new LanguageResources("Albanian", R.string.SQ,

diff --git a/src/com/hughes/android/dictionary/PreferenceActivity.java b/src/com/hughes/android/dictionary/PreferenceActivity.java
index 966f21c7ad7ffe5548f50b343e470ff1b566059d..add2141e05da764b5b7502ed60403f49f2310796 100644 (file)
--- a/src/com/hughes/android/dictionary/PreferenceActivity.java
+++ b/src/com/hughes/android/dictionary/PreferenceActivity.java
@@ -93,7 +93,7 @@ public class PreferenceActivity extends android.preference.PreferenceActivity
         final DictionaryApplication application = DictionaryApplication.INSTANCE;
         File dictDir = application.getDictDir();
         if (!dictDir.isDirectory() || !dictDir.canWrite() ||
-                !application.checkFileCreate(dictDir)) {
+                !DictionaryApplication.checkFileCreate(dictDir)) {
             String dirs = "";
             String externalDir = Environment.getExternalStorageDirectory().getAbsolutePath();
             if (new File(externalDir).canWrite())

diff --git a/src/com/hughes/android/dictionary/engine/Dictionary.java b/src/com/hughes/android/dictionary/engine/Dictionary.java
index dfac548fd27d038900c0c1391f12a81416951068..0eb8007f07f9307fe0f44306e980d3f4f546d57b 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/Dictionary.java
+++ b/src/com/hughes/android/dictionary/engine/Dictionary.java
@@ -107,8 +107,7 @@ public class Dictionary implements RAFSerializable<Dictionary> {
             indices = CachingList.createFullyCached(RAFList.create(ch, new IndexSerializer(ch),
                                                     ch.position(), dictFileVersion, dictInfo + " index: "));
         } catch (RuntimeException e) {
-            final IOException ioe = new IOException("RuntimeException loading dictionary");
-            ioe.initCause(e);
+            final IOException ioe = new IOException("RuntimeException loading dictionary", e);
             throw ioe;
         }
         final String end = raf.readUTF();
@@ -156,11 +155,11 @@ public class Dictionary implements RAFSerializable<Dictionary> {
         public void write(DataOutput raf, Index t) throws IOException {
             t.write(raf);
         }
-    };
+    }
 
     final RAFListSerializer<HtmlEntry> htmlEntryIndexSerializer = new RAFListSerializer<HtmlEntry>() {
         @Override
-        public void write(DataOutput raf, HtmlEntry t) throws IOException {
+        public void write(DataOutput raf, HtmlEntry t) {
             assert false;
         }
 

diff --git a/src/com/hughes/android/dictionary/engine/HtmlEntry.java b/src/com/hughes/android/dictionary/engine/HtmlEntry.java
index c12091b09e6838cf7abb8128d1f7a54ea430b046..937c88295e585f98dc850679b0718a4753f33683 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/HtmlEntry.java
+++ b/src/com/hughes/android/dictionary/engine/HtmlEntry.java
@@ -109,7 +109,7 @@ public class HtmlEntry extends AbstractEntry implements Comparable<HtmlEntry> {
 
     static final class DataSerializer implements RAFListSerializer<HtmlEntry> {
         @Override
-        public HtmlEntry read(DataInput raf, final int index) throws IOException {
+        public HtmlEntry read(DataInput raf, final int index) {
             assert false;
             return null;
         }
@@ -127,7 +127,7 @@ public class HtmlEntry extends AbstractEntry implements Comparable<HtmlEntry> {
         }
 
         @Override
-        public void write(DataOutput raf, byte[] t) throws IOException {
+        public void write(DataOutput raf, byte[] t) {
             assert false;
         }
     }

diff --git a/src/com/hughes/android/dictionary/engine/Index.java b/src/com/hughes/android/dictionary/engine/Index.java
index 285024afdb0d0e00b5a2aa38aa87af27b3b2da4b..ea0de2528d2aa76fe5d951e649b47ecb4db71916 100644 (file)
--- a/src/com/hughes/android/dictionary/engine/Index.java
+++ b/src/com/hughes/android/dictionary/engine/Index.java
@@ -194,7 +194,7 @@ public final class Index implements RAFSerializable<Index> {
         public void write(DataOutput raf, IndexEntry t) throws IOException {
             t.write(raf);
         }
-    };
+    }
 
     public static final class IndexEntry implements RAFSerializable<Index.IndexEntry> {
         public final String token;