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

Timestamp:

2014-05-09T04:49:54+02:00 (10 years ago)

Author:

Don-vip

Message:

fixes for unit tests

File:

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

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

@@ -242 +242 @@
         switch (evt.getKey()) {
         case "osm-server.username":
-            if (!(evt.getNewValue() instanceof StringSetting)) return;
-            String newUserName = ((StringSetting) evt.getNewValue()).getValue();
+            String newUserName = null;
+            if (evt.getNewValue() instanceof StringSetting) {
+                newUserName = ((StringSetting) evt.getNewValue()).getValue();
+            }
             if (newUserName == null || newUserName.trim().isEmpty()) {
                 setAnonymous();
             } else {
-                if (! newUserName.equals(userName)) {
+                if (!newUserName.equals(userName)) {
                     setPartiallyIdentified(newUserName);
                 }
@@ -254 +256 @@
 
         case "osm-server.url":
-            if (!(evt.getNewValue() instanceof StringSetting)) return;
-            String newUrl = ((StringSetting) evt.getNewValue()).getValue();
+            String newUrl = null;
+            if (evt.getNewValue() instanceof StringSetting) {
+                newUrl = ((StringSetting) evt.getNewValue()).getValue();
+            }
             if (newUrl == null || newUrl.trim().isEmpty()) {
                 setAnonymous();