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

Timestamp:

2009-12-03T23:21:53+01:00 (14 years ago)

Author:

Gubaer

Message:

applied #3738: patch by mjulius: Searching for non-existent usernames returns objects submitted by anonymous users

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

@@ -124 +124 @@
                     + "<li>"+tr("<b>type:</b> - type of the object (<b>node</b>, <b>way</b>, <b>relation</b>)")+"</li>"
                     + "<li>"+tr("<b>user:</b>... - all objects changed by user")+"</li>"
+                    + "<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>nodes:</b>... - object with given number of nodes")+"</li>"

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

@@ -389 +389 @@
         private User user;
         public UserMatch(String user) {
-            List<User> users = User.getByName(user);
-            if (!users.isEmpty()) {
-                // selecting an arbitrary user
-                this.user = users.get(0);
-            } else {
-                user = null;
-            }
-        }
+            if (user.equals("anonymous")) {
+                this.user = null;
+            } else {
+                List<User> users = User.getByName(user);
+                if (!users.isEmpty()) {
+                    // selecting an arbitrary user
+                    this.user = users.get(0);
+                } else {
+                    this.user = User.createLocalUser(user);
+                }
+            }
+        }
+
         @Override public boolean match(OsmPrimitive osm) {
             if (osm.getUser() == null && user == null) return true;
@@ -402 +407 @@
             return osm.getUser().equals(user);
         }
+
         @Override public String toString() {
             return "user=" + user == null ? "" : user.getName();