From ad0e192d8490621881c3222ecdb00a2359096096 Mon Sep 17 00:00:00 2001 From: Enrico Joerns Date: Thu, 10 Apr 2014 19:10:21 +0200 Subject: [PATCH] [cooja] plugins/Visualizer: Replaced multiple if-string with switch over strings --- .../contikios/cooja/plugins/Visualizer.java | 59 +++++++++---------- 1 file changed, 28 insertions(+), 31 deletions(-) diff --git a/tools/cooja/java/org/contikios/cooja/plugins/Visualizer.java b/tools/cooja/java/org/contikios/cooja/plugins/Visualizer.java index 6e6e5c2e9..733bafa6f 100644 --- 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 class Visualizer extends VisPlugin implements HasQuickHelp { 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 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 skinClass : visualizerSkins) { if (wanted.equals(skinClass.getName()) /* Backwards compatibility */ || wanted.equals(Cooja.getDescriptionOf(skinClass))) { @@ -1498,35 +1497,33 @@ public class Visualizer extends VisPlugin implements HasQuickHelp { 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;