Changeset 9527 in josm for trunk

Timestamp:

2016-01-18T20:08:51+01:00 (9 years ago)

Author:

simon04

Message:

fix #10306 - Changeset manager does not know username of current uploaded and open changeset

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java (modified) (1 diff)
• src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/gui/JosmUserIdentityManagerTest.groovy (modified) (7 diffs)

trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java

@@ -189 +189 @@
 
     /**
+     * Returns the identity as a {@link User} object
+     *
+     * @return the identity as user, or {@link User#getAnonymous()} if {@link #isAnonymous()}
+     */
+    public User asUser() {
+        return isAnonymous() ? User.getAnonymous() : User.createOsmUser(userInfo != null ? userInfo.getId() : 0, userName);
+    }
+
+    /**
      * Initializes the user identity manager from Basic Authentication values in the {@link org.openstreetmap.josm.data.Preferences}
      * This method should be called if {@code osm-server.auth-method} is set to {@code basic}.

trunk/src/org/openstreetmap/josm/gui/io/UploadPrimitivesTask.java

@@ -26 +26 @@
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
+import org.openstreetmap.josm.gui.JosmUserIdentityManager;
 import org.openstreetmap.josm.gui.Notification;
 import org.openstreetmap.josm.gui.layer.OsmDataLayer;
@@ -294 +295 @@
                 }
             }
+            // update the user information
+            if (changeset.getUser() == null) {
+                changeset.setUser(JosmUserIdentityManager.getInstance().asUser());
+            }
             // if required close the changeset
             //

trunk/test/unit/org/openstreetmap/josm/gui/JosmUserIdentityManagerTest.groovy

@@ -1 +1 @@
 // License: GPL. For details, see LICENSE file.
-package org.openstreetmap.josm.gui;
+package org.openstreetmap.josm.gui
+
+import org.openstreetmap.josm.data.osm.User;
 
 import static org.junit.Assert.*
@@ -50 +52 @@
         assert im.getUserName() == null
         assert im.getUserInfo() == null
+        assert im.asUser() == User.anonymous
     }
 
@@ -79 +82 @@
         assert im.getUserName() == "test"
         assert im.getUserInfo() == null
+        assert im.asUser() == new User(0, "test")
     }
 
@@ -112 +116 @@
         assert im.getUserName() == "test"
         assert im.getUserInfo() == userInfo
+        assert im.asUser() == new User(1, "test")
     }
 
@@ -285 +290 @@
         Main.pref.put "osm-server.username", null
         assert im.isAnonymous()
+        assert im.asUser() == User.anonymous
 
         // reset it
@@ -293 +299 @@
         assert im.isPartiallyIdentified()
         assert im.getUserName() == "test2"
+        assert im.asUser() == new User(0, "test2")
 
         Main.pref.put "osm-server.username", null
@@ -304 +311 @@
         assert im.isPartiallyIdentified()
         assert im.getUserName() == "test2"
+        assert im.asUser() == new User(0, "test2")
 
         // reset it