deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

removed use of temporary (simulation-specific) plugins, instead plugins should be unregistered when no longer needed + added method called when radio medium is removed from simulation

Browse source
This commit is contained in:
fros4943 2010-12-02 15:25:49 +00:00
parent 30885ba4ce
commit 9a3c7ae650
4 changed files with 40 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
tools/cooja/apps/mrm/java/se/sics/mrm/MRM.java
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: MRM.java,v 1.11 2009/11/25 15:43:03 fros4943 Exp $ * $Id: MRM.java,v 1.12 2010/12/02 15:25:50 fros4943 Exp $
*/ */
package se.sics.mrm; package se.sics.mrm;
@ -72,6 +72,7 @@ public class MRM extends AbstractRadioMedium {
private Random random = null; private Random random = null;
private Simulation sim;
/** /**
* Notifies observers when this radio medium has changed settings. * Notifies observers when this radio medium has changed settings.
*/ */
@ -82,16 +83,26 @@ public class MRM extends AbstractRadioMedium {
*/ */
public MRM(Simulation simulation) { public MRM(Simulation simulation) {
super(simulation); super(simulation);
sim = simulation;
random = simulation.getRandomGenerator(); random = simulation.getRandomGenerator();
// Create the channel model // Create the channel model
currentChannelModel = new ChannelModel(); currentChannelModel = new ChannelModel();
// Register temporary plugins /* Register plugins */
simulation.getGUI().registerTemporaryPlugin(AreaViewer.class); sim.getGUI().registerPlugin(AreaViewer.class);
simulation.getGUI().registerTemporaryPlugin(FormulaViewer.class); sim.getGUI().registerPlugin(FormulaViewer.class);
} }
public void removed() {
super.removed();
/* Unregister plugins */
sim.getGUI().unregisterPlugin(AreaViewer.class);
sim.getGUI().unregisterPlugin(FormulaViewer.class);
}
public MRMRadioConnection createConnections(Radio sendingRadio) { public MRMRadioConnection createConnections(Radio sendingRadio) {
Position sendingPosition = sendingRadio.getPosition(); Position sendingPosition = sendingRadio.getPosition();
MRMRadioConnection newConnection = new MRMRadioConnection(sendingRadio); MRMRadioConnection newConnection = new MRMRadioConnection(sendingRadio);

8
tools/cooja/java/se/sics/cooja/RadioMedium.java
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: RadioMedium.java,v 1.9 2010/02/03 15:49:25 fros4943 Exp $ * $Id: RadioMedium.java,v 1.10 2010/12/02 15:25:50 fros4943 Exp $
*/ */
package se.sics.cooja; package se.sics.cooja;
@ -165,4 +165,10 @@ public abstract class RadioMedium {
.getConstructor(new Class[] { Simulation.class }); .getConstructor(new Class[] { Simulation.class });
return (RadioMedium) constr.newInstance(new Object[] { simulation }); return (RadioMedium) constr.newInstance(new Object[] { simulation });
} }
/**
* Called when radio medium is removed.
*/
public void removed() {
}
} }

7
tools/cooja/java/se/sics/cooja/Simulation.java
View file

@ -24,7 +24,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: Simulation.java,v 1.67 2010/10/12 10:58:31 fros4943 Exp $ * $Id: Simulation.java,v 1.68 2010/12/02 15:25:49 fros4943 Exp $
*/ */
package se.sics.cooja; package se.sics.cooja;
@ -732,6 +732,11 @@ public class Simulation extends Observable implements Runnable {
* This method is called just before the simulation is removed. * This method is called just before the simulation is removed.
*/ */
public void removed() { public void removed() {
/* Remove radio medium */
if (currentRadioMedium != null) {
currentRadioMedium.removed();
}
/* Remove all motes */ /* Remove all motes */
Mote[] motes = getMotes(); Mote[] motes = getMotes();
for (Mote m: motes) { for (Mote m: motes) {

17
tools/cooja/java/se/sics/cooja/radiomediums/DirectedGraphMedium.java
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: DirectedGraphMedium.java,v 1.7 2010/11/10 13:09:01 fros4943 Exp $ * $Id: DirectedGraphMedium.java,v 1.8 2010/12/02 15:25:50 fros4943 Exp $
*/ */
package se.sics.cooja.radiomediums; package se.sics.cooja.radiomediums;
@ -88,12 +88,19 @@ public class DirectedGraphMedium extends AbstractRadioMedium {
requestEdgeAnalysis(); requestEdgeAnalysis();
/* Register plugin. /* Register plugin and visualizer skin */
* TODO Should be unregistered when radio medium is removed */ simulation.getGUI().registerPlugin(DGRMConfigurator.class);
simulation.getGUI().registerTemporaryPlugin(DGRMConfigurator.class);
Visualizer.registerVisualizerSkin(DGRMVisualizerSkin.class); Visualizer.registerVisualizerSkin(DGRMVisualizerSkin.class);
} }
public void removed() {
super.removed();
/* Unregister plugin and visualizer skin */
simulation.getGUI().unregisterPlugin(DGRMConfigurator.class);
Visualizer.unregisterVisualizerSkin(DGRMVisualizerSkin.class);
}
public void addEdge(Edge e) { public void addEdge(Edge e) {
edges.add(e); edges.add(e);
requestEdgeAnalysis(); requestEdgeAnalysis();