Changeset 2973 in josm for trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java

Timestamp:

13.02.2010 17:05:37 (2 years ago)

Author:

jttt

Message:

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

File:

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

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 {