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

Timestamp:

2009-11-08T13:38:44+01:00 (14 years ago)

Author:

jttt

Message:

Added support for referrers

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• mapmode/DrawAction.java (modified) (1 diff)
• search/SearchCompiler.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -543 +543 @@
 
             newSelection.add(n);
-            ds.setSelected(n);
         } else if (!newNode) {
             title = tr("Connect existing way to node");

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

@@ -39 +39 @@
         this.regexSearch = regexSearch;
         this.tokenizer = tokenizer;
-        childBackRefs = new CollectBackReferencesVisitor(Main.main.getCurrentDataSet());
+        childBackRefs = new CollectBackReferencesVisitor(true);
     }
 
@@ -230 +230 @@
 
             switch (mode) {
-                case NONE:
-                    return false;
-                case MISSING_KEY:
-                    return osm.get(key) == null;
-                case ANY:
-                    return true;
-                case ANY_VALUE:
-                    return osm.get(key) != null;
-                case ANY_KEY:
-                    for (String v:osm.getKeys().values()) {
-                        if (v.equals(value))
+            case NONE:
+                return false;
+            case MISSING_KEY:
+                return osm.get(key) == null;
+            case ANY:
+                return true;
+            case ANY_VALUE:
+                return osm.get(key) != null;
+            case ANY_KEY:
+                for (String v:osm.getKeys().values()) {
+                    if (v.equals(value))
+                        return true;
+                }
+                return false;
+            case EXACT:
+                return value.equals(osm.get(key));
+            case ANY_KEY_REGEXP:
+                for (String v:osm.getKeys().values()) {
+                    if (valuePattern.matcher(v).matches())
+                        return true;
+                }
+                return false;
+            case ANY_VALUE_REGEXP:
+            case EXACT_REGEXP:
+                for (Entry<String, String> entry:osm.entrySet()) {
+                    if (keyPattern.matcher(entry.getKey()).matches()) {
+                        if (mode == Mode.ANY_VALUE_REGEXP
+                                || valuePattern.matcher(entry.getValue()).matches())
                             return true;
                     }
-                    return false;
-                case EXACT:
-                    return value.equals(osm.get(key));
-                case ANY_KEY_REGEXP:
-                    for (String v:osm.getKeys().values()) {
-                        if (valuePattern.matcher(v).matches())
-                            return true;
-                    }
-                    return false;
-                case ANY_VALUE_REGEXP:
-                case EXACT_REGEXP:
-                    for (Entry<String, String> entry:osm.entrySet()) {
-                        if (keyPattern.matcher(entry.getKey()).matches()) {
-                            if (mode == Mode.ANY_VALUE_REGEXP
-                                    || valuePattern.matcher(entry.getValue()).matches())
-                                return true;
-                        }
-                    }
-                    return false;
-                case MISSING_KEY_REGEXP:
-                    for (String k:osm.keySet()) {
-                        if (keyPattern.matcher(k).matches())
-                            return false;
-                    }
-                    return true;
+                }
+                return false;
+            case MISSING_KEY_REGEXP:
+                for (String k:osm.keySet()) {
+                    if (keyPattern.matcher(k).matches())
+                        return false;
+                }
+                return true;
             }
             throw new AssertionError("Missed state");