Changeset 2973 in josm

Timestamp:

13.02.2010 17:05:37 (2 years ago)

Author:

jttt

Message:

Fix #4519 JOSM doesn't show nor find token (negative) IDs

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/search/PushbackTokenizer.java (modified) (6 diffs)
• actions/search/SearchCompiler.java (modified) (3 diffs)
• gui/DefaultNameFormatter.java (modified) (2 diffs)

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

@@ -15 +15 @@
     private Token currentToken;
     private String currentText;
+    private long currentNumber;
     private int c;
 
@@ -25 +26 @@
         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>"));
+        KEY(marktr("<key>")), QUESTION_MARK(marktr("<question mark>")), NUMBER(marktr("<number>")),
+        EOF(marktr("<end-of-file>"));
 
         private Token(String name) {
@@ -46 +48 @@
             throw new RuntimeException(e.getMessage(), e);
         }
+    }
+
+    private long getNumber() {
+        long result = 0;
+        while (Character.isDigit(c)) {
+            result = result * 10 + (c - '0');
+            getChar();
+        }
+        return result;
     }
 
@@ -78 +89 @@
         case '-':
             getChar();
-            return Token.NOT;
+            if (Character.isDigit(c)) {
+                currentNumber = -1 * getNumber();
+                return Token.NUMBER;
+            } else
+                return Token.NOT;
         case '(':
             getChar();
@@ -111 +126 @@
         default:
         {
+            if (Character.isDigit(c)) {
+                currentNumber = getNumber();
+                return Token.NUMBER;
+            }
+
             StringBuilder s = new StringBuilder();
             while (!(c == -1 || Character.isWhitespace(c) || c == '"'|| c == ':' || c == '(' || c == ')' || c == '|' || c == '=' || c == '?')) {
@@ -149 +169 @@
     }
 
+    public long readNumber(String errorMessage) throws ParseError {
+        if (nextToken() == Token.NUMBER)
+            return currentNumber;
+        else
+            throw new ParseError(errorMessage);
+    }
+
     public String getText() {
         return currentText;

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

@@ -122 +122 @@
     private static class Id extends Match {
         private long id;
-        public Id(long id) {this.id = id;}
-        @Override public boolean match(OsmPrimitive osm) {
-            return osm.getId() == id;
+        public Id(long id) {
+            this.id = id;
+        }
+        @Override public boolean match(OsmPrimitive osm) {
+            return osm.getUniqueId() == id;
         }
         @Override public String toString() {return "id="+id;}
@@ -663 +665 @@
                 return new ExactKeyValue(regexSearch, key, tokenizer.readText());
             else if (tokenizer.readIfEqual(Token.COLON))
-                return parseKV(key, tokenizer.readText());
+                if ("id".equals(key))
+                    return new Id(tokenizer.readNumber(tr("Primitive id expected")));
+                else
+                    return parseKV(key, tokenizer.readText());
             else if (tokenizer.readIfEqual(Token.QUESTION_MARK))
                 return new BooleanMatch(key, false);
@@ -725 +730 @@
             }
 
-        } else if (key.equals("id")) {
-            try {
-                return new Id(Long.parseLong(value));
-            } catch (NumberFormatException x) {
-                throw new ParseError(tr("Incorrect value of id operator: {0}. Number is expected.", value));
-            }
         } else if (key.equals("changeset")) {
             try {

trunk/src/org/openstreetmap/josm/gui/DefaultNameFormatter.java

@@ -73 +73 @@
     /**
      * Decorates the name of primitive with its id, if the preference
-     * <tt>osm-primitives.showid</tt> is set.
+     * <tt>osm-primitives.showid</tt> is set. Shows unique id if osm-primitives.showid.new-primitives is set
      *
      * @param name  the name without the id
@@ -81 +81 @@
     protected String decorateNameWithId(String name, OsmPrimitive primitive) {
         if (Main.pref.getBoolean("osm-primitives.showid"))
-            return name + tr(" [id: {0}]", primitive.getId());
+            if (Main.pref.getBoolean("osm-primitives.showid.new-primitives"))
+                return name + tr(" [id: {0}]", primitive.getUniqueId());
+            else
+                return name + tr(" [id: {0}]", primitive.getId());
         else
             return name;