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

allow loading configs referring to MspIPAddress, which was removed

Browse source
This commit is contained in:
fros4943 2009-04-20 16:48:53 +00:00
parent eccadb44f1
commit 5a5585238b
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMoteType.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: MspMoteType.java,v 1.29 2009/03/12 15:12:10 fros4943 Exp $ * $Id: MspMoteType.java,v 1.30 2009/04/20 16:48:53 fros4943 Exp $
*/ */
package se.sics.cooja.mspmote; package se.sics.cooja.mspmote;
@ -40,6 +40,7 @@ import javax.swing.*;
import org.apache.log4j.Logger; 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.interfaces.IPAddress;
/** /**
* MSP430-based mote types emulated in MSPSim. * MSP430-based mote types emulated in MSPSim.
@ -276,11 +277,19 @@ public abstract class MspMoteType implements MoteType {
logger.warn("Old simulation config detected: firmware specified as elf"); logger.warn("Old simulation config detected: firmware specified as elf");
fileFirmware = new File(element.getText()); fileFirmware = new File(element.getText());
} else if (name.equals("moteinterface")) { } else if (name.equals("moteinterface")) {
String intfClass = element.getText().trim();
/* Backwards compatibility: MspIPAddress -> IPAddress */
if (intfClass.equals("se.sics.cooja.mspmote.interfaces.MspIPAddress")) {
logger.warn("Old simulation config detected: IP address interface was moved");
intfClass = IPAddress.class.getName();
}
Class<? extends MoteInterface> moteInterfaceClass = Class<? extends MoteInterface> moteInterfaceClass =
simulation.getGUI().tryLoadClass(this, MoteInterface.class, element.getText().trim()); simulation.getGUI().tryLoadClass(this, MoteInterface.class, intfClass);
if (moteInterfaceClass == null) { if (moteInterfaceClass == null) {
logger.warn("Can't find mote interface class: " + element.getText()); logger.warn("Can't find mote interface class: " + intfClass);
} else { } else {
intfClassList.add(moteInterfaceClass); intfClassList.add(moteInterfaceClass);
} }