Changeset 8896 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2015-10-18T13:31:21+02:00 (9 years ago)

Author:

simon04

Message:

see #10465 - SearchAction: drop isRole since role does the same

Location:

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

Files:

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

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

@@ -420 +420 @@
                 .addKeyword("parent <i>expr</i>", "parent ", tr("all parents of objects matching the expression"), "parent bus_stop")
                 .addKeyword("hasRole:<i>stop</i>", "hasRole:", tr("relation containing a member of role <i>stop</i>"))
-                .addKeyword("isRole:<i>stop</i>", "isRole:", tr("objects being part of a relation as role <i>stop</i>"))
+                .addKeyword("role:<i>stop</i>", "role:", tr("objects being part of a relation as role <i>stop</i>"))
                 .addKeyword("nth:<i>7</i>", "nth:",
                         tr("n-th member of relation and/or n-th node of way"), "nth:5 (child type:relation)", "nth:-1")

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

@@ -159 +159 @@
                     case "hasRole":
                         return new HasRole(tokenizer);
-                    case "isRole":
-                        return new IsRole(tokenizer);
                     case "timestamp":
                         // add leading/trailing space in order to get expected split (e.g. "a--" => {"a", ""})
@@ -1144 +1142 @@
         public boolean match(OsmPrimitive osm) {
             return osm instanceof Relation && ((Relation) osm).getMemberRoles().contains(role);
-        }
-    }
-
-    /**
-     * Matches object which are part of a relation with the given role
-     */
-    private static class IsRole extends Match {
-        private final String role;
-
-        IsRole(PushbackTokenizer tokenizer) {
-            role = tokenizer.readTextOrNumber();
-        }
-
-        @Override
-        public boolean match(final OsmPrimitive osm) {
-            for (final OsmPrimitive ref : osm.getReferrers()) {
-                if (ref instanceof Relation && Utils.exists(((Relation) ref).getMembers(), new Predicate<RelationMember>() {
-                    @Override
-                    public boolean evaluate(RelationMember object) {
-                        return osm.equals(object.getMember()) && role.equals(object.getRole());
-                    }
-                })) {
-                    return true;
-                }
-            }
-            return false;
         }
     }