diff --git a/tools/cooja/examples/userplatform_new_plugin/java/MyDummyPlugin.java b/tools/cooja/examples/userplatform_new_plugin/java/MyDummyPlugin.java index b0f90eff4..1d9cc0eb0 100644 --- a/tools/cooja/examples/userplatform_new_plugin/java/MyDummyPlugin.java +++ b/tools/cooja/examples/userplatform_new_plugin/java/MyDummyPlugin.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: MyDummyPlugin.java,v 1.1 2006/08/21 12:13:05 fros4943 Exp $ + * $Id: MyDummyPlugin.java,v 1.2 2007/01/09 10:11:08 fros4943 Exp $ */ import java.awt.event.*; @@ -43,7 +43,7 @@ import se.sics.cooja.*; * @author Fredrik Osterlind */ @ClassDescription("Dummy Plugin") -@VisPluginType(VisPluginType.SIM_PLUGIN) +@PluginType(PluginType.SIM_PLUGIN) public class MyDummyPlugin extends VisPlugin { private static final long serialVersionUID = 1L; private static Logger logger = Logger.getLogger(MyDummyPlugin.class); @@ -55,8 +55,8 @@ public class MyDummyPlugin extends VisPlugin { * * @param simulationToVisualize Simulation to visualize */ - public MyDummyPlugin(Simulation simulationToVisualize) { - super("This is my title!"); + public MyDummyPlugin(Simulation simulationToVisualize, GUI gui) { + super("This is my title!", gui); mySimulation = simulationToVisualize; // Create and add a button diff --git a/tools/cooja/examples/userplatform_new_radiomedium/java/DummyRadioMedium.java b/tools/cooja/examples/userplatform_new_radiomedium/java/DummyRadioMedium.java index bd16d69ca..ca81777a4 100644 --- a/tools/cooja/examples/userplatform_new_radiomedium/java/DummyRadioMedium.java +++ b/tools/cooja/examples/userplatform_new_radiomedium/java/DummyRadioMedium.java @@ -26,10 +26,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: DummyRadioMedium.java,v 1.1 2006/08/21 12:13:00 fros4943 Exp $ + * $Id: DummyRadioMedium.java,v 1.2 2007/01/09 10:10:18 fros4943 Exp $ */ import java.util.Collection; +import java.util.Observable; import java.util.Observer; import org.apache.log4j.Logger; import org.jdom.Element; @@ -70,6 +71,10 @@ public class DummyRadioMedium extends RadioMedium { logger.debug("I'm a dummy. I will never change."); } + public Observable getRadioMediumObservable() { + return new Observable(); + } + public void deleteRadioMediumObserver(Observer observer) { // Do nothing logger.debug("I'm a dummy. I will never change."); @@ -87,7 +92,7 @@ public class DummyRadioMedium extends RadioMedium { return null; } - public boolean setConfigXML(Collection configXML) { + public boolean setConfigXML(Collection configXML, boolean visAvailable) { return true; } diff --git a/tools/cooja/examples/userplatform_uaodv/java/UAODVControl.java b/tools/cooja/examples/userplatform_uaodv/java/UAODVControl.java index ba9c7a2b6..c53b91a60 100644 --- a/tools/cooja/examples/userplatform_uaodv/java/UAODVControl.java +++ b/tools/cooja/examples/userplatform_uaodv/java/UAODVControl.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: UAODVControl.java,v 1.1 2006/08/21 12:13:01 fros4943 Exp $ + * $Id: UAODVControl.java,v 1.2 2007/01/09 10:09:59 fros4943 Exp $ */ import java.awt.*; @@ -43,7 +43,7 @@ import se.sics.cooja.interfaces.*; * @author Fredrik Osterlind */ @ClassDescription("uAODV Control") -@VisPluginType(VisPluginType.SIM_PLUGIN) +@PluginType(PluginType.SIM_PLUGIN) public class UAODVControl extends VisPlugin { private static final long serialVersionUID = 1L; private static Logger logger = Logger.getLogger(UAODVControl.class); @@ -54,8 +54,8 @@ public class UAODVControl extends VisPlugin { /** * @param simulationToVisualize Current simulation */ - public UAODVControl(Simulation simulationToVisualize) { - super("uAODV Control (uses RS232)"); + public UAODVControl(Simulation simulationToVisualize, GUI gui) { + super("uAODV Control (uses RS232)", gui); mySimulation = simulationToVisualize; Container mainPane = this.getContentPane(); diff --git a/tools/cooja/examples/userplatform_uaodv/java/VisUAODV.java b/tools/cooja/examples/userplatform_uaodv/java/VisUAODV.java index 2e0c30ee0..d908a6232 100644 --- a/tools/cooja/examples/userplatform_uaodv/java/VisUAODV.java +++ b/tools/cooja/examples/userplatform_uaodv/java/VisUAODV.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: VisUAODV.java,v 1.1 2006/08/21 12:13:01 fros4943 Exp $ + * $Id: VisUAODV.java,v 1.2 2007/01/09 10:09:59 fros4943 Exp $ */ import java.awt.*; @@ -47,7 +47,7 @@ import se.sics.cooja.plugins.*; * @author Fredrik Osterlind */ @ClassDescription("uAODV Visualizer") -@VisPluginType(VisPluginType.SIM_PLUGIN) +@PluginType(PluginType.SIM_PLUGIN) public class VisUAODV extends VisTraffic { private static final long serialVersionUID = 1L; private static Logger logger = Logger.getLogger(VisUAODV.class); @@ -56,8 +56,8 @@ public class VisUAODV extends VisTraffic { * Creates a new VisUAODV visualizer. * @param simulationToVisualize Simulation to visualize */ - public VisUAODV(Simulation simulationToVisualize) { - super(simulationToVisualize); + public VisUAODV(Simulation simulationToVisualize, GUI gui) { + super(simulationToVisualize, gui); setTitle("uAODV Visualizer"); }