minor changes due to deletion of static variables and new method parameters

This commit is contained in:
fros4943 2007-01-09 10:09:59 +00:00
parent 89b5f3c2db
commit 91396a3fc2
4 changed files with 19 additions and 14 deletions

View File

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * 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.*; import java.awt.event.*;
@ -43,7 +43,7 @@ import se.sics.cooja.*;
* @author Fredrik Osterlind * @author Fredrik Osterlind
*/ */
@ClassDescription("Dummy Plugin") @ClassDescription("Dummy Plugin")
@VisPluginType(VisPluginType.SIM_PLUGIN) @PluginType(PluginType.SIM_PLUGIN)
public class MyDummyPlugin extends VisPlugin { public class MyDummyPlugin extends VisPlugin {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static Logger logger = Logger.getLogger(MyDummyPlugin.class); private static Logger logger = Logger.getLogger(MyDummyPlugin.class);
@ -55,8 +55,8 @@ public class MyDummyPlugin extends VisPlugin {
* *
* @param simulationToVisualize Simulation to visualize * @param simulationToVisualize Simulation to visualize
*/ */
public MyDummyPlugin(Simulation simulationToVisualize) { public MyDummyPlugin(Simulation simulationToVisualize, GUI gui) {
super("This is my title!"); super("This is my title!", gui);
mySimulation = simulationToVisualize; mySimulation = simulationToVisualize;
// Create and add a button // Create and add a button

View File

@ -26,10 +26,11 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * 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.Collection;
import java.util.Observable;
import java.util.Observer; import java.util.Observer;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.jdom.Element; import org.jdom.Element;
@ -70,6 +71,10 @@ public class DummyRadioMedium extends RadioMedium {
logger.debug("I'm a dummy. I will never change."); logger.debug("I'm a dummy. I will never change.");
} }
public Observable getRadioMediumObservable() {
return new Observable();
}
public void deleteRadioMediumObserver(Observer observer) { public void deleteRadioMediumObserver(Observer observer) {
// Do nothing // Do nothing
logger.debug("I'm a dummy. I will never change."); logger.debug("I'm a dummy. I will never change.");
@ -87,7 +92,7 @@ public class DummyRadioMedium extends RadioMedium {
return null; return null;
} }
public boolean setConfigXML(Collection<Element> configXML) { public boolean setConfigXML(Collection<Element> configXML, boolean visAvailable) {
return true; return true;
} }

View File

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * 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.*; import java.awt.*;
@ -43,7 +43,7 @@ import se.sics.cooja.interfaces.*;
* @author Fredrik Osterlind * @author Fredrik Osterlind
*/ */
@ClassDescription("uAODV Control") @ClassDescription("uAODV Control")
@VisPluginType(VisPluginType.SIM_PLUGIN) @PluginType(PluginType.SIM_PLUGIN)
public class UAODVControl extends VisPlugin { public class UAODVControl extends VisPlugin {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static Logger logger = Logger.getLogger(UAODVControl.class); private static Logger logger = Logger.getLogger(UAODVControl.class);
@ -54,8 +54,8 @@ public class UAODVControl extends VisPlugin {
/** /**
* @param simulationToVisualize Current simulation * @param simulationToVisualize Current simulation
*/ */
public UAODVControl(Simulation simulationToVisualize) { public UAODVControl(Simulation simulationToVisualize, GUI gui) {
super("uAODV Control (uses RS232)"); super("uAODV Control (uses RS232)", gui);
mySimulation = simulationToVisualize; mySimulation = simulationToVisualize;
Container mainPane = this.getContentPane(); Container mainPane = this.getContentPane();

View File

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * 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.*; import java.awt.*;
@ -47,7 +47,7 @@ import se.sics.cooja.plugins.*;
* @author Fredrik Osterlind * @author Fredrik Osterlind
*/ */
@ClassDescription("uAODV Visualizer") @ClassDescription("uAODV Visualizer")
@VisPluginType(VisPluginType.SIM_PLUGIN) @PluginType(PluginType.SIM_PLUGIN)
public class VisUAODV extends VisTraffic { public class VisUAODV extends VisTraffic {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private static Logger logger = Logger.getLogger(VisUAODV.class); private static Logger logger = Logger.getLogger(VisUAODV.class);
@ -56,8 +56,8 @@ public class VisUAODV extends VisTraffic {
* Creates a new VisUAODV visualizer. * Creates a new VisUAODV visualizer.
* @param simulationToVisualize Simulation to visualize * @param simulationToVisualize Simulation to visualize
*/ */
public VisUAODV(Simulation simulationToVisualize) { public VisUAODV(Simulation simulationToVisualize, GUI gui) {
super(simulationToVisualize); super(simulationToVisualize, gui);
setTitle("uAODV Visualizer"); setTitle("uAODV Visualizer");
} }