Changeset 2863 in josm for trunk/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java

Timestamp:

2010-01-15T21:58:46+01:00 (14 years ago)

Author:

jttt

Message:

Fixed #4377 routes plugin search for user names defect, added boolean search operator

File:

• trunk/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java (modified) (4 diffs)

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

@@ -1 +1 @@
 // License: GPL. Copyright 2007 by Immanuel Scholz and others
 package org.openstreetmap.josm.actions.search;
+
+import static org.openstreetmap.josm.tools.I18n.marktr;
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.io.IOException;
@@ -19 +22 @@
     }
 
-    public enum Token {NOT, OR, LEFT_PARENT, RIGHT_PARENT, COLON, EQUALS, KEY, EOF}
+    public enum Token {
+        NOT(marktr("<not>")), OR(marktr("<or>")), LEFT_PARENT(marktr("<left parent>")),
+        RIGHT_PARENT(marktr("<right parent>")), COLON(marktr("<colon>")), EQUALS(marktr("<equals>")),
+        KEY(marktr("<key>")), QUESTION_MARK(marktr("<question mark>")), EOF(marktr("<end-of-file>"));
+
+        private Token(String name) {
+            this.name = name;
+        }
+
+        private final String name;
+
+        @Override
+        public String toString() {
+            return tr(name);
+        }
+    }
+
 
     private void getChar() {
@@ -69 +88 @@
             getChar();
             return Token.OR;
+        case '?':
+            getChar();
+            return Token.QUESTION_MARK;
         case '"':
         {
@@ -90 +112 @@
         {
             StringBuilder s = new StringBuilder();
-            while (!(c == -1 || Character.isWhitespace(c) || c == '"'|| c == ':' || c == '(' || c == ')' || c == '|' || c == '=')) {
+            while (!(c == -1 || Character.isWhitespace(c) || c == '"'|| c == ':' || c == '(' || c == ')' || c == '|' || c == '=' || c == '?')) {
                 s.append((char)c);
                 getChar();