Changeset 3908 in josm for trunk/src/org/openstreetmap/josm/data/osm

Timestamp:

2011-02-16T16:39:09+01:00 (15 years ago)

Author:

bastiK

Message:

new preference type (list of structs). Should be more flexible when preference options are added and dropped for a list like features. (Not sure how far we get with this key=value approach, maybe it's time for xml preferences.) Fixes #5850 - Filter entries are mixed up

File:

• trunk/src/org/openstreetmap/josm/data/osm/Filter.java (modified) (3 diffs)

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

@@ -2 +2 @@
 package org.openstreetmap.josm.data.osm;
 
+import static org.openstreetmap.josm.tools.Utils.equal;
+
 import org.openstreetmap.josm.actions.search.SearchAction.SearchMode;
 import org.openstreetmap.josm.actions.search.SearchAction.SearchSetting;
+import org.openstreetmap.josm.data.Preferences.pref;
+import org.openstreetmap.josm.data.Preferences.writeExplicitly;
+import org.openstreetmap.josm.tools.Utils;
 
 /**
@@ -24 +29 @@
     }
 
+    @Deprecated
     public Filter(String prefText) {
         super("", SearchMode.add, false, false, false);
@@ -49 +55 @@
     }
 
-    public String getPrefString(){
-        return version + ";" +
-        text + ";" + mode + ";" + caseSensitive + ";" + regexSearch + ";" +
-        "legacy" + ";" + enable + ";" + hiding + ";" +
-        inverted + ";" +
-        "false"; // last parameter is not used any more (was: applyForChildren)
+    public Filter(FilterPreferenceEntry e) {
+        super(e.text, SearchMode.add, false, false, false);
+        if (equal(e.mode, "replace")) {
+            mode = SearchMode.replace;
+        } else if (equal(e.mode, "add")) {
+            mode = SearchMode.add;
+        } else if (equal(e.mode, "remove")) {
+            mode = SearchMode.remove;
+        } else  if (equal(e.mode, "in_selection")) {
+            mode = SearchMode.in_selection;
+        }
+        caseSensitive = e.case_sensitive;
+        regexSearch = e.regex_search;
+        enable = e.enable;
+        hiding = e.hiding;
+        inverted = e.inverted;
+    }
+
+    public static class FilterPreferenceEntry {
+        @pref @writeExplicitly public String version = "1";
+        @pref public String text = null;
+        @pref @writeExplicitly public String mode = "add";
+        @pref public boolean case_sensitive = false;
+        @pref public boolean regex_search = false;
+        @pref @writeExplicitly public boolean enable = true;
+        @pref @writeExplicitly public boolean hiding = false;
+        @pref @writeExplicitly public boolean inverted = false;
+    }
+
+    public FilterPreferenceEntry getPreferenceEntry() {
+        FilterPreferenceEntry e = new FilterPreferenceEntry();
+        e.version = version;
+        e.text = text;
+        e.mode = mode.toString();
+        e.case_sensitive = caseSensitive;
+        e.regex_search = regexSearch;
+        e.enable = enable;
+        e.hiding = hiding;
+        e.inverted = inverted;
+        return e;
     }
 }