From 31e2c88a6635f83710e593ea8f83deac4dfa28a1 Mon Sep 17 00:00:00 2001
From: fros4943 <fros4943>
Date: Tue, 28 Oct 2008 12:05:30 +0000
Subject: [PATCH] passive/active interfaces distinction removed.

---
 .../se/sics/cooja/contikimote/ContikiMote.java | 18 +++---------------
 .../contikimote/ContikiMoteInterface.java      | 17 ++++++++---------
 2 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/tools/cooja/java/se/sics/cooja/contikimote/ContikiMote.java b/tools/cooja/java/se/sics/cooja/contikimote/ContikiMote.java
index 3476787f7..3d49ed22c 100644
--- a/tools/cooja/java/se/sics/cooja/contikimote/ContikiMote.java
+++ b/tools/cooja/java/se/sics/cooja/contikimote/ContikiMote.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ContikiMote.java,v 1.7 2008/03/31 15:22:43 fros4943 Exp $
+ * $Id: ContikiMote.java,v 1.8 2008/10/28 12:05:30 fros4943 Exp $
  */
 
 package se.sics.cooja.contikimote;
@@ -261,20 +261,8 @@ public class ContikiMote implements Mote {
     element.setText(getType().getIdentifier());
     config.add(element);
 
-    // Active interface configs (if any)
-    for (MoteInterface moteInterface: getInterfaces().getAllActiveInterfaces()) {
-      element = new Element("interface_config");
-      element.setText(moteInterface.getClass().getName());
-
-      Collection interfaceXML = moteInterface.getConfigXML();
-      if (interfaceXML != null) {
-        element.addContent(interfaceXML);
-        config.add(element);
-      }
-    }
-
-    // Passive interface configs (if any)
-    for (MoteInterface moteInterface: getInterfaces().getAllPassiveInterfaces()) {
+    // Mote interfaces
+    for (MoteInterface moteInterface: getInterfaces().getInterfaces()) {
       element = new Element("interface_config");
       element.setText(moteInterface.getClass().getName());
 
diff --git a/tools/cooja/java/se/sics/cooja/contikimote/ContikiMoteInterface.java b/tools/cooja/java/se/sics/cooja/contikimote/ContikiMoteInterface.java
index 71ecc13e4..70719e37a 100644
--- a/tools/cooja/java/se/sics/cooja/contikimote/ContikiMoteInterface.java
+++ b/tools/cooja/java/se/sics/cooja/contikimote/ContikiMoteInterface.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: ContikiMoteInterface.java,v 1.1 2006/08/21 12:13:09 fros4943 Exp $
+ * $Id: ContikiMoteInterface.java,v 1.2 2008/10/28 12:05:30 fros4943 Exp $
  */
 
 package se.sics.cooja.contikimote;
@@ -34,15 +34,14 @@ package se.sics.cooja.contikimote;
 /**
  * A Contiki mote interface has information about which, if any, core interfaces
  * it needs.
- * 
- * All classes implementing this interface should also define a static method:
- * public String[] getCoreInterfaceDependencies() {
- * ...
- * }
- * 
+ *
+ * All classes implementing this interface must define the static method:
+ * public static String[] getCoreInterfaceDependencies();
+ *
  * The method should return the names of all needed core interfaces.
- * 
- * @author Fredrik Osterlind
+ *
+ * @author Fredrik Österlind
  */
 public interface ContikiMoteInterface {
+  /*public static String[] getCoreInterfaceDependencies();*/
 }