From 378ca2629d778196ae1735ad5c16986aebc24322 Mon Sep 17 00:00:00 2001 From: Enrico Joerns Date: Fri, 31 Oct 2014 00:49:43 +0100 Subject: [PATCH] Button: None of the buttons will saves its state Saving a buttons state in simulation file is not required as its state is much too volatile. --- .../cooja/mspmote/interfaces/ESBButton.java | 9 --------- .../cooja/mspmote/interfaces/MspButton.java | 11 ----------- .../cooja/mspmote/interfaces/SkyButton.java | 10 ---------- .../cooja/contikimote/interfaces/ContikiButton.java | 9 --------- .../java/org/contikios/cooja/interfaces/Button.java | 12 ++++++++++++ 5 files changed, 12 insertions(+), 39 deletions(-) diff --git a/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/interfaces/ESBButton.java b/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/interfaces/ESBButton.java index def3d207e..c2ac16c39 100644 --- a/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/interfaces/ESBButton.java +++ b/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/interfaces/ESBButton.java @@ -30,9 +30,7 @@ package org.contikios.cooja.mspmote.interfaces; -import java.util.Collection; import org.apache.log4j.Logger; -import org.jdom.Element; import org.contikios.cooja.*; import org.contikios.cooja.interfaces.Button; @@ -72,11 +70,4 @@ public class ESBButton extends Button { return false; } - public Collection getConfigXML() { - return null; - } - - public void setConfigXML(Collection configXML, boolean visAvailable) { - } - } diff --git a/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/interfaces/MspButton.java b/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/interfaces/MspButton.java index 28d4f32b2..a261b2863 100644 --- a/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/interfaces/MspButton.java +++ b/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/interfaces/MspButton.java @@ -28,8 +28,6 @@ */ package org.contikios.cooja.mspmote.interfaces; -import java.util.Collection; -import org.jdom.Element; import org.contikios.cooja.ClassDescription; import org.contikios.cooja.Mote; import org.contikios.cooja.Simulation; @@ -83,15 +81,6 @@ public class MspButton extends Button { return button.isPressed(); } - @Override - public Collection getConfigXML() { - return null; - } - - @Override - public void setConfigXML(Collection configXML, boolean visAvailable) { - } - private class ButtonClick extends TimeEvent implements Runnable { public ButtonClick() { diff --git a/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/interfaces/SkyButton.java b/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/interfaces/SkyButton.java index 5dd5dedb1..b4f4c0fe7 100644 --- a/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/interfaces/SkyButton.java +++ b/tools/cooja/apps/mspsim/src/org/contikios/cooja/mspmote/interfaces/SkyButton.java @@ -30,7 +30,6 @@ package org.contikios.cooja.mspmote.interfaces; -import java.util.Collection; import org.apache.log4j.Logger; import org.contikios.cooja.ClassDescription; import org.contikios.cooja.Mote; @@ -38,7 +37,6 @@ import org.contikios.cooja.MoteTimeEvent; import org.contikios.cooja.Simulation; import org.contikios.cooja.interfaces.Button; import org.contikios.cooja.mspmote.SkyMote; -import org.jdom.Element; @ClassDescription("Button") public class SkyButton extends Button { @@ -104,12 +102,4 @@ public class SkyButton extends Button { return false; } - - public Collection getConfigXML() { - return null; - } - - public void setConfigXML(Collection configXML, boolean visAvailable) { - } - } diff --git a/tools/cooja/java/org/contikios/cooja/contikimote/interfaces/ContikiButton.java b/tools/cooja/java/org/contikios/cooja/contikimote/interfaces/ContikiButton.java index f0e9fa359..0cade0caf 100644 --- a/tools/cooja/java/org/contikios/cooja/contikimote/interfaces/ContikiButton.java +++ b/tools/cooja/java/org/contikios/cooja/contikimote/interfaces/ContikiButton.java @@ -30,9 +30,7 @@ package org.contikios.cooja.contikimote.interfaces; -import java.util.Collection; import org.apache.log4j.Logger; -import org.jdom.Element; import org.contikios.cooja.*; import org.contikios.cooja.contikimote.ContikiMote; @@ -162,11 +160,4 @@ public class ContikiButton extends Button implements ContikiMoteInterface { return moteMem.getByteValueOf("simButtonIsDown") == 1; } - public Collection getConfigXML() { - return null; - } - - public void setConfigXML(Collection configXML, boolean visAvailable) { - } - } diff --git a/tools/cooja/java/org/contikios/cooja/interfaces/Button.java b/tools/cooja/java/org/contikios/cooja/interfaces/Button.java index cb50a16e4..b5f0bf371 100644 --- a/tools/cooja/java/org/contikios/cooja/interfaces/Button.java +++ b/tools/cooja/java/org/contikios/cooja/interfaces/Button.java @@ -32,9 +32,11 @@ package org.contikios.cooja.interfaces; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; +import java.util.Collection; import javax.swing.JButton; import javax.swing.JPanel; import org.contikios.cooja.*; +import org.jdom.Element; /** * A Button represents a mote button. An implementation should notify all @@ -85,4 +87,14 @@ public abstract class Button extends MoteInterface { public void releaseInterfaceVisualizer(JPanel panel) { } + @Override + public Collection getConfigXML() { + // The button state will not be saved! + return null; + } + + @Override + public void setConfigXML(Collection configXML, boolean visAvailable) { + // The button state will not be saved! + } }