From ecf288c89d13fb2efa0c09737e134ab2d4faea57 Mon Sep 17 00:00:00 2001 From: nifi Date: Mon, 20 Apr 2009 17:16:20 +0000 Subject: [PATCH] allow loading configs referring to MspIPAddress, which was removed --- .../mspsim/src/se/sics/cooja/mspmote/MspMote.java | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMote.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMote.java index e3e9464ff..6d67065af 100644 --- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMote.java +++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMote.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: MspMote.java,v 1.24 2009/03/13 16:24:29 fros4943 Exp $ + * $Id: MspMote.java,v 1.25 2009/04/20 17:16:20 nifi Exp $ */ package se.sics.cooja.mspmote; @@ -47,6 +47,7 @@ import se.sics.cooja.MoteInterfaceHandler; import se.sics.cooja.MoteMemory; import se.sics.cooja.MoteType; import se.sics.cooja.Simulation; +import se.sics.cooja.interfaces.IPAddress; import se.sics.cooja.mspmote.interfaces.TR1001Radio; import se.sics.mspsim.cli.CommandHandler; import se.sics.mspsim.cli.LineListener; @@ -394,11 +395,15 @@ public abstract class MspMote implements Mote { myMoteInterfaceHandler = createMoteInterfaceHandler(); } else if (name.equals("interface_config")) { + String intfClass = element.getText().trim(); + if (intfClass.equals("se.sics.cooja.mspmote.interfaces.MspIPAddress")) { + intfClass = IPAddress.class.getName(); + } Class moteInterfaceClass = simulation.getGUI().tryLoadClass( - this, MoteInterface.class, element.getText().trim()); + this, MoteInterface.class, intfClass); if (moteInterfaceClass == null) { - logger.fatal("Could not load mote interface class: " + element.getText().trim()); + logger.fatal("Could not load mote interface class: " + intfClass); return false; }