Changeset 7012 in josm for trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java

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/actions/AutoScaleAction.java (modified) (13 diffs)

trunk/src/org/openstreetmap/josm/actions/AutoScaleAction.java

@@ -96 +96 @@
         int shortcut = -1;
 
+        // TODO: convert this to switch/case and make sure the parsing still works
         /* leave as single line for shortcut overview parsing! */
         if (mode.equals("data")) { shortcut = KeyEvent.VK_1; }
@@ -130 +131 @@
         putValue("help", "Action/AutoScale/" + modeHelp);
         this.mode = mode;
-        if (mode.equals("data")) {
+        switch (mode) {
+        case "data":
             putValue("help", ht("/Action/ZoomToData"));
-        } else if (mode.equals("layer")) {
+            break;
+        case "layer":
             putValue("help", ht("/Action/ZoomToLayer"));
-        } else if (mode.equals("selection")) {
+            break;
+        case "selection":
             putValue("help", ht("/Action/ZoomToSelection"));
-        } else if (mode.equals("conflict")) {
+            break;
+        case "conflict":
             putValue("help", ht("/Action/ZoomToConflict"));
-        } else if (mode.equals("problem")) {
+            break;
+        case "problem":
             putValue("help", ht("/Action/ZoomToProblem"));
-        } else if (mode.equals("download")) {
+            break;
+        case "download":
             putValue("help", ht("/Action/ZoomToDownload"));
-        } else if (mode.equals("previous")) {
+            break;
+        case "previous":
             putValue("help", ht("/Action/ZoomToPrevious"));
-        } else if (mode.equals("next")) {
+            break;
+        case "next":
             putValue("help", ht("/Action/ZoomToNext"));
-        } else {
+            break;
+        default:
             throw new IllegalArgumentException("Unknown mode: "+mode);
         }
@@ -154 +164 @@
     public void autoScale()  {
         if (Main.isDisplayingMapView()) {
-            if (mode.equals("previous")) {
+            switch(mode) {
+            case "previous":
                 Main.map.mapView.zoomPrevious();
-            } else if (mode.equals("next")) {
+                break;
+            case "next":
                 Main.map.mapView.zoomNext();
-            } else {
+                break;
+            default:
                 BoundingXYVisitor bbox = getBoundingBox();
                 if (bbox != null && bbox.getBounds() != null) {
@@ -187 +200 @@
 
     private BoundingXYVisitor getBoundingBox() {
-        BoundingXYVisitor v = mode.equals("problem") ? new ValidatorBoundingXYVisitor() : new BoundingXYVisitor();
-
-        if (mode.equals("problem")) {
+        BoundingXYVisitor v = "problem".equals(mode) ? new ValidatorBoundingXYVisitor() : new BoundingXYVisitor();
+
+        switch(mode) {
+        case "problem":
             TestError error = Main.map.validatorDialog.getSelectedError();
             if (error == null) return null;
@@ -195 +209 @@
             if (v.getBounds() == null) return null;
             v.enlargeBoundingBox(Main.pref.getDouble("validator.zoom-enlarge-bbox", 0.0002));
-        } else if (mode.equals("data")) {
+            break;
+        case "data":
             for (Layer l : Main.map.mapView.getAllLayers()) {
                 l.visitBoundingBox(v);
             }
-        } else if (mode.equals("layer")) {
+            break;
+        case "layer":
             if (Main.main.getActiveLayer() == null)
                 return null;
@@ -206 +222 @@
             if (l == null) return null;
             l.visitBoundingBox(v);
-        } else if (mode.equals("selection") || mode.equals("conflict")) {
+            break;
+        case "selection":
+        case "conflict":
             Collection<OsmPrimitive> sel = new HashSet<>();
-            if (mode.equals("selection")) {
+            if ("selection".equals(mode)) {
                 sel = getCurrentDataSet().getSelected();
-            } else if (mode.equals("conflict")) {
+            } else {
                 Conflict<? extends OsmPrimitive> c = Main.map.conflictDialog.getSelectedConflict();
                 if (c != null) {
@@ -221 +239 @@
                 JOptionPane.showMessageDialog(
                         Main.parent,
-                        (mode.equals("selection") ? tr("Nothing selected to zoom to.") : tr("No conflicts to zoom to")),
+                        ("selection".equals(mode) ? tr("Nothing selected to zoom to.") : tr("No conflicts to zoom to")),
                         tr("Information"),
                         JOptionPane.INFORMATION_MESSAGE
@@ -236 +254 @@
             // ensure reasonable zoom level when zooming onto single nodes.
             v.enlargeToMinDegrees(0.0005);
-        } else if (mode.equals("download")) {
+            break;
+        case "download":
             Bounds bounds = DownloadDialog.getSavedDownloadBounds();
             if (bounds != null) {
@@ -245 +264 @@
                 }
             }
+            break;
         }
         return v;
@@ -251 +271 @@
     @Override
     protected void updateEnabledState() {
-        if ("selection".equals(mode)) {
+        switch(mode) {
+        case "selection":
             setEnabled(getCurrentDataSet() != null && ! getCurrentDataSet().getSelected().isEmpty());
-        }  else if ("layer".equals(mode)) {
+            break;
+        case "layer":
             if (!Main.isDisplayingMapView() || Main.map.mapView.getAllLayersAsList().isEmpty()) {
                 setEnabled(false);
@@ -260 +282 @@
                 setEnabled(true);
             }
-        } else if ("conflict".equals(mode)) {
+            break;
+        case "conflict":
             setEnabled(Main.map != null && Main.map.conflictDialog.getSelectedConflict() != null);
-        } else if ("problem".equals(mode)) {
+            break;
+        case "problem":
             setEnabled(Main.map != null && Main.map.validatorDialog.getSelectedError() != null);
-        } else if ("previous".equals(mode)) {
+            break;
+        case "previous":
             setEnabled(Main.isDisplayingMapView() && Main.map.mapView.hasZoomUndoEntries());
-        } else if ("next".equals(mode)) {
+            break;
+        case "next":
             setEnabled(Main.isDisplayingMapView() && Main.map.mapView.hasZoomRedoEntries());
-        } else {
-            setEnabled(
-                    Main.isDisplayingMapView()
-                    && Main.map.mapView.hasLayers()
+            break;
+        default:
+            setEnabled(Main.isDisplayingMapView() && Main.map.mapView.hasLayers()
             );
         }
@@ -311 +336 @@
 
         public MapFrameAdapter() {
-            if (mode.equals("conflict")) {
+            if ("conflict".equals(mode)) {
                 conflictSelectionListener = new ListSelectionListener() {
                     @Override public void valueChanged(ListSelectionEvent e) {
@@ -317 +342 @@
                     }
                 };
-            } else if (mode.equals("problem")) {
+            } else if ("problem".equals(mode)) {
                 validatorSelectionListener = new TreeSelectionListener() {
                     @Override public void valueChanged(TreeSelectionEvent e) {