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

Timestamp:

2009-12-28T13:01:26+01:00 (15 years ago)

Author:

Gubaer

Message:

fixed #4241: Add the ability to use JOSM Search to find an object version

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

@@ -126 +126 @@
                     + "<li>"+tr("<b>user:anonymous</b> - all objects changed by anonymous users")+"</li>"
                     + "<li>"+tr("<b>id:</b>... - object with given ID (0 for new objects)")+"</li>"
+                    + "<li>"+tr("<b>version:</b>... - object with given version (0 objects without an assigned version)")+"</li>"
                     + "<li>"+tr("<b>changeset:</b>... - object with given changeset id (0 objects without assigned changeset)")+"</li>"
                     + "<li>"+tr("<b>nodes:</b>... - object with given number of nodes (nodes:count or nodes:min-max)")+"</li>"

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

@@ -111 +111 @@
         }
         @Override public String toString() {return "changeset="+changesetid;}
+    }
+
+    private static class Version extends Match {
+        private long version;
+        public Version(long version) {this.version = version;}
+        @Override public boolean match(OsmPrimitive osm) {
+            return osm.getVersion() == version;
+        }
+        @Override public String toString() {return "version="+version;}
     }
 
@@ -708 +717 @@
                 throw new ParseError(tr("Incorrect value of changeset operator: {0}. Number is expected.", value));
             }
-        } else
+
+        }   else if (key.equals("version")) {
+            try {
+                return new Version(Long.parseLong(value));
+            } catch (NumberFormatException x) {
+                throw new ParseError(tr("Incorrect value of version operator: {0}. Number is expected.", value));
+            }
+        }
+        else
             return new KeyValue(key, value, regexSearch, caseSensitive);
     }