X-Git-Url: http://gitweb.fperrin.net/?a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2FDictionaryApplication.java;h=6d125830d8a77b5295338d3e0ba7007e568ad84a;hb=9cb5a8e2d7acacc8e01e5133e50a225550eb0501;hp=1e46f4b0c1adb87b8bd25e9d1d82768dfc7a7143;hpb=4111a81b6e009f52365d0b2d232056a2138d1a99;p=Dictionary.git diff --git a/src/com/hughes/android/dictionary/DictionaryApplication.java b/src/com/hughes/android/dictionary/DictionaryApplication.java index 1e46f4b..6d12583 100644 --- a/src/com/hughes/android/dictionary/DictionaryApplication.java +++ b/src/com/hughes/android/dictionary/DictionaryApplication.java @@ -78,23 +78,23 @@ public class DictionaryApplication extends Application { enum Theme { DEFAULT(R.style.Theme_Default, - R.style.Theme_Default_TokenRow_Fg, - R.color.theme_default_token_row_fg, - R.drawable.theme_default_token_row_main_bg, - R.drawable.theme_default_token_row_other_bg, - R.drawable.theme_default_normal_row_bg), + R.style.Theme_Default_TokenRow_Fg, + R.color.theme_default_token_row_fg, + R.drawable.theme_default_token_row_main_bg, + R.drawable.theme_default_token_row_other_bg, + R.drawable.theme_default_normal_row_bg), LIGHT(R.style.Theme_Light, - R.style.Theme_Light_TokenRow_Fg, - R.color.theme_light_token_row_fg, - R.drawable.theme_light_token_row_main_bg, - R.drawable.theme_light_token_row_other_bg, - R.drawable.theme_light_normal_row_bg); + R.style.Theme_Light_TokenRow_Fg, + R.color.theme_light_token_row_fg, + R.drawable.theme_light_token_row_main_bg, + R.drawable.theme_light_token_row_other_bg, + R.drawable.theme_light_normal_row_bg); Theme(final int themeId, final int tokenRowFg, - final int tokenRowFgColor, - final int tokenRowMainBg, final int tokenRowOtherBg, - final int normalRowBg) { + final int tokenRowFgColor, + final int tokenRowMainBg, final int tokenRowOtherBg, + final int normalRowBg) { this.themeId = themeId; this.tokenRowFg = tokenRowFg; this.tokenRowFgColor = tokenRowFgColor; @@ -116,155 +116,155 @@ public class DictionaryApplication extends Application { public static final Map isoCodeToResources = new HashMap(); static { isoCodeToResources.put("AF", new LanguageResources("Afrikaans", R.string.AF, - R.drawable.flag_of_south_africa)); + R.drawable.flag_of_south_africa)); isoCodeToResources.put("SQ", new LanguageResources("Albanian", R.string.SQ, - R.drawable.flag_of_albania)); + R.drawable.flag_of_albania)); isoCodeToResources.put("AR", - new LanguageResources("Arabic", R.string.AR, R.drawable.arabic)); + new LanguageResources("Arabic", R.string.AR, R.drawable.arabic)); isoCodeToResources.put("HY", new LanguageResources("Armenian", R.string.HY, - R.drawable.flag_of_armenia)); + R.drawable.flag_of_armenia)); isoCodeToResources.put("BE", new LanguageResources("Belarusian", R.string.BE, - R.drawable.flag_of_belarus)); + R.drawable.flag_of_belarus)); isoCodeToResources.put("BN", new LanguageResources("Bengali", R.string.BN)); isoCodeToResources.put("BS", new LanguageResources("Bosnian", R.string.BS, - R.drawable.flag_of_bosnia_and_herzegovina)); + R.drawable.flag_of_bosnia_and_herzegovina)); isoCodeToResources.put("BG", new LanguageResources("Bulgarian", R.string.BG, - R.drawable.flag_of_bulgaria)); + R.drawable.flag_of_bulgaria)); isoCodeToResources.put("MY", new LanguageResources("Burmese", R.string.MY, - R.drawable.flag_of_myanmar)); + R.drawable.flag_of_myanmar)); isoCodeToResources.put("ZH", new LanguageResources("Chinese", R.string.ZH, - R.drawable.flag_of_the_peoples_republic_of_china)); + R.drawable.flag_of_the_peoples_republic_of_china)); isoCodeToResources.put("cmn", new LanguageResources("Mandarin", R.string.cmn, - R.drawable.flag_of_the_peoples_republic_of_china)); + R.drawable.flag_of_the_peoples_republic_of_china)); isoCodeToResources.put("yue", new LanguageResources("Cantonese", R.string.yue, - R.drawable.flag_of_hong_kong)); + R.drawable.flag_of_hong_kong)); isoCodeToResources.put("CA", new LanguageResources("Catalan", R.string.CA)); isoCodeToResources.put("HR", new LanguageResources("Croatian", R.string.HR, - R.drawable.flag_of_croatia)); + R.drawable.flag_of_croatia)); isoCodeToResources.put("CS", new LanguageResources("Czech", R.string.CS, - R.drawable.flag_of_the_czech_republic)); + R.drawable.flag_of_the_czech_republic)); isoCodeToResources.put("DA", new LanguageResources("Danish", R.string.DA, - R.drawable.flag_of_denmark)); + R.drawable.flag_of_denmark)); isoCodeToResources.put("NL", new LanguageResources("Dutch", R.string.NL, - R.drawable.flag_of_the_netherlands)); + R.drawable.flag_of_the_netherlands)); isoCodeToResources.put("EN", new LanguageResources("English", R.string.EN, - R.drawable.flag_of_the_united_kingdom)); + R.drawable.flag_of_the_united_kingdom)); isoCodeToResources.put("EO", new LanguageResources("Esperanto", R.string.EO, - R.drawable.flag_of_esperanto)); + R.drawable.flag_of_esperanto)); isoCodeToResources.put("ET", new LanguageResources("Estonian", R.string.ET, - R.drawable.flag_of_estonia)); + R.drawable.flag_of_estonia)); isoCodeToResources.put("FI", new LanguageResources("Finnish", R.string.FI, - R.drawable.flag_of_finland)); + R.drawable.flag_of_finland)); isoCodeToResources.put("FR", new LanguageResources("French", R.string.FR, - R.drawable.flag_of_france)); + R.drawable.flag_of_france)); isoCodeToResources.put("DE", new LanguageResources("German", R.string.DE, - R.drawable.flag_of_germany)); + R.drawable.flag_of_germany)); isoCodeToResources.put("EL", new LanguageResources("Greek", R.string.EL, - R.drawable.flag_of_greece)); + R.drawable.flag_of_greece)); isoCodeToResources.put("grc", new LanguageResources("Ancient Greek", R.string.grc)); isoCodeToResources.put("haw", new LanguageResources("Hawaiian", R.string.haw, - R.drawable.flag_of_hawaii)); + R.drawable.flag_of_hawaii)); isoCodeToResources.put("HE", new LanguageResources("Hebrew", R.string.HE, - R.drawable.flag_of_israel)); + R.drawable.flag_of_israel)); isoCodeToResources.put("HI", new LanguageResources("Hindi", R.string.HI, R.drawable.hindi)); isoCodeToResources.put("HU", new LanguageResources("Hungarian", R.string.HU, - R.drawable.flag_of_hungary)); + R.drawable.flag_of_hungary)); isoCodeToResources.put("IS", new LanguageResources("Icelandic", R.string.IS, - R.drawable.flag_of_iceland)); + R.drawable.flag_of_iceland)); isoCodeToResources.put("ID", new LanguageResources("Indonesian", R.string.ID, - R.drawable.flag_of_indonesia)); + R.drawable.flag_of_indonesia)); isoCodeToResources.put("GA", new LanguageResources("Irish", R.string.GA, - R.drawable.flag_of_ireland)); + R.drawable.flag_of_ireland)); isoCodeToResources.put("GD", new LanguageResources("Scottish Gaelic", R.string.GD, - R.drawable.flag_of_scotland)); + R.drawable.flag_of_scotland)); isoCodeToResources.put("GV", new LanguageResources("Manx", R.string.GV, - R.drawable.flag_of_the_isle_of_man)); + R.drawable.flag_of_the_isle_of_man)); isoCodeToResources.put("IT", new LanguageResources("Italian", R.string.IT, - R.drawable.flag_of_italy)); + R.drawable.flag_of_italy)); isoCodeToResources.put("LA", new LanguageResources("Latin", R.string.LA)); isoCodeToResources.put("LV", new LanguageResources("Latvian", R.string.LV, - R.drawable.flag_of_latvia)); + R.drawable.flag_of_latvia)); isoCodeToResources.put("LT", new LanguageResources("Lithuanian", R.string.LT, - R.drawable.flag_of_lithuania)); + R.drawable.flag_of_lithuania)); isoCodeToResources.put("JA", new LanguageResources("Japanese", R.string.JA, - R.drawable.flag_of_japan)); + R.drawable.flag_of_japan)); isoCodeToResources.put("KO", new LanguageResources("Korean", R.string.KO, - R.drawable.flag_of_south_korea)); + R.drawable.flag_of_south_korea)); isoCodeToResources.put("KU", new LanguageResources("Kurdish", R.string.KU)); isoCodeToResources.put("MS", new LanguageResources("Malay", R.string.MS, - R.drawable.flag_of_malaysia)); + R.drawable.flag_of_malaysia)); isoCodeToResources.put("MI", new LanguageResources("Maori", R.string.MI, - R.drawable.flag_of_new_zealand)); + R.drawable.flag_of_new_zealand)); isoCodeToResources.put("MN", new LanguageResources("Mongolian", R.string.MN, - R.drawable.flag_of_mongolia)); + R.drawable.flag_of_mongolia)); isoCodeToResources.put("NE", new LanguageResources("Nepali", R.string.NE, - R.drawable.flag_of_nepal)); + R.drawable.flag_of_nepal)); isoCodeToResources.put("NO", new LanguageResources("Norwegian", R.string.NO, - R.drawable.flag_of_norway)); + R.drawable.flag_of_norway)); isoCodeToResources.put("FA", new LanguageResources("Persian", R.string.FA, - R.drawable.flag_of_iran)); + R.drawable.flag_of_iran)); isoCodeToResources.put("PL", new LanguageResources("Polish", R.string.PL, - R.drawable.flag_of_poland)); + R.drawable.flag_of_poland)); isoCodeToResources.put("PT", new LanguageResources("Portuguese", R.string.PT, - R.drawable.flag_of_portugal)); + R.drawable.flag_of_portugal)); isoCodeToResources.put("PA", new LanguageResources("Punjabi", R.string.PA)); isoCodeToResources.put("RO", new LanguageResources("Romanian", R.string.RO, - R.drawable.flag_of_romania)); + R.drawable.flag_of_romania)); isoCodeToResources.put("RU", new LanguageResources("Russian", R.string.RU, - R.drawable.flag_of_russia)); + R.drawable.flag_of_russia)); isoCodeToResources.put("SA", new LanguageResources("Sanskrit", R.string.SA)); isoCodeToResources.put("SR", new LanguageResources("Serbian", R.string.SR, - R.drawable.flag_of_serbia)); + R.drawable.flag_of_serbia)); isoCodeToResources.put("SK", new LanguageResources("Slovak", R.string.SK, - R.drawable.flag_of_slovakia)); + R.drawable.flag_of_slovakia)); isoCodeToResources.put("SL", new LanguageResources("Slovenian", R.string.SL, - R.drawable.flag_of_slovenia)); + R.drawable.flag_of_slovenia)); isoCodeToResources.put("SO", new LanguageResources("Somali", R.string.SO, - R.drawable.flag_of_somalia)); + R.drawable.flag_of_somalia)); isoCodeToResources.put("ES", new LanguageResources("Spanish", R.string.ES, - R.drawable.flag_of_spain)); + R.drawable.flag_of_spain)); isoCodeToResources.put("SW", new LanguageResources("Swahili", R.string.SW)); isoCodeToResources.put("SV", new LanguageResources("Swedish", R.string.SV, - R.drawable.flag_of_sweden)); + R.drawable.flag_of_sweden)); isoCodeToResources.put("TL", new LanguageResources("Tagalog", R.string.TL)); isoCodeToResources.put("TG", new LanguageResources("Tajik", R.string.TG, - R.drawable.flag_of_tajikistan)); + R.drawable.flag_of_tajikistan)); isoCodeToResources.put("TH", new LanguageResources("Thai", R.string.TH, - R.drawable.flag_of_thailand)); + R.drawable.flag_of_thailand)); isoCodeToResources.put("BO", new LanguageResources("Tibetan", R.string.BO)); isoCodeToResources.put("TR", new LanguageResources("Turkish", R.string.TR, - R.drawable.flag_of_turkey)); + R.drawable.flag_of_turkey)); isoCodeToResources.put("UK", new LanguageResources("Ukrainian", R.string.UK, - R.drawable.flag_of_ukraine)); + R.drawable.flag_of_ukraine)); isoCodeToResources.put("UR", new LanguageResources("Urdu", R.string.UR)); isoCodeToResources.put("VI", new LanguageResources("Vietnamese", R.string.VI, - R.drawable.flag_of_vietnam)); + R.drawable.flag_of_vietnam)); isoCodeToResources.put("CI", new LanguageResources("Welsh", R.string.CI, - R.drawable.flag_of_wales_2)); + R.drawable.flag_of_wales_2)); isoCodeToResources.put("YI", new LanguageResources("Yiddish", R.string.YI)); isoCodeToResources.put("ZU", new LanguageResources("Zulu", R.string.ZU)); isoCodeToResources.put("AZ", new LanguageResources("Azeri", R.string.AZ, - R.drawable.flag_of_azerbaijan)); + R.drawable.flag_of_azerbaijan)); isoCodeToResources.put("EU", new LanguageResources("Basque", R.string.EU, - R.drawable.flag_of_the_basque_country)); + R.drawable.flag_of_the_basque_country)); isoCodeToResources.put("BR", new LanguageResources("Breton", R.string.BR)); isoCodeToResources.put("MR", new LanguageResources("Marathi", R.string.MR)); isoCodeToResources.put("FO", new LanguageResources("Faroese", R.string.FO)); isoCodeToResources.put("GL", new LanguageResources("Galician", R.string.GL, - R.drawable.flag_of_galicia)); + R.drawable.flag_of_galicia)); isoCodeToResources.put("KA", new LanguageResources("Georgian", R.string.KA, - R.drawable.flag_of_georgia)); + R.drawable.flag_of_georgia)); isoCodeToResources.put("HT", new LanguageResources("Haitian Creole", R.string.HT, - R.drawable.flag_of_haiti)); + R.drawable.flag_of_haiti)); isoCodeToResources.put("LB", new LanguageResources("Luxembourgish", R.string.LB, - R.drawable.flag_of_luxembourg)); + R.drawable.flag_of_luxembourg)); isoCodeToResources.put("MK", new LanguageResources("Macedonian", R.string.MK, - R.drawable.flag_of_macedonia)); + R.drawable.flag_of_macedonia)); isoCodeToResources.put("LO", new LanguageResources("Lao", R.string.LO, - R.drawable.flag_of_laos)); + R.drawable.flag_of_laos)); isoCodeToResources.put("ML", new LanguageResources("Malayalam", R.string.ML)); isoCodeToResources.put("SL", new LanguageResources("Slovenian", R.string.SL, - R.drawable.flag_of_slovenia)); + R.drawable.flag_of_slovenia)); isoCodeToResources.put("TA", new LanguageResources("Tamil", R.string.TA)); isoCodeToResources.put("SH", new LanguageResources("Serbo-Croatian", R.string.SH)); isoCodeToResources.put("SD", new LanguageResources("Sindhi", R.string.SD)); @@ -303,7 +303,7 @@ public class DictionaryApplication extends Application { } DOWNLOADABLE_UNCOMPRESSED_FILENAME_NAME_TO_DICTIONARY_INFO = new HashMap(); final BufferedReader reader = new BufferedReader( - new InputStreamReader(context.getResources().openRawResource(R.raw.dictionary_info))); + new InputStreamReader(context.getResources().openRawResource(R.raw.dictionary_info))); try { String line; while ((line = reader.readLine()) != null) { @@ -312,12 +312,14 @@ public class DictionaryApplication extends Application { } final DictionaryInfo dictionaryInfo = new DictionaryInfo(line); DOWNLOADABLE_UNCOMPRESSED_FILENAME_NAME_TO_DICTIONARY_INFO.put( - dictionaryInfo.uncompressedFilename, dictionaryInfo); + dictionaryInfo.uncompressedFilename, dictionaryInfo); } } catch (IOException e) { Log.e(LOG, "Failed to load downloadable dictionary lists.", e); } - try { reader.close(); } catch (IOException e) {} + try { + reader.close(); + } catch (IOException e) {} } private File dictDir; @@ -330,11 +332,11 @@ public class DictionaryApplication extends Application { staticInit(getApplicationContext()); languageButtonPixels = (int) TypedValue.applyDimension( - TypedValue.COMPLEX_UNIT_DIP, 60, getResources().getDisplayMetrics()); + TypedValue.COMPLEX_UNIT_DIP, 60, getResources().getDisplayMetrics()); // Load the dictionaries we know about. dictionaryConfig = PersistentObjectCache.init(getApplicationContext()).read( - C.DICTIONARY_CONFIGS, DictionaryConfig.class); + C.DICTIONARY_CONFIGS, DictionaryConfig.class); if (dictionaryConfig == null) { dictionaryConfig = new DictionaryConfig(); } @@ -348,7 +350,7 @@ public class DictionaryApplication extends Application { prefs.registerOnSharedPreferenceChangeListener(new OnSharedPreferenceChangeListener() { @Override public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, - String key) { + String key) { Log.d("QuickDic", "prefs changed: " + key); if (key.equals(getString(R.string.themeKey))) { setTheme(getSelectedTheme().themeId); @@ -358,7 +360,7 @@ public class DictionaryApplication extends Application { } public void onCreateGlobalOptionsMenu( - final Context context, final Menu menu) { + final Context context, final Menu menu) { final MenuItem about = menu.add(getString(R.string.about)); MenuItemCompat.setShowAsAction(about, MenuItem.SHOW_AS_ACTION_NEVER); about.setOnMenuItemClickListener(new OnMenuItemClickListener() { @@ -395,7 +397,7 @@ public class DictionaryApplication extends Application { public boolean onMenuItemClick(final MenuItem menuItem) { final Intent intent = new Intent(Intent.ACTION_VIEW); intent.setData(Uri - .parse("http://github.com/rdoeffinger/Dictionary/issues")); + .parse("http://github.com/rdoeffinger/Dictionary/issues")); context.startActivity(intent); return false; } @@ -441,7 +443,7 @@ public class DictionaryApplication extends Application { dictDir = new File(dir); dictDir.mkdirs(); if (!dictDir.isDirectory() && Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { - getApplicationContext().getExternalFilesDirs(null); + getApplicationContext().getExternalFilesDirs(null); } return dictDir; } @@ -488,7 +490,7 @@ public class DictionaryApplication extends Application { final Language.LanguageResources languageResources = isoCodeToResources .get(isoCode); final String lang = languageResources != null ? getApplicationContext().getString( - languageResources.nameId) : isoCode; + languageResources.nameId) : isoCode; return lang; } @@ -520,7 +522,7 @@ public class DictionaryApplication extends Application { } final DictionaryInfo dictionaryInfo = DOWNLOADABLE_UNCOMPRESSED_FILENAME_NAME_TO_DICTIONARY_INFO - .get(uncompressedFilename); + .get(uncompressedFilename); if (dictionaryInfo != null) { final StringBuilder nameBuilder = new StringBuilder(); @@ -530,7 +532,7 @@ public class DictionaryApplication extends Application { nameBuilder.append("-"); } nameBuilder - .append(isoCodeToLocalizedLanguageName(sortedIndexInfos.get(i).shortName)); + .append(isoCodeToLocalizedLanguageName(sortedIndexInfos.get(i).shortName)); } name = nameBuilder.toString(); } else { @@ -541,7 +543,7 @@ public class DictionaryApplication extends Application { } public View createButton(final Context context, final DictionaryInfo dictionaryInfo, - final IndexInfo indexInfo) { + final IndexInfo indexInfo) { LanguageResources languageResources = isoCodeToResources.get(indexInfo.shortName); View result; @@ -574,7 +576,7 @@ public class DictionaryApplication extends Application { while (dictionaryConfig.dictionaryFilesOrdered.remove(dictionaryInfo.uncompressedFilename)) { } dictionaryConfig.uncompressedFilenameToDictionaryInfo - .remove(dictionaryInfo.uncompressedFilename); + .remove(dictionaryInfo.uncompressedFilename); getPath(dictionaryInfo.uncompressedFilename).delete(); PersistentObjectCache.getInstance().write(C.DICTIONARY_CONFIGS, dictionaryConfig); } @@ -590,7 +592,7 @@ public class DictionaryApplication extends Application { && !name2.startsWith(defaultLangName + "-")) { return -1; } else if (name2.startsWith(defaultLangName + "-") - && !name1.startsWith(defaultLangName + "-")) { + && !name1.startsWith(defaultLangName + "-")) { return 1; } } @@ -616,7 +618,7 @@ public class DictionaryApplication extends Application { final DictionaryConfig oldDictionaryConfig = new DictionaryConfig(); synchronized (DictionaryApplication.this) { oldDictionaryConfig.dictionaryFilesOrdered - .addAll(dictionaryConfig.dictionaryFilesOrdered); + .addAll(dictionaryConfig.dictionaryFilesOrdered); } final DictionaryConfig newDictionaryConfig = new DictionaryConfig(); for (final String uncompressedFilename : oldDictionaryConfig.dictionaryFilesOrdered) { @@ -625,7 +627,7 @@ public class DictionaryApplication extends Application { if (dictionaryInfo.isValid() || dictFile.exists()) { newDictionaryConfig.dictionaryFilesOrdered.add(uncompressedFilename); newDictionaryConfig.uncompressedFilenameToDictionaryInfo.put( - uncompressedFilename, dictionaryInfo); + uncompressedFilename, dictionaryInfo); } } @@ -657,7 +659,7 @@ public class DictionaryApplication extends Application { toAddSorted.add(file.getName()); newDictionaryConfig.uncompressedFilenameToDictionaryInfo.put( - file.getName(), dictionaryInfo); + file.getName(), dictionaryInfo); } } else { Log.w(LOG, "dictDir is not a directory: " + getDictDir().getPath()); @@ -669,7 +671,7 @@ public class DictionaryApplication extends Application { try { PersistentObjectCache.getInstance() - .write(C.DICTIONARY_CONFIGS, newDictionaryConfig); + .write(C.DICTIONARY_CONFIGS, newDictionaryConfig); } catch (Exception e) { Log.e(LOG, "Failed persisting dictionary configs", e); } @@ -693,7 +695,7 @@ public class DictionaryApplication extends Application { } for (final String filter : filters) { if (!getDictionaryName(dictionaryInfo.uncompressedFilename).toLowerCase().contains( - filter)) { + filter)) { return false; } } @@ -702,10 +704,10 @@ public class DictionaryApplication extends Application { public synchronized List getDictionariesOnDevice(String[] filters) { final List result = new ArrayList( - dictionaryConfig.dictionaryFilesOrdered.size()); + dictionaryConfig.dictionaryFilesOrdered.size()); for (final String uncompressedFilename : dictionaryConfig.dictionaryFilesOrdered) { final DictionaryInfo dictionaryInfo = dictionaryConfig.uncompressedFilenameToDictionaryInfo - .get(uncompressedFilename); + .get(uncompressedFilename); if (dictionaryInfo != null && matchesFilters(dictionaryInfo, filters)) { result.add(dictionaryInfo); } @@ -715,10 +717,10 @@ public class DictionaryApplication extends Application { public List getDownloadableDictionaries(String[] filters) { final List result = new ArrayList( - dictionaryConfig.dictionaryFilesOrdered.size()); + dictionaryConfig.dictionaryFilesOrdered.size()); final Map remaining = new HashMap( - DOWNLOADABLE_UNCOMPRESSED_FILENAME_NAME_TO_DICTIONARY_INFO); + DOWNLOADABLE_UNCOMPRESSED_FILENAME_NAME_TO_DICTIONARY_INFO); remaining.keySet().removeAll(dictionaryConfig.dictionaryFilesOrdered); for (final DictionaryInfo dictionaryInfo : remaining.values()) { if (matchesFilters(dictionaryInfo, filters)) { @@ -735,15 +737,15 @@ public class DictionaryApplication extends Application { public boolean updateAvailable(final DictionaryInfo dictionaryInfo) { final DictionaryInfo downloadable = - DOWNLOADABLE_UNCOMPRESSED_FILENAME_NAME_TO_DICTIONARY_INFO.get( - dictionaryInfo.uncompressedFilename); + DOWNLOADABLE_UNCOMPRESSED_FILENAME_NAME_TO_DICTIONARY_INFO.get( + dictionaryInfo.uncompressedFilename); return downloadable != null && - downloadable.creationMillis > dictionaryInfo.creationMillis; + downloadable.creationMillis > dictionaryInfo.creationMillis; } public DictionaryInfo getDownloadable(final String uncompressedFilename) { final DictionaryInfo downloadable = DOWNLOADABLE_UNCOMPRESSED_FILENAME_NAME_TO_DICTIONARY_INFO - .get(uncompressedFilename); + .get(uncompressedFilename); return downloadable; }