Changeset 2070 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java

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.

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java

@@ -201 +201 @@
             User user = (User)infoObject;
             try {
-                return getBaseUserUrl() + "/" + URLEncoder.encode(user.name, "UTF-8");
+                return getBaseUserUrl() + "/" + URLEncoder.encode(user.getName(), "UTF-8");
             } catch(UnsupportedEncodingException e) {
                 e.printStackTrace();
@@ -251 +251 @@
             if (count < o.count) return 1;
             if (count > o.count) return -1;
-            if (user== null || user.name == null) return 1;
-            if (o.user == null || o.user.name == null) return -1;
-            return user.name.compareTo(o.user.name);
+            if (user== null || user.getName() == null) return 1;
+            if (o.user == null || o.user.getName() == null) return -1;
+            return user.getName().compareTo(o.user.getName());
         }
 
         public String getName() {
             if (user == null) return null;
-            return user.name;
+            return user.getName();
         }
     }