Changeset 2070 in josm for trunk/src/org/openstreetmap/josm/actions/search

Timestamp:

2009-09-06T23:07:33+02:00 (17 years ago)

Author:

Gubaer

Message:

new: rewrite of CombineWay action
new: conflict resolution dialog for CombineWay, including conflicts for different relation memberships
cleanup: cleanup in OsmReader, reduces memory footprint and reduces parsing time
cleanup: made most of the public fields in OsmPrimitive @deprecated, added accessors and changed the code
cleanup: replaced usages of @deprecated constructors for ExtendedDialog
fixed #3208: Combine ways brokes relation order

WARNING: this changeset touches a lot of code all over the code base. "latest" might become slightly unstable in the next days. Also experience incompatibility issues with plugins in the next few days.

Location:

trunk/src/org/openstreetmap/josm/actions/search

Files:

• SearchAction.java (modified) (1 diff)
• SearchCompiler.java (modified) (4 diffs)

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

@@ -118 +118 @@
         p.add(left);
         p.add(right);
-
-        int result = new ExtendedDialog(Main.parent,
+        ExtendedDialog dialog = new ExtendedDialog(
+                Main.parent,
                 tr("Search"),
-                p,
-                new String[] {tr("Start Search"), tr("Cancel")},
-                new String[] {"dialogs/search.png", "cancel.png"}).getValue();
+                new String[] {tr("Start Search"), tr("Cancel")}
+        );
+        dialog.setButtonIcons(new String[] {"dialogs/search.png", "cancel.png"});
+        dialog.setContent(p);
+        dialog.showDialog();
+        int result = dialog.getValue();
+
         if(result != 1) return;
 

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

@@ -7 +7 @@
 import java.io.PushbackReader;
 import java.io.StringReader;
+import java.util.List;
 import java.util.Map.Entry;
 import java.util.regex.Matcher;
@@ -82 +83 @@
         public Id(long id) {this.id = id;}
         @Override public boolean match(OsmPrimitive osm) {
-            return osm.id == id;
+            return osm.getId() == id;
         }
         @Override public String toString() {return "id="+id;}
@@ -329 +330 @@
             }
             if (osm.user != null) {
-                String name = osm.user.name;
+                String name = osm.user.getName();
                 // is not Java 1.5
                 //String name = java.text.Normalizer.normalize(name, java.text.Normalizer.Form.NFC);
@@ -364 +365 @@
     private static class UserMatch extends Match {
         private User user;
-        public UserMatch(String user) { this.user = User.get(user); }
-        @Override public boolean match(OsmPrimitive osm) {
-            return osm.user == user;
-        }
-        @Override public String toString() { return "user=" + user.name; }
+        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;
+            }
+        }
+        @Override public boolean match(OsmPrimitive osm) {
+            if (osm.user == null && user == null) return true;
+            if (osm.user == null) return false;
+            return osm.user.equals(user);
+        }
+        @Override public String toString() {
+            return "user=" + user == null ? "" : user.getName();
+        }
     }