X-Git-Url: http://gitweb.fperrin.net/?p=Dictionary.git;a=blobdiff_plain;f=src%2Fcom%2Fhughes%2Fandroid%2Fdictionary%2FDictionaryApplication.java;h=1e3788be869e7d830511705e391282e1af33c0ca;hp=6cfa207bb9125570f7ac8a2bd85190f75ad5452e;hb=c76660b2772122109529d3616289980a7084eeeb;hpb=198b0bc69d5cb4c90c0c8f10b1ca072b44f17a3a

diff --git a/src/com/hughes/android/dictionary/DictionaryApplication.java b/src/com/hughes/android/dictionary/DictionaryApplication.java
index 6cfa207..1e3788b 100644
--- a/src/com/hughes/android/dictionary/DictionaryApplication.java
+++ b/src/com/hughes/android/dictionary/DictionaryApplication.java
@@ -21,7 +21,7 @@ import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Environment;
-import android.preference.PreferenceManager;
+import android.support.v7.preference.PreferenceManager;
 import android.support.v4.view.MenuItemCompat;
 import android.util.Log;
 import android.util.TypedValue;
@@ -41,6 +41,7 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
@@ -380,7 +381,7 @@ public enum DictionaryApplication {
     }
 
     public synchronized void sortDictionaries() {
-        dictionaryConfig.dictionaryFilesOrdered.sort(uncompressedFilenameComparator);
+        Collections.sort(dictionaryConfig.dictionaryFilesOrdered, uncompressedFilenameComparator);
         PersistentObjectCache.getInstance().write(C.DICTIONARY_CONFIGS, dictionaryConfig);
     }
 
@@ -477,7 +478,7 @@ public enum DictionaryApplication {
                     Log.w(LOG, "dictDir is not a directory: " + getDictDir().getPath());
                 }
                 if (!toAddSorted.isEmpty()) {
-                    toAddSorted.sort(uncompressedFilenameComparator);
+                    Collections.sort(toAddSorted, uncompressedFilenameComparator);
                     newDictionaryConfig.dictionaryFilesOrdered.addAll(toAddSorted);
                 }
 
@@ -539,7 +540,7 @@ public enum DictionaryApplication {
                 result.add(dictionaryInfo);
             }
         }
-        result.sort(dictionaryInfoComparator);
+        Collections.sort(result, dictionaryInfoComparator);
         return result;
     }