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

Timestamp:

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

Author:

Don-vip

Message:

see #8465 - use String switch/case where applicable

Location:

trunk/src/org/openstreetmap/josm/actions

Files:

• AutoScaleAction.java (modified) (13 diffs)
• CreateMultipolygonAction.java (modified) (2 diffs)
• OrthogonalizeAction.java (modified) (1 diff)
• search/SearchCompiler.java (modified) (2 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) {

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

@@ -355 +355 @@
         if( !Main.pref.getBoolean("multipoly.alltags", false) )
             for( RelationMember m : relation.getMembers() )
-                if( m.hasRole() && m.getRole().equals("outer") && m.isWay() )
+                if( m.hasRole() && "outer".equals(m.getRole()) && m.isWay() )
                     for( String key : values.keySet() )
                         if( !m.getWay().hasKey(key) && !relation.hasKey(key) )
@@ -407 +407 @@
             for (Entry<String, String> entry : values.entrySet()) {
                 String key = entry.getKey();
-                if (!r2.hasKey(key) && !key.equals("area") ) {
+                if (!r2.hasKey(key) && !"area".equals(key) ) {
                     if (relation.isNew())
                         relation.put(key, entry.getValue());

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

@@ -186 +186 @@
         } catch (InvalidUserInputException ex) {
             String msg;
-            if (ex.getMessage().equals("usage")) {
+            if ("usage".equals(ex.getMessage())) {
                 msg = "<h2>" + tr("Usage") + "</h2>" + USAGE;
             } else {

trunk/src/org/openstreetmap/josm/actions/search/SearchCompiler.java

@@ -105 +105 @@
         @Override
         public Match get(String keyword, PushbackTokenizer tokenizer) throws ParseError {
-            if ("modified".equals(keyword))
+            switch(keyword) {
+            case "modified":
                 return new Modified();
-            else if ("selected".equals(keyword))
+            case "selected":
                 return new Selected();
-            else if ("incomplete".equals(keyword))
+            case "incomplete":
                 return new Incomplete();
-            else if ("untagged".equals(keyword))
+            case "untagged":
                 return new Untagged();
-            else if ("closed".equals(keyword))
+            case "closed":
                 return new Closed();
-            else if ("new".equals(keyword))
+            case "new":
                 return new New();
-            else if ("indownloadedarea".equals(keyword))
+            case "indownloadedarea":
                 return new InDataSourceArea(false);
-            else if ("allindownloadedarea".equals(keyword))
+            case "allindownloadedarea":
                 return new InDataSourceArea(true);
-            else if ("inview".equals(keyword))
+            case "inview":
                 return new InView(false);
-            else if ("allinview".equals(keyword))
+            case "allinview":
                 return new InView(true);
-            else if (tokenizer != null) {
-                if ("id".equals(keyword))
-                    return new Id(tokenizer);
-                else if ("version".equals(keyword))
-                    return new Version(tokenizer);
-                else if ("changeset".equals(keyword))
-                    return new ChangesetId(tokenizer);
-                else if ("nodes".equals(keyword))
-                    return new NodeCountRange(tokenizer);
-                else if ("tags".equals(keyword))
-                    return new TagCountRange(tokenizer);
-                else if ("areasize".equals(keyword))
-                    return new AreaSize(tokenizer);
-                else if ("nth".equals(keyword))
-                    return new Nth(tokenizer, false);
-                else if ("nth%".equals(keyword))
-                    return new Nth(tokenizer, true);
-                else if ("timestamp".equals(keyword)) {
-                    String rangeS = " " + tokenizer.readTextOrNumber() + " "; // add leading/trailing space in order to get expected split (e.g. "a--" => {"a", ""})
-                    String[] rangeA = rangeS.split("/");
-                    if (rangeA.length == 1)
-                        return new KeyValue(keyword, rangeS.trim(), regexSearch, caseSensitive);
-                    else if (rangeA.length == 2) {
-                        String rangeA1 = rangeA[0].trim();
-                        String rangeA2 = rangeA[1].trim();
-                        long minDate = DateUtils.fromString(rangeA1.isEmpty() ? "1980" : rangeA1).getTime(); // if min timestap is empty: use lowest possible date
-                        long maxDate = rangeA2.isEmpty() ? System.currentTimeMillis() : DateUtils.fromString(rangeA2).getTime(); // if max timestamp is empty: use "now"
-                        return new TimestampRange(minDate, maxDate);
-                    } else
-                        /*
-                         * I18n: Don't translate timestamp keyword
-                         */ throw new ParseError(tr("Expecting <i>min</i>/<i>max</i> after ''timestamp''"));
+            default:
+                if (tokenizer != null) {
+                    switch (keyword) {
+                    case "id":
+                        return new Id(tokenizer);
+                    case "version":
+                        return new Version(tokenizer);
+                    case "changeset":
+                        return new ChangesetId(tokenizer);
+                    case "nodes":
+                        return new NodeCountRange(tokenizer);
+                    case "tags":
+                        return new TagCountRange(tokenizer);
+                    case "areasize":
+                        return new AreaSize(tokenizer);
+                    case "nth":
+                        return new Nth(tokenizer, false);
+                    case "nth%":
+                        return new Nth(tokenizer, true);
+                    case "timestamp":
+                        // add leading/trailing space in order to get expected split (e.g. "a--" => {"a", ""})
+                        String rangeS = " " + tokenizer.readTextOrNumber() + " ";
+                        String[] rangeA = rangeS.split("/");
+                        if (rangeA.length == 1) {
+                            return new KeyValue(keyword, rangeS.trim(), regexSearch, caseSensitive);
+                        } else if (rangeA.length == 2) {
+                            String rangeA1 = rangeA[0].trim();
+                            String rangeA2 = rangeA[1].trim();
+                            // if min timestap is empty: use lowest possible date
+                            long minDate = DateUtils.fromString(rangeA1.isEmpty() ? "1980" : rangeA1).getTime(); 
+                            // if max timestamp is empty: use "now"
+                            long maxDate = rangeA2.isEmpty() ? System.currentTimeMillis() : DateUtils.fromString(rangeA2).getTime(); 
+                            return new TimestampRange(minDate, maxDate);
+                        } else {
+                            // I18n: Don't translate timestamp keyword
+                            throw new ParseError(tr("Expecting <i>min</i>/<i>max</i> after ''timestamp''"));
+                        }
+                    }
                 }
             }
@@ -1314 +1321 @@
             value = "";
         }
-        if ("type".equals(key))
+        switch(key) {
+        case "type":
             return new ExactType(value);
-        else if ("user".equals(key))
+        case "user":
             return new UserMatch(value);
-        else if ("role".equals(key))
+        case "role":
             return new RoleMatch(value);
-        else
+        default:
             return new KeyValue(key, value, regexSearch, caseSensitive);
+        }
     }