From d7ed256dfcd2faf1f7bc0e9673cbb8b40ebe25ef Mon Sep 17 00:00:00 2001
From: fros4943 <fros4943>
Date: Mon, 11 Feb 2008 16:09:47 +0000
Subject: [PATCH] removed contiki dependency variable: node_id

---
 .../cooja/mspmote/interfaces/MspMoteID.java    | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/MspMoteID.java b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/MspMoteID.java
index 047a4e01b..cbd206005 100644
--- a/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/MspMoteID.java
+++ b/tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/interfaces/MspMoteID.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: MspMoteID.java,v 1.1 2008/02/07 14:54:16 fros4943 Exp $
+ * $Id: MspMoteID.java,v 1.2 2008/02/11 16:09:47 fros4943 Exp $
  */
 
 package se.sics.cooja.mspmote.interfaces;
@@ -43,6 +43,7 @@ import org.apache.log4j.Logger;
 import org.jdom.Element;
 
 import se.sics.cooja.*;
+import se.sics.cooja.AddressMemory.UnknownVariableException;
 import se.sics.cooja.interfaces.MoteID;
 import se.sics.cooja.mspmote.MspMote;
 import se.sics.cooja.mspmote.MspMoteMemory;
@@ -74,14 +75,25 @@ public class MspMoteID extends MoteID {
   }
 
   public int getMoteID() {
-    return moteMem.getIntValueOf("node_id");
+    try {
+      return moteMem.getIntValueOf("node_id");
+    } catch (UnknownVariableException e) {
+      logger.fatal("Contiki variable 'node_id' not found");
+    }
+    return -1;
   }
 
   public void setMoteID(int newID) {
     if (mote.getInterfaces().getClock().getTime() < PERSISTENT_ID_TIME) {
       persistentID = newID;
     }
-    moteMem.setIntValueOf("node_id", newID);
+
+    try {
+      moteMem.setIntValueOf("node_id", newID);
+    } catch (UnknownVariableException e) {
+      logger.fatal("Contiki variable 'node_id' not found");
+    }
+
     setChanged();
     notifyObservers();
   }