Changeset 3818 in josm

Timestamp:

2011-01-25T18:42:01+01:00 (12 years ago)

Author:

bastiK

Message:

fixed #5857 - add "closed" to search, fixed #5015 - logical AND & for search tool

Location:

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

Files:

• PushbackTokenizer.java (modified) (4 diffs)
• SearchCompiler.java (modified) (2 diffs)

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

@@ -4 +4 @@
 import static org.openstreetmap.josm.tools.I18n.marktr;
 import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.Utils.equal;
 
 import java.io.IOException;
@@ -132 +133 @@
             getChar();
             return Token.OR;
+        case '&':
+            getChar();
+            return nextToken();
         case '?':
             getChar();
@@ -151 +155 @@
             if ("or".equalsIgnoreCase(currentText))
                 return Token.OR;
+            if ("and".equalsIgnoreCase(currentText))
+                return nextToken();
             try {
                 currentNumber = Long.parseLong(currentText);
@@ -172 +178 @@
     public boolean readIfEqual(Token token) {
         Token nextTok = nextToken();
-        if (nextTok == null ? token == null : nextTok == token)
+        if (equal(nextTok, token))
             return true;
         currentToken = nextTok;

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

@@ -573 +573 @@
         }
         @Override public String toString() {return "untagged";}
+    }
+
+    private static class Closed extends Match {
+        @Override public boolean match(OsmPrimitive osm) {
+            return osm instanceof Way && ((Way) osm).isClosed();
+        }
+        @Override public String toString() {return "closed";}
     }
 
@@ -710 +717 @@
             else if ("selected".equals(key))
                 return new Selected();
+            else if ("closed".equals(key))
+                return new Closed();
             else if ("child".equals(key))
                 return new Child(parseFactor());