Fix some code inspection warnings.

[Dictionary.git] / src / com / hughes / android / dictionary / PreferenceActivity.java

diff --git a/src/com/hughes/android/dictionary/PreferenceActivity.java b/src/com/hughes/android/dictionary/PreferenceActivity.java
index 78223848f297f78a15086dc786748823ecaeed38..cda9a80cd411593ebde602c7e85ba177faee2b1c 100644 (file)
--- a/src/com/hughes/android/dictionary/PreferenceActivity.java
+++ b/src/com/hughes/android/dictionary/PreferenceActivity.java
@@ -33,7 +33,8 @@ public class PreferenceActivity extends android.preference.PreferenceActivity
     @SuppressWarnings("deprecation")
     @Override
     public void onCreate(Bundle savedInstanceState) {
-        final DictionaryApplication application = (DictionaryApplication) getApplication();
+        DictionaryApplication.INSTANCE.init(getApplicationContext());
+        final DictionaryApplication application = DictionaryApplication.INSTANCE;
         setTheme(application.getSelectedTheme().themeId);
 
         final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
@@ -44,8 +45,8 @@ public class PreferenceActivity extends android.preference.PreferenceActivity
             prefs.edit().putString(getString(R.string.wordListFileKey), application.getWordListFile().getAbsolutePath()).commit();
         }
 
-        /**
-         * @author Dominik Köppl Preference: select default dictionary As this
+        /*
+          @author Dominik Köppl Preference: select default dictionary As this
          *         list is dynamically generated, we have to do it in this
          *         fashion
          */
@@ -81,17 +82,13 @@ public class PreferenceActivity extends android.preference.PreferenceActivity
         prefs.registerOnSharedPreferenceChangeListener(this);
     }
 
-    @Override
-    public void onContentChanged() {
-        super.onContentChanged();
-    }
-
     @Override
     public void onSharedPreferenceChanged(SharedPreferences p, String v) {
-        final DictionaryApplication application = (DictionaryApplication)getApplication();
+        DictionaryApplication.INSTANCE.init(getApplicationContext());
+        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())
@@ -106,7 +103,7 @@ public class PreferenceActivity extends android.preference.PreferenceActivity
                 File efd = null;
                 try {
                     efd = getApplicationContext().getExternalFilesDir(null);
-                } catch (Exception e) {
+                } catch (Exception ignored) {
                 }
                 if (efd != null) {
                     String externalFilesDir = efd.getAbsolutePath();