Changeset 4895 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

02.02.2012 19:39:16 (4 months ago)

Author:

stoecker

Message:

remove deprecation

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• Preferences.java (modified) (1 diff)
• osm/DataSet.java (modified) (1 diff)
• osm/Filter.java (modified) (1 diff)
• osm/OsmPrimitive.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/Preferences.java

@@ -371 +371 @@
             if (e.getKey().startsWith(prefix)) {
                 all.put(e.getKey(), e.getValue());
+            }
+        }
+        return all;
+    }
+
+    synchronized public List<String> getAllPrefixKeys(final String prefix) {
+        final List<String> all = new LinkedList<String>();
+        for (final Entry<String,String> e : properties.entrySet()) {
+            if (e.getKey().startsWith(prefix)) {
+                all.add(e.getKey());
             }
         }

trunk/src/org/openstreetmap/josm/data/osm/DataSet.java

@@ -410 +410 @@
      * themselves for any dataset selection changes that occur, regardless of the current active
      * dataset. (However, the selection does only change in the active layer)
-     * @deprecated Use addSelectionListener/removeSelectionListener instead
-     */
-    @Deprecated
-    public static final Collection<SelectionChangedListener> selListeners = new CopyOnWriteArrayList<SelectionChangedListener>();
+     */
+    private static final Collection<SelectionChangedListener> selListeners = new CopyOnWriteArrayList<SelectionChangedListener>();
 
     public static void addSelectionListener(SelectionChangedListener listener) {

trunk/src/org/openstreetmap/josm/data/osm/Filter.java

@@ -27 +27 @@
             boolean regexSearch, boolean allElements) {
         super(text, mode, caseSensitive, regexSearch, allElements);
-    }
-
-    @Deprecated
-    public Filter(String prefText) {
-        super("", SearchMode.add, false, false, false);
-        String[] prfs = prefText.split(";");
-        if(prfs.length != 10 && !prfs[0].equals(version))
-            throw new Error("Incompatible filter preferences");
-        text = prfs[1];
-        if(prfs[2].equals("replace")) {
-            mode = SearchMode.replace;
-        }
-        if(prfs[2].equals("add")) {
-            mode = SearchMode.add;
-        }
-        if(prfs[2].equals("remove")) {
-            mode = SearchMode.remove;
-        }
-        if(prfs[2].equals("in_selection")) {
-            mode = SearchMode.in_selection;
-        }
-        caseSensitive = Boolean.parseBoolean(prfs[3]);
-        regexSearch = Boolean.parseBoolean(prfs[4]);
-        enable = Boolean.parseBoolean(prfs[6]);
-        hiding = Boolean.parseBoolean(prfs[7]);
-        inverted = Boolean.parseBoolean(prfs[8]);
     }
 

trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -476 +476 @@
         return (((flags & FLAG_DISABLED) != 0) && ((flags & FLAG_HIDE_IF_DISABLED) != 0));
     }
-
-    @Deprecated
-    public boolean isFiltered() {
-        return isDisabledAndHidden();
-    }
-
 
     public boolean isSelectable() {