From b7fe30c2d78a837ba5f90d4883bdd67c49033489 Mon Sep 17 00:00:00 2001 From: Adam Dunkels Date: Mon, 4 Jun 2012 17:22:23 +0200 Subject: [PATCH 1/3] Updated menu item name to indicate that a window is opened. --- .../apps/avrora/src/se/sics/cooja/avrmote/MicaZMoteType.java | 2 +- .../apps/mspsim/src/se/sics/cooja/mspmote/ESBMoteType.java | 2 +- .../apps/mspsim/src/se/sics/cooja/mspmote/Exp5438MoteType.java | 2 +- .../apps/mspsim/src/se/sics/cooja/mspmote/SkyMoteType.java | 2 +- .../apps/mspsim/src/se/sics/cooja/mspmote/TyndallMoteType.java | 2 +- .../apps/mspsim/src/se/sics/cooja/mspmote/WismoteMoteType.java | 2 +- .../cooja/apps/mspsim/src/se/sics/cooja/mspmote/Z1MoteType.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/MicaZMoteType.java b/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/MicaZMoteType.java index 7c21f0280..88030e895 100644 --- a/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/MicaZMoteType.java +++ b/tools/cooja/apps/avrora/src/se/sics/cooja/avrmote/MicaZMoteType.java @@ -71,7 +71,7 @@ import se.sics.cooja.interfaces.Position; * * @author Joakim Eriksson, Fredrik Osterlind */ -@ClassDescription("MicaZ Mote Type") +@ClassDescription("MicaZ mote...") @AbstractionLevelDescription("Emulated level") public class MicaZMoteType implements MoteType { private static Logger logger = Logger.getLogger(MicaZMoteType.class); diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/ESBMoteType.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/ESBMoteType.java index 874f6291f..98585648a 100644 --- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/ESBMoteType.java +++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/ESBMoteType.java @@ -53,7 +53,7 @@ import se.sics.cooja.mspmote.interfaces.MspMoteID; import se.sics.cooja.mspmote.interfaces.MspSerial; import se.sics.cooja.mspmote.interfaces.TR1001Radio; -@ClassDescription("ESB Mote Type") +@ClassDescription("ESB mote...") @AbstractionLevelDescription("Emulated level") public class ESBMoteType extends MspMoteType { private static Logger logger = Logger.getLogger(ESBMoteType.class); diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/Exp5438MoteType.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/Exp5438MoteType.java index 8a2579da4..1fb93492c 100644 --- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/Exp5438MoteType.java +++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/Exp5438MoteType.java @@ -62,7 +62,7 @@ import se.sics.cooja.mspmote.interfaces.MspMoteID; import se.sics.cooja.mspmote.interfaces.Msp802154Radio; import se.sics.cooja.mspmote.interfaces.UsciA1Serial; -@ClassDescription("TI MSP-EXP430F5438") +@ClassDescription("EXP430F5438 mote...") @AbstractionLevelDescription("Emulated level") public class Exp5438MoteType extends MspMoteType { private static Logger logger = Logger.getLogger(Exp5438MoteType.class); diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/SkyMoteType.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/SkyMoteType.java index d3b8f9cba..9640ecb58 100644 --- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/SkyMoteType.java +++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/SkyMoteType.java @@ -69,7 +69,7 @@ import se.sics.cooja.mspmote.interfaces.SkyLED; import se.sics.cooja.mspmote.interfaces.MspSerial; import se.sics.cooja.mspmote.interfaces.SkyTemperature; -@ClassDescription("Sky Mote Type") +@ClassDescription("Sky mote...") @AbstractionLevelDescription("Emulated level") public class SkyMoteType extends MspMoteType { private static Logger logger = Logger.getLogger(SkyMoteType.class); diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/TyndallMoteType.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/TyndallMoteType.java index 2d1205789..2a7b399e8 100644 --- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/TyndallMoteType.java +++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/TyndallMoteType.java @@ -62,7 +62,7 @@ import se.sics.cooja.mspmote.interfaces.Msp802154Radio; import se.sics.cooja.mspmote.interfaces.TyndallLED; import se.sics.cooja.mspmote.interfaces.UsciA0Serial; -@ClassDescription("Tyndall") +@ClassDescription("Tyndall mote...") @AbstractionLevelDescription("Emulated level") public class TyndallMoteType extends MspMoteType { private static Logger logger = Logger.getLogger(TyndallMoteType.class); diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/WismoteMoteType.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/WismoteMoteType.java index 1ca3d841d..0d4fe72e5 100644 --- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/WismoteMoteType.java +++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/WismoteMoteType.java @@ -45,7 +45,7 @@ import se.sics.cooja.mspmote.interfaces.MspDefaultSerial; import se.sics.cooja.mspmote.interfaces.MspLED; import se.sics.cooja.mspmote.interfaces.MspMoteID; -@ClassDescription("Wismote Mote Type") +@ClassDescription("Wismote mote...") @AbstractionLevelDescription("Emulated level") public class WismoteMoteType extends AbstractMspMoteType { diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/Z1MoteType.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/Z1MoteType.java index 7b3fbcd39..b74804367 100644 --- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/Z1MoteType.java +++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/Z1MoteType.java @@ -45,7 +45,7 @@ import se.sics.cooja.mspmote.interfaces.MspDefaultSerial; import se.sics.cooja.mspmote.interfaces.MspLED; import se.sics.cooja.mspmote.interfaces.MspMoteID; -@ClassDescription("Z1 Mote Type") +@ClassDescription("Z1 mote...") @AbstractionLevelDescription("Emulated level") public class Z1MoteType extends AbstractMspMoteType { From ef22d93c05901e8ff324804e5e184fdd19adcdd1 Mon Sep 17 00:00:00 2001 From: Adam Dunkels Date: Mon, 4 Jun 2012 17:22:47 +0200 Subject: [PATCH 2/3] Updated menu item name to indicate that a window is opened. --- tools/cooja/apps/powertracker/java/PowerTracker.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/cooja/apps/powertracker/java/PowerTracker.java b/tools/cooja/apps/powertracker/java/PowerTracker.java index f0758bcda..2ac9f69e1 100644 --- a/tools/cooja/apps/powertracker/java/PowerTracker.java +++ b/tools/cooja/apps/powertracker/java/PowerTracker.java @@ -69,7 +69,7 @@ import se.sics.cooja.interfaces.Radio; * * @author Fredrik Osterlind, Adam Dunkels */ -@ClassDescription("PowerTracker") +@ClassDescription("Mote radio duty cycle...") @PluginType(PluginType.SIM_PLUGIN) public class PowerTracker extends VisPlugin { private static Logger logger = Logger.getLogger(PowerTracker.class); From c330d8ca841120aaeadab6a2d9787ec8f6cd3e9d Mon Sep 17 00:00:00 2001 From: Adam Dunkels Date: Mon, 4 Jun 2012 17:23:54 +0200 Subject: [PATCH 3/3] Updated imports --- tools/cooja/java/se/sics/cooja/plugins/Visualizer.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/cooja/java/se/sics/cooja/plugins/Visualizer.java b/tools/cooja/java/se/sics/cooja/plugins/Visualizer.java index 78531452c..6034e5ae1 100644 --- a/tools/cooja/java/se/sics/cooja/plugins/Visualizer.java +++ b/tools/cooja/java/se/sics/cooja/plugins/Visualizer.java @@ -68,7 +68,6 @@ import java.util.Observable; import java.util.Observer; import javax.swing.AbstractAction; -import javax.swing.Action; import javax.swing.JButton; import javax.swing.JCheckBoxMenuItem; import javax.swing.JMenu; @@ -88,16 +87,16 @@ import org.jdom.Element; import se.sics.cooja.ClassDescription; import se.sics.cooja.GUI; -import se.sics.cooja.GUI.MoteRelation; import se.sics.cooja.HasQuickHelp; import se.sics.cooja.Mote; import se.sics.cooja.MoteInterface; import se.sics.cooja.PluginType; import se.sics.cooja.RadioMedium; -import se.sics.cooja.SimEventCentral.MoteCountListener; import se.sics.cooja.Simulation; import se.sics.cooja.SupportedArguments; import se.sics.cooja.VisPlugin; +import se.sics.cooja.GUI.MoteRelation; +import se.sics.cooja.SimEventCentral.MoteCountListener; import se.sics.cooja.interfaces.LED; import se.sics.cooja.interfaces.Position; import se.sics.cooja.interfaces.SerialPort;