Changeset 1603 in josm for trunk/src

Timestamp:

2009-05-19T19:01:13+02:00 (16 years ago)

Author:

stoecker

Message:

fixed #2602 - patch by Matt,avar - Search keywords child and parent

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/search/SearchAction.java (modified) (1 diff)
• actions/search/SearchCompiler.java (modified) (4 diffs)
• plugins/PluginSelection.java (modified) (2 diffs)

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

@@ -94 +94 @@
                 + "<li>"+tr("<b>incomplete</b> - all incomplete objects")+"</li>"
                 + "<li>"+tr("<b>untagged</b> - all untagged objects")+"</li>"
+                + "<li>"+tr("<b>child <i>expr</i></b> - all children of objects matching the expression")+"</li>"
+                + "<li>"+tr("<b>parent <i>expr</i></b> - all parents of objects matching the expression")+"</li>"
                 + "<li>"+tr("Use <b>|</b> or <b>OR</b> to combine with logical or")+"</li>"
                 + "<li>"+tr("Use <b>\"</b> to quote operators (e.g. if key contains :)")+"</li>"

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

@@ -12 +12 @@
 import java.util.regex.PatternSyntaxException;
 
+import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.osm.Node;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.User;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.visitor.CollectBackReferencesVisitor;
 import org.openstreetmap.josm.tools.DateUtils;
 
@@ -320 +323 @@
         @Override public String toString() {return "untagged";}
     }
+        
+    private static class Parent extends Match {
+        private Match child;
+        public Parent(Match m) { child = m; }
+        @Override public boolean match(OsmPrimitive osm) throws ParseError {
+            boolean isParent = false;
+
+            // "parent" (null) should mean the same as "parent()"
+            // (Always). I.e. match everything
+            if (child == null)
+                child = new Always();
+                
+            if (osm instanceof Way) {
+                for (Node n : ((Way)osm).nodes)
+                    isParent |= child.match(n);
+            } else if (osm instanceof Relation) {
+                for (RelationMember member : ((Relation)osm).members) {
+                    if (member.member != null)
+                        isParent |= child.match(member.member);
+                }
+            }
+            return isParent;
+        }
+        @Override public String toString() {return "parent(" + child + ")";}
+    }
+
+    private static class Child extends Match {
+        private Match parent;
+        public Child(Match m) { parent = m; }
+        @Override public boolean match(OsmPrimitive osm) throws ParseError {
+            // "child" (null) should mean the same as "child()"
+            // (Always). I.e. match everything
+            if (parent == null)
+                parent = new Always();
+
+            boolean isChild = false;
+            CollectBackReferencesVisitor backRefs = new CollectBackReferencesVisitor(Main.ds);
+            osm.visit(backRefs);
+            for (OsmPrimitive p : backRefs.data) {
+                isChild |= parent.match(p);
+            }
+            return isChild;
+        }
+        @Override public String toString() {return "child(" + parent + ")";}
+    }
 
     public static class ParseError extends Exception {
@@ -388 +436 @@
     }
 
-    private Match parsePat() {
+    private Match parsePat() throws ParseError {
         String tok = tokenizer.readText();
 
@@ -408 +456 @@
         } else if (tok.equals("selected")) {
             return new Selected();
+        } else if (tok.equals("child")) {
+            return new Child(parseParens());
+        } else if (tok.equals("parent")) {
+            return new Parent(parseParens());
         } else {
             return new Any(tok);

trunk/src/org/openstreetmap/josm/plugins/PluginSelection.java

@@ -34 +34 @@
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
+import javax.swing.UIManager;
 import javax.swing.event.HyperlinkEvent;
 import javax.swing.event.HyperlinkListener;
 import javax.swing.event.HyperlinkEvent.EventType;
-import javax.swing.UIManager;
 
 import org.openstreetmap.josm.Main;
@@ -135 +135 @@
         if (pluginMap == null)
             pluginMap = new HashMap<String, Boolean>();
-        else
+        else {
             // Keep the map in bounds; possibly slightly pointless.
-            for (final String pname : pluginMap.keySet())
-                if (availablePlugins.get(pname) == null) pluginMap.remove(pname);
+            Set<String> pluginsToRemove = new HashSet<String>();
+            for (final String pname : pluginMap.keySet()) {
+                if (availablePlugins.get(pname) == null) pluginsToRemove.add(pname);
+            }
+            
+            for (String pname : pluginsToRemove) {
+                pluginMap.remove(pname);
+            }
+        }
 
         pluginPanel.removeAll();