Changeset 7012 in josm for trunk/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java

Timestamp:

2014-04-27T15:35:47+02:00 (11 years ago)

Author:

Don-vip

Message:

see #8465 - use String switch/case where applicable

File:

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

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

@@ -240 +240 @@
     @Override
     public void preferenceChanged(PreferenceChangeEvent evt) {
-        if ("osm-server.username".equals(evt.getKey())) {
+        switch (evt.getKey()) {
+        case "osm-server.username":
             if (!(evt.getNewValue() instanceof StringSetting)) return;
-            String newValue = ((StringSetting) evt.getNewValue()).getValue();
-            if (newValue == null || newValue.trim().length() == 0) {
+            String newUserName = ((StringSetting) evt.getNewValue()).getValue();
+            if (newUserName == null || newUserName.trim().isEmpty()) {
                 setAnonymous();
             } else {
-                if (! newValue.equals(userName)) {
-                    setPartiallyIdentified(newValue);
+                if (! newUserName.equals(userName)) {
+                    setPartiallyIdentified(newUserName);
                 }
             }
             return;
 
-        } else if ("osm-server.url".equals(evt.getKey())) {
+        case "osm-server.url":
             if (!(evt.getNewValue() instanceof StringSetting)) return;
-            String newValue = ((StringSetting) evt.getNewValue()).getValue();
-            if (newValue == null || newValue.trim().isEmpty()) {
+            String newUrl = ((StringSetting) evt.getNewValue()).getValue();
+            if (newUrl == null || newUrl.trim().isEmpty()) {
                 setAnonymous();
             } else if (isFullyIdentified()) {
                 setPartiallyIdentified(getUserName());
             }
-
-        } else if ("oauth.access-token.key".equals(evt.getKey())) {
+            break;
+
+        case "oauth.access-token.key":
             accessTokenKeyChanged = true;
-
-        } else if ("oauth.access-token.secret".equals(evt.getKey())) {
+            break;
+
+        case "oauth.access-token.secret":
             accessTokenSecretChanged = true;
+            break;
         }