From eccf001029433114ede1116a97c91e14d21a4273 Mon Sep 17 00:00:00 2001
From: adamdunkels <adamdunkels>
Date: Tue, 7 Dec 2010 22:46:12 +0000
Subject: [PATCH] The collectview tool should use the example/collect code
 instead of examples/sky-shell code

---
 tools/collect-view/build.xml                       | 14 +++++++-------
 .../src/se/sics/contiki/collect/CollectServer.java |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/tools/collect-view/build.xml b/tools/collect-view/build.xml
index 33e4adf7d..52eeb04ec 100644
--- a/tools/collect-view/build.xml
+++ b/tools/collect-view/build.xml
@@ -42,19 +42,19 @@
     </copy>
   </target>
 
-  <condition property="sky-shell.exists">
-    <available file="${dist}/sky-shell.ihex"/>
+  <condition property="collect-view-shell.exists">
+    <available file="${dist}/collect-view-shell.ihex"/>
   </condition>
 
-  <target name="sky-shell.ihex" unless="sky-shell.exists" depends="init">
-    <exec dir="${contiki}/examples/sky-shell" executable="make">
+  <target name="collect-view-shell.ihex" unless="collect-view-shell.exists" depends="init">
+    <exec dir="${contiki}/examples/collect" executable="make">
       <arg value="TARGET=sky"/>
-      <arg value="sky-shell.ihex"/>
+      <arg value="collect-view-shell.ihex"/>
     </exec>
-    <copy todir="${dist}" file="${contiki}/examples/sky-shell/sky-shell.ihex"/>
+    <copy todir="${dist}" file="${contiki}/examples/collect/collect-view-shell.ihex"/>
   </target>
 
-  <target name="dist" depends="jar,sky-shell.ihex">
+  <target name="dist" depends="jar,collect-view-shell.ihex">
     <copy todir="${dist}" file="collect-init.script"/>
     <mkdir dir="${dist}/tools"/>
     <copy todir="${dist}/tools">
diff --git a/tools/collect-view/src/se/sics/contiki/collect/CollectServer.java b/tools/collect-view/src/se/sics/contiki/collect/CollectServer.java
index 6a439cd53..f1bb0fc1e 100644
--- a/tools/collect-view/src/se/sics/contiki/collect/CollectServer.java
+++ b/tools/collect-view/src/se/sics/contiki/collect/CollectServer.java
@@ -26,7 +26,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $Id: CollectServer.java,v 1.4 2010/11/12 17:52:02 nifi Exp $
+ * $Id: CollectServer.java,v 1.5 2010/12/07 22:46:13 adamdunkels Exp $
  *
  * -----------------------------------------------------------------
  *
@@ -34,8 +34,8 @@
  *
  * Authors : Joakim Eriksson, Niclas Finne
  * Created : 3 jul 2008
- * Updated : $Date: 2010/11/12 17:52:02 $
- *           $Revision: 1.4 $
+ * Updated : $Date: 2010/12/07 22:46:13 $
+ *           $Revision: 1.5 $
  */
 
 package se.sics.contiki.collect;
@@ -105,7 +105,7 @@ public class CollectServer implements SerialConnectionListener {
   public static final String SENSORDATA_FILE = "sensordata.log";
   public static final String CONFIG_DATA_FILE = "collect-data.conf";
   public static final String INIT_SCRIPT = "collect-init.script";
-  public static final String FIRMWARE_FILE = "sky-shell.ihex";
+  public static final String FIRMWARE_FILE = "collect-view-shell.ihex";
 
   /* Categories for the tab pane */
   private static final String MAIN = "main";