Changeset 7012 in josm for trunk/src/org/openstreetmap/josm/data/osm

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/data/osm/visitor/paint/StyledMapRenderer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -916 +916 @@
 
         /* find the "from", "via" and "to" elements */
-        for (RelationMember m : r.getMembers())
-        {
+        for (RelationMember m : r.getMembers()) {
             if(m.getMember().isIncomplete())
                 return;
-            else
-            {
-                if(m.isWay())
-                {
+            else {
+                if(m.isWay()) {
                     Way w = m.getWay();
                     if(w.getNodesCount() < 2) {
@@ -929 +926 @@
                     }
 
-                    if("from".equals(m.getRole())) {
+                    switch(m.getRole()) {
+                    case "from":
                         if(fromWay == null) {
                             fromWay = w;
                         }
-                    } else if("to".equals(m.getRole())) {
+                        break;
+                    case "to":
                         if(toWay == null) {
                             toWay = w;
                         }
-                    } else if("via".equals(m.getRole())) {
+                        break;
+                    case "via":
                         if(via == null) {
                             via = w;
                         }
                     }
-                }
-                else if(m.isNode())
-                {
+                } else if(m.isNode()) {
                     Node n = m.getNode();
                     if("via".equals(m.getRole()) && via == null) {