From 84b687efeb7a9756cd6ba53039a1db15ae0203a9 Mon Sep 17 00:00:00 2001 From: Enrico Joerns Date: Thu, 10 Apr 2014 18:50:04 +0200 Subject: [PATCH] [cooja] Automated code updates that do not make any functional changes - made loggers final - added some diamond interface cosmetic - shortened if-return statements - replaced size == 0 check with .isEmpty() --- .../org/contikios/mrm/MRMVisualizerSkin.java | 2 +- .../contikios/cooja/plugins/Visualizer.java | 30 ++++++++----------- .../plugins/skins/DGRMVisualizerSkin.java | 2 +- 3 files changed, 14 insertions(+), 20 deletions(-) diff --git a/tools/cooja/apps/mrm/java/org/contikios/mrm/MRMVisualizerSkin.java b/tools/cooja/apps/mrm/java/org/contikios/mrm/MRMVisualizerSkin.java index 12c27187d..3a9ab4ab2 100644 --- a/tools/cooja/apps/mrm/java/org/contikios/mrm/MRMVisualizerSkin.java +++ b/tools/cooja/apps/mrm/java/org/contikios/mrm/MRMVisualizerSkin.java @@ -51,7 +51,7 @@ import org.contikios.mrm.ChannelModel.TxPair; @ClassDescription("Radio environment (MRM)") @SupportedArguments(radioMediums = {MRM.class}) public class MRMVisualizerSkin implements VisualizerSkin { - private static Logger logger = Logger.getLogger(MRMVisualizerSkin.class); + private static final Logger logger = Logger.getLogger(MRMVisualizerSkin.class); private Simulation simulation = null; private Visualizer visualizer = null; diff --git a/tools/cooja/java/org/contikios/cooja/plugins/Visualizer.java b/tools/cooja/java/org/contikios/cooja/plugins/Visualizer.java index 86df645d6..b49d12d79 100644 --- a/tools/cooja/java/org/contikios/cooja/plugins/Visualizer.java +++ b/tools/cooja/java/org/contikios/cooja/plugins/Visualizer.java @@ -140,7 +140,7 @@ import org.contikios.cooja.plugins.skins.UDGMVisualizerSkin; @PluginType(PluginType.SIM_STANDARD_PLUGIN) public class Visualizer extends VisPlugin implements HasQuickHelp { private static final long serialVersionUID = 1L; - private static Logger logger = Logger.getLogger(Visualizer.class); + private static final Logger logger = Logger.getLogger(Visualizer.class); public static final int MOTE_RADIUS = 8; private static final Color[] DEFAULT_MOTE_COLORS = { Color.WHITE }; @@ -186,8 +186,8 @@ public class Visualizer extends VisPlugin implements HasQuickHelp { private Selection selection; /* Visualizers */ - private static ArrayList> visualizerSkins = - new ArrayList>(); + private static final ArrayList> visualizerSkins = + new ArrayList<>(); static { /* Register default visualizer skins */ registerVisualizerSkin(IDVisualizerSkin.class); @@ -200,13 +200,13 @@ public class Visualizer extends VisPlugin implements HasQuickHelp { registerVisualizerSkin(MoteTypeVisualizerSkin.class); registerVisualizerSkin(AttributeVisualizerSkin.class); } - private ArrayList currentSkins = new ArrayList(); + private ArrayList currentSkins = new ArrayList<>(); /* Generic visualization */ private MoteCountListener newMotesListener; private Observer posObserver = null; private Observer moteHighligtObserver = null; - private ArrayList highlightedMotes = new ArrayList(); + private ArrayList highlightedMotes = new ArrayList<>(); private final static Color HIGHLIGHT_COLOR = Color.CYAN; private final static Color MOVE_COLOR = Color.WHITE; private Observer moteRelationsObserver = null; @@ -224,9 +224,9 @@ public class Visualizer extends VisPlugin implements HasQuickHelp { } private ArrayList> simulationMenuActions = - new ArrayList>(); + new ArrayList<>(); private ArrayList> moteMenuActions = - new ArrayList>(); + new ArrayList<>(); public Visualizer(Simulation simulation, Cooja gui) { super("Network", gui); @@ -859,10 +859,7 @@ public class Visualizer extends VisPlugin implements HasQuickHelp { } } } - if (!showMenuItem) { - return false; - } - return true; + return showMenuItem; } private void handleMousePress(MouseEvent mouseEvent) { @@ -1097,7 +1094,7 @@ public class Visualizer extends VisPlugin implements HasQuickHelp { double xCoord = transformToPositionX(clickedX); double yCoord = transformToPositionY(clickedY); - ArrayList motes = new ArrayList(); + ArrayList motes = new ArrayList<>(); // Calculate painted mote radius in coordinates double paintedMoteWidth = transformToPositionX(MOTE_RADIUS) @@ -1118,7 +1115,7 @@ public class Visualizer extends VisPlugin implements HasQuickHelp { motes.add(simulation.getMote(i)); } } - if (motes.size() == 0) { + if (motes.isEmpty()) { return null; } @@ -1398,7 +1395,7 @@ public class Visualizer extends VisPlugin implements HasQuickHelp { @Override public Collection getConfigXML() { - ArrayList config = new ArrayList(); + ArrayList config = new ArrayList<>(); Element element; /* Show mote-to-mote relations */ @@ -1693,10 +1690,7 @@ public class Visualizer extends VisPlugin implements HasQuickHelp { } @Override public boolean isEnabled(Visualizer visualizer, Simulation simulation) { - if (!(visualizer.getUI() instanceof BasicInternalFrameUI)) { - return false; - } - return true; + return visualizer.getUI() instanceof BasicInternalFrameUI; } } diff --git a/tools/cooja/java/org/contikios/cooja/plugins/skins/DGRMVisualizerSkin.java b/tools/cooja/java/org/contikios/cooja/plugins/skins/DGRMVisualizerSkin.java index ef8c19435..7d8bf882b 100644 --- a/tools/cooja/java/org/contikios/cooja/plugins/skins/DGRMVisualizerSkin.java +++ b/tools/cooja/java/org/contikios/cooja/plugins/skins/DGRMVisualizerSkin.java @@ -53,7 +53,7 @@ import org.contikios.cooja.radiomediums.DirectedGraphMedium; @ClassDescription("Radio environment (DGRM)") @SupportedArguments(radioMediums = {DirectedGraphMedium.class}) public class DGRMVisualizerSkin implements VisualizerSkin { - private static Logger logger = Logger.getLogger(DGRMVisualizerSkin.class); + private static final Logger logger = Logger.getLogger(DGRMVisualizerSkin.class); private Simulation simulation = null; private Visualizer visualizer = null;