Changeset 4546 in josm for trunk/src/org/openstreetmap/josm/actions/search

Timestamp:

2011-10-29T09:01:30+02:00 (12 years ago)

Author:

jttt

Message:

Extend name templates with context switch - possibility to use tags of referenced primitive when constructing primitive name

File:

• trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java (modified) (15 diffs)

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

@@ -69 +69 @@
         protected boolean existsMatch(Collection<? extends OsmPrimitive> primitives) {
             for (OsmPrimitive p : primitives) {
-                if (match(p)) {
+                if (match(p))
                     return true;
-                }
             }
             return false;
@@ -81 +80 @@
         protected boolean forallMatch(Collection<? extends OsmPrimitive> primitives) {
             for (OsmPrimitive p : primitives) {
-                if (!match(p)) {
+                if (!match(p))
                     return false;
-                }
             }
             return true;
@@ -110 +108 @@
         }
         @Override public String toString() {return "!"+match;}
+        public Match getMatch() {
+            return match;
+        }
     }
 
@@ -130 +131 @@
     }
 
-    private static class And extends Match {
-        private Match lhs;
-        private Match rhs;
+    public static class And extends Match {
+        private final Match lhs;
+        private final Match rhs;
         public And(Match lhs, Match rhs) {this.lhs = lhs; this.rhs = rhs;}
         @Override public boolean match(OsmPrimitive osm) {
@@ -138 +139 @@
         }
         @Override public String toString() {return lhs+" && "+rhs;}
-    }
-
-    private static class Or extends Match {
-        private Match lhs;
-        private Match rhs;
+        public Match getLhs() {
+            return lhs;
+        }
+        public Match getRhs() {
+            return rhs;
+        }
+    }
+
+    public static class Or extends Match {
+        private final Match lhs;
+        private final Match rhs;
         public Or(Match lhs, Match rhs) {this.lhs = lhs; this.rhs = rhs;}
         @Override public boolean match(OsmPrimitive osm) {
@@ -148 +155 @@
         }
         @Override public String toString() {return lhs+" || "+rhs;}
+        public Match getLhs() {
+            return lhs;
+        }
+        public Match getRhs() {
+            return rhs;
+        }
     }
 
@@ -552 +565 @@
         public boolean match(OsmPrimitive osm) {
             Integer count = getCount(osm);
-            if (count == null) {
+            if (count == null)
                 return false;
-            } else {
+            else
                 return (count >= minCount) && (count <= maxCount);
-            }
         }
 
@@ -575 +587 @@
         @Override
         protected Integer getCount(OsmPrimitive osm) {
-            if (!(osm instanceof Way)) {
+            if (!(osm instanceof Way))
                 return null;
-            } else {
+            else
                 return ((Way) osm).getNodesCount();
-            }
         }
 
@@ -649 +660 @@
     }
 
-    private static class Parent extends Match {
-        private Match child;
-        public Parent(Match m) { child = m; }
+    public static class Parent extends Match {
+        private final Match child;
+        public Parent(Match m) {
+            if (m == null) {
+                // "parent" (null) should mean the same as "parent()"
+                // (Always). I.e. match everything
+                child = new Always();
+            } else {
+                child = m;
+            }
+        }
         @Override public boolean match(OsmPrimitive osm) {
             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) {
@@ -673 +686 @@
         }
         @Override public String toString() {return "parent(" + child + ")";}
-    }
-
-    private static class Child extends Match {
+        public Match getChild() {
+            return child;
+        }
+    }
+
+    public static class Child extends Match {
         private final Match parent;
 
@@ -696 +712 @@
         }
         @Override public String toString() {return "child(" + parent + ")";}
-    }
-    
+
+        public Match getParent() {
+            return parent;
+        }
+    }
+
     /**
      * Matches on the area of a closed way.
-     * 
+     *
      * @author Ole Jørgen Brønner
      */
@@ -711 +731 @@
         @Override
         protected Integer getCount(OsmPrimitive osm) {
-            if (!(osm instanceof Way && ((Way) osm).isClosed())) {
+            if (!(osm instanceof Way && ((Way) osm).isClosed()))
                 return null;
-            }
             Way way = (Way) osm;
             return (int) Geometry.closedWayArea(way);
@@ -743 +762 @@
         @Override
         public boolean match(OsmPrimitive osm) {
-            if (!osm.isUsable()) {
+            if (!osm.isUsable())
                 return false;
-            } else if (osm instanceof Node) {
+            else if (osm instanceof Node)
                 return bounds.contains(((Node) osm).getCoor());
-            } else if (osm instanceof Way) {
+            else if (osm instanceof Way) {
                 Collection<Node> nodes = ((Way) osm).getNodes();
                 return all ? forallMatch(nodes) : existsMatch(nodes);
@@ -753 +772 @@
                 Collection<OsmPrimitive> primitives = ((Relation) osm).getMemberPrimitives();
                 return all ? forallMatch(primitives) : existsMatch(primitives);
-            } else {
+            } else
                 return false;
-            }
         }
     }
@@ -799 +817 @@
 
     public static Match compile(String searchStr, boolean caseSensitive, boolean regexSearch)
-    throws ParseError {
+            throws ParseError {
         return new SearchCompiler(caseSensitive, regexSearch,
                 new PushbackTokenizer(