[cooja] plugins/Visualizer: Replaced multiple if-string with switch over

strings
contiki-os · Apr 11, 2014 · ad0e192 · ad0e192
1 parent cef3c40
commit ad0e192
Showing 1 changed file with 28 additions and 31 deletions.
diff --git a/tools/cooja/java/org/contikios/cooja/plugins/Visualizer.java b/tools/cooja/java/org/contikios/cooja/plugins/Visualizer.java
@@ -1477,14 +1477,13 @@ public boolean setConfigXML(Collection<Element> configXML, boolean visAvailable)
     showMoteToMoteRelations = false;
 
     for (Element element : configXML) {
-      if (element.getName().equals("skin")) {
-        String wanted = element.getText();
-        /* Backwards compatibility: se.sics -> org.contikios */
-        if (wanted.startsWith("se.sics")) {
-          wanted = wanted.replaceFirst("se\\.sics", "org.contikios");
-        }
-
-        for (Class<? extends VisualizerSkin> skinClass : visualizerSkins) {
+      switch (element.getName()) {
+        case "skin":
+          String wanted = element.getText();
+          /* Backwards compatibility: se.sics -> org.contikios */
+          if (wanted.startsWith("se.sics")) {
+            wanted = wanted.replaceFirst("se\\.sics", "org.contikios");
+          } for (Class<? extends VisualizerSkin> skinClass : visualizerSkins) {
           if (wanted.equals(skinClass.getName())
                   /* Backwards compatibility */
                   || wanted.equals(Cooja.getDescriptionOf(skinClass))) {
@@ -1498,35 +1497,33 @@ public void run() {
             wanted = null;
             break;
           }
-        }
-        if (wanted != null) {
+        } if (wanted != null) {
           logger.warn("Could not load visualizer: " + element.getText());
-        }
-      }
-      else if (element.getName().equals("moterelations")) {
-        showMoteToMoteRelations = true;
-      }
-      else if (element.getName().equals("viewport")) {
-        try {
-          String[] matrix = element.getText().split(" ");
-          viewportTransform.setTransform(
-                  Double.parseDouble(matrix[0]),
+        } break;
+        case "moterelations":
+          showMoteToMoteRelations = true;
+          break;
+        case "viewport":
+          try {
+            String[] matrix = element.getText().split(" ");
+            viewportTransform.setTransform(
+                    Double.parseDouble(matrix[0]),
                   Double.parseDouble(matrix[1]),
                   Double.parseDouble(matrix[2]),
                   Double.parseDouble(matrix[3]),
                   Double.parseDouble(matrix[4]),
                   Double.parseDouble(matrix[5])
-          );
-          resetViewport = 0;
-        }
-        catch (NumberFormatException e) {
-          logger.warn("Bad viewport: " + e.getMessage());
-          resetViewport();
-        }
-      }
-      else if (element.getName().equals("hidden")) {
-        BasicInternalFrameUI ui = (BasicInternalFrameUI) getUI();
-        ui.getNorthPane().setPreferredSize(new Dimension(0, 0));
+            );
+            resetViewport = 0;
+          }
+          catch (NumberFormatException e) {
+            logger.warn("Bad viewport: " + e.getMessage());
+            resetViewport();
+          } break;
+        case "hidden":
+          BasicInternalFrameUI ui = (BasicInternalFrameUI) getUI();
+          ui.getNorthPane().setPreferredSize(new Dimension(0, 0));
+          break;
       }
     }
     return true;