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

method parameter updates

Browse source
This commit is contained in:
fros4943 2007-01-09 10:01:14 +00:00
parent 34c020d87e
commit d579da7a8a
7 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tools/cooja/java/se/sics/cooja/interfaces/Battery.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: Battery.java,v 1.3 2006/09/26 13:08:05 fros4943 Exp $ * $Id: Battery.java,v 1.4 2007/01/09 10:02:44 fros4943 Exp $
*/ */
package se.sics.cooja.interfaces; package se.sics.cooja.interfaces;
@ -285,7 +285,7 @@ public class Battery extends MoteInterface implements PassiveMoteInterface {
return config; return config;
} }
public void setConfigXML(Collection<Element> configXML) { public void setConfigXML(Collection<Element> configXML, boolean visAvailable) {
for (Element element : configXML) { for (Element element : configXML) {
if (element.getName().equals("infinite")) { if (element.getName().equals("infinite")) {
hasInfiniteEnergy = Boolean.parseBoolean(element.getText()); hasInfiniteEnergy = Boolean.parseBoolean(element.getText());

4
tools/cooja/java/se/sics/cooja/interfaces/Position.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: Position.java,v 1.1 2006/08/21 12:12:59 fros4943 Exp $ * $Id: Position.java,v 1.2 2007/01/09 10:02:44 fros4943 Exp $
*/ */
package se.sics.cooja.interfaces; package se.sics.cooja.interfaces;
@ -211,7 +211,7 @@ public class Position extends MoteInterface {
return config; return config;
} }
public void setConfigXML(Collection<Element> configXML) { public void setConfigXML(Collection<Element> configXML, boolean visAvailable) {
double x = 0, y = 0, z = 0; double x = 0, y = 0, z = 0;
for (Element element : configXML) { for (Element element : configXML) {

8
tools/cooja/java/se/sics/cooja/motes/DisturberMote.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: DisturberMote.java,v 1.1 2006/12/07 14:25:22 fros4943 Exp $ * $Id: DisturberMote.java,v 1.2 2007/01/09 10:01:14 fros4943 Exp $
*/ */
package se.sics.cooja.motes; package se.sics.cooja.motes;
@ -190,7 +190,7 @@ public class DisturberMote implements Mote {
} }
public boolean setConfigXML(Simulation simulation, public boolean setConfigXML(Simulation simulation,
Collection<Element> configXML) { Collection<Element> configXML, boolean visAvailable) {
// Set initial configuration // Set initial configuration
mySim = simulation; mySim = simulation;
@ -208,7 +208,7 @@ public class DisturberMote implements Mote {
if (name.equals("motetype_identifier")) { if (name.equals("motetype_identifier")) {
myType = simulation.getMoteType(element.getText()); myType = simulation.getMoteType(element.getText());
} else if (name.equals("interface_config")) { } else if (name.equals("interface_config")) {
Class<? extends MoteInterface> moteInterfaceClass = GUI.currentGUI Class<? extends MoteInterface> moteInterfaceClass = simulation.getGUI()
.tryLoadClass(this, MoteInterface.class, element.getText().trim()); .tryLoadClass(this, MoteInterface.class, element.getText().trim());
if (moteInterfaceClass == null) { if (moteInterfaceClass == null) {
@ -218,7 +218,7 @@ public class DisturberMote implements Mote {
MoteInterface moteInterface = myInterfaceHandler MoteInterface moteInterface = myInterfaceHandler
.getInterfaceOfType(moteInterfaceClass); .getInterfaceOfType(moteInterfaceClass);
moteInterface.setConfigXML(element.getChildren()); moteInterface.setConfigXML(element.getChildren(), visAvailable);
} }
} }

8
tools/cooja/java/se/sics/cooja/motes/DisturberMoteType.java
View file

@ -75,7 +75,7 @@ public class DisturberMoteType implements MoteType {
return new DisturberMote(this, simulation); return new DisturberMote(this, simulation);
} }
public boolean configureAndInit(JFrame parentFrame, Simulation simulation) { public boolean configureAndInit(JFrame parentFrame, Simulation simulation, boolean visAvailable) {
if (identifier == null) { if (identifier == null) {
// Create unique identifier // Create unique identifier
@ -225,7 +225,7 @@ public class DisturberMoteType implements MoteType {
} }
public boolean setConfigXML(Simulation simulation, public boolean setConfigXML(Simulation simulation,
Collection<Element> configXML) { Collection<Element> configXML, boolean visAvailable) {
for (Element element : configXML) { for (Element element : configXML) {
moteInterfaces = new Vector<Class<? extends MoteInterface>>(); /* TV */ moteInterfaces = new Vector<Class<? extends MoteInterface>>(); /* TV */
mySimulation = simulation; /* TV */ mySimulation = simulation; /* TV */
@ -237,7 +237,7 @@ public class DisturberMoteType implements MoteType {
} else if (name.equals("description")) { } else if (name.equals("description")) {
description = element.getText(); description = element.getText();
} else if (name.equals("moteinterface")) { /* TV */ } else if (name.equals("moteinterface")) { /* TV */
Class<? extends MoteInterface> moteInterfaceClass = GUI.currentGUI Class<? extends MoteInterface> moteInterfaceClass = simulation.getGUI()
.tryLoadClass(this, MoteInterface.class, element.getText().trim()); .tryLoadClass(this, MoteInterface.class, element.getText().trim());
if (moteInterfaceClass == null) { if (moteInterfaceClass == null) {
@ -250,7 +250,7 @@ public class DisturberMoteType implements MoteType {
} }
} }
boolean createdOK = configureAndInit(GUI.frame, simulation); boolean createdOK = configureAndInit(GUI.frame, simulation, visAvailable);
return createdOK; return createdOK;
} }

4
tools/cooja/java/se/sics/cooja/motes/DisturberRadio.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: DisturberRadio.java,v 1.1 2006/12/07 14:25:22 fros4943 Exp $ * $Id: DisturberRadio.java,v 1.2 2007/01/09 10:01:14 fros4943 Exp $
*/ */
package se.sics.cooja.motes; package se.sics.cooja.motes;
@ -242,7 +242,7 @@ public class DisturberRadio extends Radio {
return config; return config;
} }
public void setConfigXML(Collection<Element> configXML) { public void setConfigXML(Collection<Element> configXML, boolean visAvailable) {
for (Element element : configXML) { for (Element element : configXML) {
String name = element.getName(); String name = element.getName();

8
tools/cooja/java/se/sics/cooja/motes/DummyMote.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: DummyMote.java,v 1.2 2006/09/26 13:08:05 fros4943 Exp $ * $Id: DummyMote.java,v 1.3 2007/01/09 10:01:14 fros4943 Exp $
*/ */
package se.sics.cooja.motes; package se.sics.cooja.motes;
@ -183,7 +183,7 @@ public class DummyMote implements Mote {
} }
public boolean setConfigXML(Simulation simulation, public boolean setConfigXML(Simulation simulation,
Collection<Element> configXML) { Collection<Element> configXML, boolean visAvailable) {
mySim = simulation; mySim = simulation;
myMemory = new SectionMoteMemory(new Properties()); myMemory = new SectionMoteMemory(new Properties());
myInterfaceHandler = new MoteInterfaceHandler(); myInterfaceHandler = new MoteInterfaceHandler();
@ -195,7 +195,7 @@ public class DummyMote implements Mote {
if (name.equals("motetype_identifier")) { if (name.equals("motetype_identifier")) {
myType = simulation.getMoteType(element.getText()); myType = simulation.getMoteType(element.getText());
} else if (name.equals("interface_config")) { } else if (name.equals("interface_config")) {
Class<? extends MoteInterface> moteInterfaceClass = GUI.currentGUI Class<? extends MoteInterface> moteInterfaceClass = simulation.getGUI()
.tryLoadClass(this, MoteInterface.class, element.getText().trim()); .tryLoadClass(this, MoteInterface.class, element.getText().trim());
if (moteInterfaceClass == null) { if (moteInterfaceClass == null) {
@ -205,7 +205,7 @@ public class DummyMote implements Mote {
MoteInterface moteInterface = myInterfaceHandler MoteInterface moteInterface = myInterfaceHandler
.getInterfaceOfType(moteInterfaceClass); .getInterfaceOfType(moteInterfaceClass);
moteInterface.setConfigXML(element.getChildren()); moteInterface.setConfigXML(element.getChildren(), visAvailable);
} }
} }

8
tools/cooja/java/se/sics/cooja/motes/DummyMoteType.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: DummyMoteType.java,v 1.1 2006/08/21 12:13:12 fros4943 Exp $ * $Id: DummyMoteType.java,v 1.2 2007/01/09 10:01:14 fros4943 Exp $
*/ */
package se.sics.cooja.motes; package se.sics.cooja.motes;
@ -60,7 +60,7 @@ public class DummyMoteType implements MoteType {
return new DummyMote(this, simulation); return new DummyMote(this, simulation);
} }
public boolean configureAndInit(JFrame parentFrame, Simulation simulation) { public boolean configureAndInit(JFrame parentFrame, Simulation simulation, boolean visAvailable) {
if (identifier == null) { if (identifier == null) {
// Create unique identifier // Create unique identifier
@ -138,7 +138,7 @@ public class DummyMoteType implements MoteType {
return config; return config;
} }
public boolean setConfigXML(Simulation simulation, Collection<Element> configXML) { public boolean setConfigXML(Simulation simulation, Collection<Element> configXML, boolean visAvailable) {
for (Element element : configXML) { for (Element element : configXML) {
String name = element.getName(); String name = element.getName();
@ -151,7 +151,7 @@ public class DummyMoteType implements MoteType {
} }
} }
boolean createdOK = configureAndInit(GUI.frame, simulation); boolean createdOK = configureAndInit(GUI.frame, simulation, visAvailable);
return createdOK; return createdOK;
} }