Changeset 4602 in josm for trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java

Timestamp:

2011-11-20T20:47:15+01:00 (14 years ago)

Author:

bastiK

Message:

upgrade historic users to real users, so their CT status can be shown in the history panel

File:

• trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/history/VersionInfoPanel.java

@@ -19 +19 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.AbstractInfoAction;
+import org.openstreetmap.josm.data.osm.User;
 import org.openstreetmap.josm.data.osm.history.HistoryOsmPrimitive;
 import org.openstreetmap.josm.gui.JMultilineLabel;
@@ -135 +136 @@
 
             try {
-                if (getPrimitive().getUid() != -1) {
-                    url = AbstractInfoAction.getBaseUserUrl() + "/" +  URLEncoder.encode(getPrimitive().getUser(), "UTF-8").replaceAll("\\+", "%20");
+                if (getPrimitive().getUser() != null && getPrimitive().getUser() != User.getAnonymous()) {
+                    url = AbstractInfoAction.getBaseUserUrl() + "/" +  URLEncoder.encode(getPrimitive().getUser().getName(), "UTF-8").replaceAll("\\+", "%20");
                     lblUser.setUrl(url);
                 } else {
@@ -145 +146 @@
                 lblUser.setUrl(null);
             }
-            String username = getPrimitive().getUser();
+            String username = "";
+            if (getPrimitive().getUser() != null) {
+                username = getPrimitive().getUser().getName();
+            }
             lblUser.setDescription(username);
         } else {