Changeset 9527 in josm


Ignore:
Timestamp:
2016-01-18T20:08:51+01:00 (6 years ago)
Author:
simon04
Message:

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

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java

    r9519 r9527  
    189189
    190190    /**
     191     * Returns the identity as a {@link User} object
     192     *
     193     * @return the identity as user, or {@link User#getAnonymous()} if {@link #isAnonymous()}
     194     */
     195    public User asUser() {
     196        return isAnonymous() ? User.getAnonymous() : User.createOsmUser(userInfo != null ? userInfo.getId() : 0, userName);
     197    }
     198
     199    /**
    191200     * Initializes the user identity manager from Basic Authentication values in the {@link org.openstreetmap.josm.data.Preferences}
    192201     * 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

    r9078 r9527  
    2626import org.openstreetmap.josm.gui.HelpAwareOptionPane;
    2727import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
     28import org.openstreetmap.josm.gui.JosmUserIdentityManager;
    2829import org.openstreetmap.josm.gui.Notification;
    2930import org.openstreetmap.josm.gui.layer.OsmDataLayer;
     
    294295                }
    295296            }
     297            // update the user information
     298            if (changeset.getUser() == null) {
     299                changeset.setUser(JosmUserIdentityManager.getInstance().asUser());
     300            }
    296301            // if required close the changeset
    297302            //
  • trunk/test/unit/org/openstreetmap/josm/gui/JosmUserIdentityManagerTest.groovy

    r8510 r9527  
    11// License: GPL. For details, see LICENSE file.
    2 package org.openstreetmap.josm.gui;
     2package org.openstreetmap.josm.gui
     3
     4import org.openstreetmap.josm.data.osm.User;
    35
    46import static org.junit.Assert.*
     
    5052        assert im.getUserName() == null
    5153        assert im.getUserInfo() == null
     54        assert im.asUser() == User.anonymous
    5255    }
    5356
     
    7982        assert im.getUserName() == "test"
    8083        assert im.getUserInfo() == null
     84        assert im.asUser() == new User(0, "test")
    8185    }
    8286
     
    112116        assert im.getUserName() == "test"
    113117        assert im.getUserInfo() == userInfo
     118        assert im.asUser() == new User(1, "test")
    114119    }
    115120
     
    285290        Main.pref.put "osm-server.username", null
    286291        assert im.isAnonymous()
     292        assert im.asUser() == User.anonymous
    287293
    288294        // reset it
     
    293299        assert im.isPartiallyIdentified()
    294300        assert im.getUserName() == "test2"
     301        assert im.asUser() == new User(0, "test2")
    295302
    296303        Main.pref.put "osm-server.username", null
     
    304311        assert im.isPartiallyIdentified()
    305312        assert im.getUserName() == "test2"
     313        assert im.asUser() == new User(0, "test2")
    306314
    307315        // reset it
Note: See TracChangeset for help on using the changeset viewer.