Changeset 11906 in josm for trunk/src/org

Timestamp:

2017-04-14T21:29:52+02:00 (7 years ago)

Author:

stoecker

Message:

fix NPE caused by variable case mismatch exposed by r11901

File:

• trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java (modified) (1 diff)

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

@@ -118 +118 @@
      * verified pair of user name and user id.
      *
-     * @param username the user name. Must not be null. Must not be empty.
-     * @param userinfo additional information about the user, retrieved from the OSM server and including the user id
+     * @param userName the user name. Must not be null. Must not be empty.
+     * @param userInfo additional information about the user, retrieved from the OSM server and including the user id
      * @throws IllegalArgumentException if userName is null
      * @throws IllegalArgumentException if userName is empty
-     * @throws IllegalArgumentException if userinfo is null
-     */
-    public void setFullyIdentified(String username, UserInfo userinfo) {
-        CheckParameterUtil.ensureParameterNotNull(username, "username");
+     * @throws IllegalArgumentException if userInfo is null
+     */
+    public void setFullyIdentified(String userName, UserInfo userInfo) {
+        CheckParameterUtil.ensureParameterNotNull(userName, "userName");
         String trimmedUserName = userName.trim();
         if (trimmedUserName.isEmpty())
             throw new IllegalArgumentException(tr("Expected non-empty value for parameter ''{0}'', got ''{1}''", "userName", userName));
-        CheckParameterUtil.ensureParameterNotNull(userinfo, "userinfo");
+        CheckParameterUtil.ensureParameterNotNull(userInfo, "userInfo");
         this.userName = trimmedUserName;
-        this.userInfo = userinfo;
+        this.userInfo = userInfo;
     }