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

configure and load methods may throw a MoteTypeCreationException

Browse source
This commit is contained in:
fros4943 2009-11-25 20:48:22 +00:00
parent 93672649d2
commit fa26d2f213
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
tools/cooja/java/se/sics/cooja/motes/AbstractApplicationMoteType.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: AbstractApplicationMoteType.java,v 1.4 2009/10/28 14:38:02 fros4943 Exp $ * $Id: AbstractApplicationMoteType.java,v 1.5 2009/11/25 20:48:22 fros4943 Exp $
*/ */
package se.sics.cooja.motes; package se.sics.cooja.motes;
@ -41,6 +41,7 @@ import org.apache.log4j.Logger;
import org.jdom.Element; import org.jdom.Element;
import se.sics.cooja.*; import se.sics.cooja.*;
import se.sics.cooja.MoteType.MoteTypeCreationException;
import se.sics.cooja.interfaces.ApplicationRadio; import se.sics.cooja.interfaces.ApplicationRadio;
import se.sics.cooja.interfaces.MoteID; import se.sics.cooja.interfaces.MoteID;
import se.sics.cooja.interfaces.Position; import se.sics.cooja.interfaces.Position;
@ -67,7 +68,8 @@ public abstract class AbstractApplicationMoteType implements MoteType {
this.description = "Application Mote Type #" + identifier; this.description = "Application Mote Type #" + identifier;
} }
public boolean configureAndInit(Container parentContainer, Simulation simulation, boolean visAvailable) { public boolean configureAndInit(Container parentContainer, Simulation simulation, boolean visAvailable)
throws MoteTypeCreationException {
if (identifier == null) { if (identifier == null) {
/* Create unique identifier */ /* Create unique identifier */
int counter = 0; int counter = 0;
@ -202,7 +204,8 @@ public abstract class AbstractApplicationMoteType implements MoteType {
} }
public boolean setConfigXML(Simulation simulation, public boolean setConfigXML(Simulation simulation,
Collection<Element> configXML, boolean visAvailable) { Collection<Element> configXML, boolean visAvailable)
throws MoteTypeCreationException {
for (Element element : configXML) { for (Element element : configXML) {
String name = element.getName(); String name = element.getName();
if (name.equals("identifier")) { if (name.equals("identifier")) {

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

@ -43,6 +43,7 @@ import se.sics.cooja.MoteTimeEvent;
import se.sics.cooja.MoteType; import se.sics.cooja.MoteType;
import se.sics.cooja.RadioPacket; import se.sics.cooja.RadioPacket;
import se.sics.cooja.Simulation; import se.sics.cooja.Simulation;
import se.sics.cooja.MoteType.MoteTypeCreationException;
import se.sics.cooja.interfaces.ApplicationRadio; import se.sics.cooja.interfaces.ApplicationRadio;
import se.sics.cooja.interfaces.Radio.RadioEvent; import se.sics.cooja.interfaces.Radio.RadioEvent;
@ -71,7 +72,8 @@ public class DisturberMoteType extends AbstractApplicationMoteType {
} }
public boolean configureAndInit(Container parentContainer, public boolean configureAndInit(Container parentContainer,
Simulation simulation, boolean visAvailable) { Simulation simulation, boolean visAvailable)
throws MoteTypeCreationException {
if (!super.configureAndInit(parentContainer, simulation, visAvailable)) { if (!super.configureAndInit(parentContainer, simulation, visAvailable)) {
return false; return false;
} }