X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2FDictionaryApplication.java;h=c17c7ef82975e407f707d4da0cf8e67963edb2da;hb=3ce0dd16e69302365d3bc802f298a5388b293d86;hp=27dfef87063098febe1157538a27dce404855c5b;hpb=8d5fbfea8d63f8714ad8c5533e0bcb70ece18f1a;p=Dictionary.git diff --git a/src/com/hughes/android/dictionary/DictionaryApplication.java b/src/com/hughes/android/dictionary/DictionaryApplication.java index 27dfef8..c17c7ef 100644 --- a/src/com/hughes/android/dictionary/DictionaryApplication.java +++ b/src/com/hughes/android/dictionary/DictionaryApplication.java @@ -14,7 +14,6 @@ package com.hughes.android.dictionary; -import android.app.Application; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; @@ -29,21 +28,13 @@ import android.util.TypedValue; import android.view.Menu; import android.view.MenuItem; import android.view.MenuItem.OnMenuItemClickListener; -import android.view.View; -import android.widget.Button; -import android.widget.ImageButton; -import android.widget.ImageView.ScaleType; -import android.widget.LinearLayout; -import android.widget.Toast; +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.Language; -import com.hughes.android.dictionary.engine.Language.LanguageResources; import com.hughes.android.dictionary.engine.TransliteratorManager; import com.hughes.android.util.PersistentObjectCache; import com.hughes.util.ListUtil; -import java.text.Collator; import java.io.BufferedReader; import java.io.File; @@ -127,14 +118,14 @@ public enum DictionaryApplication { private static final long serialVersionUID = -1444177164708201263L; // User-ordered list, persisted, just the ones that are/have been // present. - final List dictionaryFilesOrdered = new ArrayList(); + final List dictionaryFilesOrdered = new ArrayList<>(); - final Map uncompressedFilenameToDictionaryInfo = new HashMap(); + final Map uncompressedFilenameToDictionaryInfo = new HashMap<>(); /** * Sometimes a deserialized version of this data structure isn't valid. - * @return */ + @SuppressWarnings("ConstantConditions") boolean isValid() { return uncompressedFilenameToDictionaryInfo != null && dictionaryFilesOrdered != null; } @@ -148,7 +139,7 @@ public enum DictionaryApplication { if (DOWNLOADABLE_UNCOMPRESSED_FILENAME_NAME_TO_DICTIONARY_INFO != null) { return; } - DOWNLOADABLE_UNCOMPRESSED_FILENAME_NAME_TO_DICTIONARY_INFO = new HashMap(); + DOWNLOADABLE_UNCOMPRESSED_FILENAME_NAME_TO_DICTIONARY_INFO = new HashMap<>(); final BufferedReader reader = new BufferedReader( new InputStreamReader(context.getResources().openRawResource(R.raw.dictionary_info))); try { @@ -166,11 +157,9 @@ public enum DictionaryApplication { } try { reader.close(); - } catch (IOException e) {} + } catch (IOException ignored) {} } - private File dictDir; - public synchronized void init(Context c) { if (appContext != null) { assert c == appContext; @@ -212,11 +201,13 @@ public enum DictionaryApplication { public static void onCreateGlobalOptionsMenu( final Context context, final Menu menu) { final Context c = context.getApplicationContext(); - final MenuItem about = menu.add(c.getString(R.string.about)); - MenuItemCompat.setShowAsAction(about, MenuItem.SHOW_AS_ACTION_NEVER); - about.setOnMenuItemClickListener(new OnMenuItemClickListener() { + + final MenuItem preferences = menu.add(c.getString(R.string.settings)); + MenuItemCompat.setShowAsAction(preferences, MenuItem.SHOW_AS_ACTION_NEVER); + preferences.setOnMenuItemClickListener(new OnMenuItemClickListener() { public boolean onMenuItemClick(final MenuItem menuItem) { - final Intent intent = new Intent(c, AboutActivity.class); + PreferenceActivity.prefsMightHaveChanged = true; + final Intent intent = new Intent(c, PreferenceActivity.class); context.startActivity(intent); return false; } @@ -231,24 +222,23 @@ public enum DictionaryApplication { } }); - final MenuItem preferences = menu.add(c.getString(R.string.settings)); - MenuItemCompat.setShowAsAction(preferences, MenuItem.SHOW_AS_ACTION_NEVER); - preferences.setOnMenuItemClickListener(new OnMenuItemClickListener() { + final MenuItem reportIssue = menu.add(c.getString(R.string.reportIssue)); + MenuItemCompat.setShowAsAction(reportIssue, MenuItem.SHOW_AS_ACTION_NEVER); + reportIssue.setOnMenuItemClickListener(new OnMenuItemClickListener() { public boolean onMenuItemClick(final MenuItem menuItem) { - PreferenceActivity.prefsMightHaveChanged = true; - final Intent intent = new Intent(c, PreferenceActivity.class); + final Intent intent = new Intent(Intent.ACTION_VIEW); + intent.setData(Uri + .parse("https://github.com/rdoeffinger/Dictionary/issues")); context.startActivity(intent); return false; } }); - final MenuItem reportIssue = menu.add(c.getString(R.string.reportIssue)); - MenuItemCompat.setShowAsAction(reportIssue, MenuItem.SHOW_AS_ACTION_NEVER); - reportIssue.setOnMenuItemClickListener(new OnMenuItemClickListener() { + final MenuItem about = menu.add(c.getString(R.string.about)); + MenuItemCompat.setShowAsAction(about, MenuItem.SHOW_AS_ACTION_NEVER); + about.setOnMenuItemClickListener(new OnMenuItemClickListener() { public boolean onMenuItemClick(final MenuItem menuItem) { - final Intent intent = new Intent(Intent.ACTION_VIEW); - intent.setData(Uri - .parse("http://github.com/rdoeffinger/Dictionary/issues")); + final Intent intent = new Intent(c, AboutActivity.class); context.startActivity(intent); return false; } @@ -266,7 +256,7 @@ public enum DictionaryApplication { File efd = null; try { efd = appContext.getExternalFilesDir(null); - } catch (Exception e) { + } catch (Exception ignored) { } if (efd != null) { efd.mkdirs(); @@ -291,7 +281,7 @@ public enum DictionaryApplication { if (dir.isEmpty()) { dir = selectDefaultDir(); } - dictDir = new File(dir); + File dictDir = new File(dir); dictDir.mkdirs(); if (!dictDir.isDirectory() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { appContext.getExternalFilesDirs(null); @@ -305,7 +295,7 @@ public enum DictionaryApplication { try { testfile.delete(); res = testfile.createNewFile() & testfile.delete(); - } catch (Exception e) { + } catch (Exception ignored) { } return res; } @@ -335,13 +325,13 @@ public enum DictionaryApplication { String defaultLangISO2 = Locale.getDefault().getLanguage().toLowerCase(); String defaultLangName = null; - final Map fileToNameCache = new HashMap(); + final Map fileToNameCache = new HashMap<>(); public List sortedIndexInfos(List indexInfos) { // Hack to put the default locale first in the name. if (indexInfos.size() > 1 && indexInfos.get(1).shortName.toLowerCase().equals(defaultLangISO2)) { - List result = new ArrayList(indexInfos); + List result = new ArrayList<>(indexInfos); ListUtil.swap(result, 0, 1); return result; } @@ -405,7 +395,7 @@ public enum DictionaryApplication { PersistentObjectCache.getInstance().write(C.DICTIONARY_CONFIGS, dictionaryConfig); } - final Comparator collator = USE_COLLATOR ? Collator.getInstance() : String.CASE_INSENSITIVE_ORDER; + final Comparator collator = USE_COLLATOR ? CollatorWrapper.getInstance() : null; final Comparator uncompressedFilenameComparator = new Comparator() { @Override public int compare(String uncompressedFilename1, String uncompressedFilename2) { @@ -420,7 +410,7 @@ public enum DictionaryApplication { return 1; } } - return collator.compare(name1, name2); + return collator != null ? collator.compare(name1, name2) : name1.compareToIgnoreCase(name2); } }; final Comparator dictionaryInfoComparator = new Comparator() { @@ -458,7 +448,7 @@ public enum DictionaryApplication { // Are there dictionaries on the device that we didn't know // about already? // Pick them up and put them at the end of the list. - final List toAddSorted = new ArrayList(); + final List toAddSorted = new ArrayList<>(); final File[] dictDirFiles = getDictDir().listFiles(); if (dictDirFiles != null) { for (final File file : dictDirFiles) { @@ -513,7 +503,7 @@ public enum DictionaryApplication { }).start(); } - public boolean matchesFilters(final DictionaryInfo dictionaryInfo, final String[] filters) { + private boolean matchesFilters(final DictionaryInfo dictionaryInfo, final String[] filters) { if (filters == null) { return true; } @@ -527,8 +517,8 @@ public enum DictionaryApplication { } public synchronized List getDictionariesOnDevice(String[] filters) { - final List result = new ArrayList( - dictionaryConfig.dictionaryFilesOrdered.size()); + final List result = new ArrayList<>( + dictionaryConfig.dictionaryFilesOrdered.size()); for (final String uncompressedFilename : dictionaryConfig.dictionaryFilesOrdered) { final DictionaryInfo dictionaryInfo = dictionaryConfig.uncompressedFilenameToDictionaryInfo .get(uncompressedFilename); @@ -540,11 +530,11 @@ public enum DictionaryApplication { } public List getDownloadableDictionaries(String[] filters) { - final List result = new ArrayList( - dictionaryConfig.dictionaryFilesOrdered.size()); + final List result = new ArrayList<>( + dictionaryConfig.dictionaryFilesOrdered.size()); - final Map remaining = new HashMap( - DOWNLOADABLE_UNCOMPRESSED_FILENAME_NAME_TO_DICTIONARY_INFO); + final Map remaining = new HashMap<>( + DOWNLOADABLE_UNCOMPRESSED_FILENAME_NAME_TO_DICTIONARY_INFO); remaining.keySet().removeAll(dictionaryConfig.dictionaryFilesOrdered); for (final DictionaryInfo dictionaryInfo : remaining.values()) { if (matchesFilters(dictionaryInfo, filters)) { @@ -555,10 +545,6 @@ public enum DictionaryApplication { return result; } - public synchronized boolean isDictionaryOnDevice(String uncompressedFilename) { - return dictionaryConfig.uncompressedFilenameToDictionaryInfo.get(uncompressedFilename) != null; - } - public boolean updateAvailable(final DictionaryInfo dictionaryInfo) { final DictionaryInfo downloadable = DOWNLOADABLE_UNCOMPRESSED_FILENAME_NAME_TO_DICTIONARY_INFO.get( @@ -568,9 +554,7 @@ public enum DictionaryApplication { } public DictionaryInfo getDownloadable(final String uncompressedFilename) { - final DictionaryInfo downloadable = DOWNLOADABLE_UNCOMPRESSED_FILENAME_NAME_TO_DICTIONARY_INFO - .get(uncompressedFilename); - return downloadable; + return DOWNLOADABLE_UNCOMPRESSED_FILENAME_NAME_TO_DICTIONARY_INFO.get(uncompressedFilename); } }