Changeset 4896 in josm for trunk/src/org

Timestamp:

2012-02-02T19:40:31+01:00 (13 years ago)

Author:

stoecker

Message:

remove deprecation

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/FilterTableModel.java

@@ -177 +177 @@
 
     private void loadPrefs() {
-        if (!loadPrefsImpl()) {
-            loadPrefsOld();
-            savePrefs();
-        }
-    }
-
-    private boolean loadPrefsImpl() {
         List<FilterPreferenceEntry> entries = Main.pref.getListOfStructs("filters.entries", null, FilterPreferenceEntry.class);
-        if (entries == null)
-            return false;
-        for (FilterPreferenceEntry e : entries) {
-            filters.add(new Filter(e));
-        }
-        updateFilters();
-        return true;
-    }
-
-    @Deprecated
-    private void loadPrefsOld() {
-        Map<String, String> prefs = Main.pref.getAllPrefix("filters.filter");
-        for (String value : prefs.values()) {
-            filters.add(new Filter(value));
-        }
-        updateFilters();
+        if (entries != null) {
+            for (FilterPreferenceEntry e : entries) {
+                filters.add(new Filter(e));
+            }
+            updateFilters();
+        }
     }