Changeset 7012 in josm for trunk/src/org/openstreetmap/josm/plugins

Timestamp:

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

Author:

Don-vip

Message:

see #8465 - use String switch/case where applicable

File:

• trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/plugins/PluginHandler.java

@@ -351 +351 @@
         // check whether automatic update at startup was disabled
         //
-        String policy = Main.pref.get(togglePreferenceKey, "ask");
-        policy = policy.trim().toLowerCase();
-        if ("never".equals(policy)) {
+        String policy = Main.pref.get(togglePreferenceKey, "ask").trim().toLowerCase();
+        switch(policy) {
+        case "never":
             if ("pluginmanager.version-based-update.policy".equals(togglePreferenceKey)) {
                 Main.info(tr("Skipping plugin update after JOSM upgrade. Automatic update at startup is disabled."));
@@ -360 +360 @@
             }
             return false;
-        }
-
-        if ("always".equals(policy)) {
+
+        case "always":
             if ("pluginmanager.version-based-update.policy".equals(togglePreferenceKey)) {
                 Main.info(tr("Running plugin update after JOSM upgrade. Automatic update at startup is enabled."));
@@ -369 +368 @@
             }
             return true;
-        }
-
-        if (!"ask".equals(policy)) {
+            
+        case "ask":
+            break;
+
+        default:
             Main.warn(tr("Unexpected value ''{0}'' for preference ''{1}''. Assuming value ''ask''.", policy, togglePreferenceKey));
         }
+
         int ret = HelpAwareOptionPane.showOptionDialog(
                 parent,