Changeset 11901 in josm for trunk/src

Timestamp:

2017-04-14T20:23:24+02:00 (8 years ago)

Author:

Don-vip

Message:

PMD - fix some InefficientEmptyStringCheck (new in PMD 5.5.5)

File:

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

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

@@ -97 +97 @@
 
     /**
-     * Remebers the fact that the current JOSM user is partially identified
+     * Remembers the fact that the current JOSM user is partially identified
      * by the user name of its OSM account.
      *
@@ -106 +106 @@
     public void setPartiallyIdentified(String userName) {
         CheckParameterUtil.ensureParameterNotNull(userName, "userName");
-        if (userName.trim().isEmpty())
+        String trimmedUserName = userName.trim();
+        if (trimmedUserName.isEmpty())
             throw new IllegalArgumentException(
                     MessageFormat.format("Expected non-empty value for parameter ''{0}'', got ''{1}''", "userName", userName));
-        this.userName = userName;
+        this.userName = trimmedUserName;
         userInfo = null;
     }
@@ -125 +126 @@
     public void setFullyIdentified(String username, UserInfo userinfo) {
         CheckParameterUtil.ensureParameterNotNull(username, "username");
-        if (username.trim().isEmpty())
+        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");
-        this.userName = username;
+        this.userName = trimmedUserName;
         this.userInfo = userinfo;
     }