Changeset 9940 in josm for trunk/src/org/openstreetmap/josm/actions

Timestamp:

2016-03-06T17:12:42+01:00 (9 years ago)

Author:

simon04

Message:

see #12554 - Allow to ignore keys/tags from recent tags

Location:

trunk/src/org/openstreetmap/josm/actions/search

Files:

• SearchAction.java (modified) (1 diff)
• SearchCompiler.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

@@ -773 +773 @@
         return Collections.<ActionParameter<?>>singletonList(new SearchSettingsActionParameter(SEARCH_EXPRESSION));
     }
-
-    public static String escapeStringForSearch(String s) {
-        return s.replace("\\", "\\\\").replace("\"", "\\\"");
-    }
 }

trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java

@@ -1745 +1745 @@
         return searchFlags;
     }
+
+    static String escapeStringForSearch(String s) {
+        return s.replace("\\", "\\\\").replace("\"", "\\\"");
+    }
+
+    /**
+     * Builds a search string for the given tag. If value is empty, the existence of the key is checked.
+     *
+     * @param key   the tag key
+     * @param value the tag value
+     * @return a search string for the given tag
+     */
+    public static String buildSearchStringForTag(String key, String value) {
+        final String forKey = '"' + escapeStringForSearch(key) + '"' + '=';
+        if (value == null || value.isEmpty()) {
+            return forKey + "*";
+        } else {
+            return forKey + '"' + escapeStringForSearch(value) + '"';
+        }
+    }
 }