From 04fa7149309e23372edc35ebda987017cbdd96e8 Mon Sep 17 00:00:00 2001 From: adamdunkels Date: Wed, 3 Nov 2010 14:53:05 +0000 Subject: [PATCH] Moved the Collect-view application from the examples/sky-shell directory and into its own tools/collect-view directory --- .../sky-shell => tools/collect-view}/build.xml | 0 tools/collect-view/collect-init.script | 6 ++++++ .../collect-view}/lib/jcommon-1.0.13.jar | Bin .../collect-view}/lib/jfreechart-1.0.10.jar | Bin .../src/se/sics/contiki/collect/CollectServer.java | 6 +++--- .../se/sics/contiki/collect/CommandConnection.java | 4 ++-- .../src/se/sics/contiki/collect/Configurable.java | 4 ++-- .../src/se/sics/contiki/collect/Link.java | 4 ++-- .../src/se/sics/contiki/collect/MoteFinder.java | 6 +++--- .../src/se/sics/contiki/collect/MoteProgrammer.java | 6 +++--- .../sics/contiki/collect/MoteProgrammerProcess.java | 6 +++--- .../src/se/sics/contiki/collect/Node.java | 6 +++--- .../src/se/sics/contiki/collect/SensorData.java | 6 +++--- .../sics/contiki/collect/SensorDataAggregator.java | 6 +++--- .../src/se/sics/contiki/collect/SensorInfo.java | 6 +++--- .../se/sics/contiki/collect/SerialConnection.java | 6 +++--- .../contiki/collect/SerialConnectionListener.java | 4 ++-- .../sics/contiki/collect/SerialDumpConnection.java | 4 ++-- .../se/sics/contiki/collect/StdinConnection.java | 4 ++-- .../src/se/sics/contiki/collect/Visualizer.java | 6 +++--- .../collect/gui/AggregatedTimeChartPanel.java | 4 ++-- .../se/sics/contiki/collect/gui/BarChartPanel.java | 6 +++--- .../src/se/sics/contiki/collect/gui/MapPanel.java | 6 +++--- .../se/sics/contiki/collect/gui/NodeControl.java | 6 +++--- .../se/sics/contiki/collect/gui/NodeInfoPanel.java | 6 +++--- .../se/sics/contiki/collect/gui/SerialConsole.java | 6 +++--- .../se/sics/contiki/collect/gui/TimeChartPanel.java | 6 +++--- 27 files changed, 68 insertions(+), 62 deletions(-) rename {examples/sky-shell => tools/collect-view}/build.xml (100%) create mode 100644 tools/collect-view/collect-init.script rename {examples/sky-shell => tools/collect-view}/lib/jcommon-1.0.13.jar (100%) rename {examples/sky-shell => tools/collect-view}/lib/jfreechart-1.0.10.jar (100%) rename {examples/sky-shell => tools/collect-view}/src/se/sics/contiki/collect/CollectServer.java (99%) rename {examples/sky-shell => tools/collect-view}/src/se/sics/contiki/collect/CommandConnection.java (97%) rename {examples/sky-shell => tools/collect-view}/src/se/sics/contiki/collect/Configurable.java (94%) rename {examples/sky-shell => tools/collect-view}/src/se/sics/contiki/collect/Link.java (95%) rename {examples/sky-shell => tools/collect-view}/src/se/sics/contiki/collect/MoteFinder.java (98%) rename {examples/sky-shell => tools/collect-view}/src/se/sics/contiki/collect/MoteProgrammer.java (98%) rename {examples/sky-shell => tools/collect-view}/src/se/sics/contiki/collect/MoteProgrammerProcess.java (97%) rename {examples/sky-shell => tools/collect-view}/src/se/sics/contiki/collect/Node.java (97%) rename {examples/sky-shell => tools/collect-view}/src/se/sics/contiki/collect/SensorData.java (98%) rename {examples/sky-shell => tools/collect-view}/src/se/sics/contiki/collect/SensorDataAggregator.java (98%) rename {examples/sky-shell => tools/collect-view}/src/se/sics/contiki/collect/SensorInfo.java (96%) rename {examples/sky-shell => tools/collect-view}/src/se/sics/contiki/collect/SerialConnection.java (96%) rename {examples/sky-shell => tools/collect-view}/src/se/sics/contiki/collect/SerialConnectionListener.java (94%) rename {examples/sky-shell => tools/collect-view}/src/se/sics/contiki/collect/SerialDumpConnection.java (96%) rename {examples/sky-shell => tools/collect-view}/src/se/sics/contiki/collect/StdinConnection.java (97%) rename {examples/sky-shell => tools/collect-view}/src/se/sics/contiki/collect/Visualizer.java (93%) rename {examples/sky-shell => tools/collect-view}/src/se/sics/contiki/collect/gui/AggregatedTimeChartPanel.java (98%) rename {examples/sky-shell => tools/collect-view}/src/se/sics/contiki/collect/gui/BarChartPanel.java (98%) rename {examples/sky-shell => tools/collect-view}/src/se/sics/contiki/collect/gui/MapPanel.java (99%) rename {examples/sky-shell => tools/collect-view}/src/se/sics/contiki/collect/gui/NodeControl.java (98%) rename {examples/sky-shell => tools/collect-view}/src/se/sics/contiki/collect/gui/NodeInfoPanel.java (99%) rename {examples/sky-shell => tools/collect-view}/src/se/sics/contiki/collect/gui/SerialConsole.java (98%) rename {examples/sky-shell => tools/collect-view}/src/se/sics/contiki/collect/gui/TimeChartPanel.java (98%) diff --git a/examples/sky-shell/build.xml b/tools/collect-view/build.xml similarity index 100% rename from examples/sky-shell/build.xml rename to tools/collect-view/build.xml diff --git a/tools/collect-view/collect-init.script b/tools/collect-view/collect-init.script new file mode 100644 index 000000000..493cd46c5 --- /dev/null +++ b/tools/collect-view/collect-init.script @@ -0,0 +1,6 @@ +echo ~K +echo killall +sleep 2 +echo mac 0 +sleep 2 +echo time %TIME% | null diff --git a/examples/sky-shell/lib/jcommon-1.0.13.jar b/tools/collect-view/lib/jcommon-1.0.13.jar similarity index 100% rename from examples/sky-shell/lib/jcommon-1.0.13.jar rename to tools/collect-view/lib/jcommon-1.0.13.jar diff --git a/examples/sky-shell/lib/jfreechart-1.0.10.jar b/tools/collect-view/lib/jfreechart-1.0.10.jar similarity index 100% rename from examples/sky-shell/lib/jfreechart-1.0.10.jar rename to tools/collect-view/lib/jfreechart-1.0.10.jar diff --git a/examples/sky-shell/src/se/sics/contiki/collect/CollectServer.java b/tools/collect-view/src/se/sics/contiki/collect/CollectServer.java similarity index 99% rename from examples/sky-shell/src/se/sics/contiki/collect/CollectServer.java rename to tools/collect-view/src/se/sics/contiki/collect/CollectServer.java index 57d791041..087aee1ce 100644 --- a/examples/sky-shell/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.33 2010/10/28 21:49:01 nifi Exp $ + * $Id: CollectServer.java,v 1.1 2010/11/03 14:53:05 adamdunkels Exp $ * * ----------------------------------------------------------------- * @@ -34,8 +34,8 @@ * * Authors : Joakim Eriksson, Niclas Finne * Created : 3 jul 2008 - * Updated : $Date: 2010/10/28 21:49:01 $ - * $Revision: 1.33 $ + * Updated : $Date: 2010/11/03 14:53:05 $ + * $Revision: 1.1 $ */ package se.sics.contiki.collect; diff --git a/examples/sky-shell/src/se/sics/contiki/collect/CommandConnection.java b/tools/collect-view/src/se/sics/contiki/collect/CommandConnection.java similarity index 97% rename from examples/sky-shell/src/se/sics/contiki/collect/CommandConnection.java rename to tools/collect-view/src/se/sics/contiki/collect/CommandConnection.java index c0e3f0377..d4237e8a9 100644 --- a/examples/sky-shell/src/se/sics/contiki/collect/CommandConnection.java +++ b/tools/collect-view/src/se/sics/contiki/collect/CommandConnection.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: CommandConnection.java,v 1.1 2010/10/07 21:13:00 nifi Exp $ + * $Id: CommandConnection.java,v 1.1 2010/11/03 14:53:05 adamdunkels Exp $ * * ----------------------------------------------------------------- * @@ -34,7 +34,7 @@ * * Authors : Joakim Eriksson, Niclas Finne * Created : 5 oct 2010 - * Updated : $Date: 2010/10/07 21:13:00 $ + * Updated : $Date: 2010/11/03 14:53:05 $ * $Revision: 1.1 $ */ diff --git a/examples/sky-shell/src/se/sics/contiki/collect/Configurable.java b/tools/collect-view/src/se/sics/contiki/collect/Configurable.java similarity index 94% rename from examples/sky-shell/src/se/sics/contiki/collect/Configurable.java rename to tools/collect-view/src/se/sics/contiki/collect/Configurable.java index 13a234cb8..131350369 100644 --- a/examples/sky-shell/src/se/sics/contiki/collect/Configurable.java +++ b/tools/collect-view/src/se/sics/contiki/collect/Configurable.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: Configurable.java,v 1.1 2010/09/26 21:48:21 nifi Exp $ + * $Id: Configurable.java,v 1.1 2010/11/03 14:53:05 adamdunkels Exp $ * * ----------------------------------------------------------------- * @@ -34,7 +34,7 @@ * * Authors : Joakim Eriksson, Niclas Finne * Created : 24 sep 2010 - * Updated : $Date: 2010/09/26 21:48:21 $ + * Updated : $Date: 2010/11/03 14:53:05 $ * $Revision: 1.1 $ */ diff --git a/examples/sky-shell/src/se/sics/contiki/collect/Link.java b/tools/collect-view/src/se/sics/contiki/collect/Link.java similarity index 95% rename from examples/sky-shell/src/se/sics/contiki/collect/Link.java rename to tools/collect-view/src/se/sics/contiki/collect/Link.java index 585fc8be0..0989c425d 100644 --- a/examples/sky-shell/src/se/sics/contiki/collect/Link.java +++ b/tools/collect-view/src/se/sics/contiki/collect/Link.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: Link.java,v 1.1 2008/07/09 23:18:06 nifi Exp $ + * $Id: Link.java,v 1.1 2010/11/03 14:53:05 adamdunkels Exp $ * * ----------------------------------------------------------------- * @@ -34,7 +34,7 @@ * * Authors : Joakim Eriksson, Niclas Finne * Created : 3 jul 2008 - * Updated : $Date: 2008/07/09 23:18:06 $ + * Updated : $Date: 2010/11/03 14:53:05 $ * $Revision: 1.1 $ */ diff --git a/examples/sky-shell/src/se/sics/contiki/collect/MoteFinder.java b/tools/collect-view/src/se/sics/contiki/collect/MoteFinder.java similarity index 98% rename from examples/sky-shell/src/se/sics/contiki/collect/MoteFinder.java rename to tools/collect-view/src/se/sics/contiki/collect/MoteFinder.java index f8a8717fe..5000402d8 100644 --- a/examples/sky-shell/src/se/sics/contiki/collect/MoteFinder.java +++ b/tools/collect-view/src/se/sics/contiki/collect/MoteFinder.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: MoteFinder.java,v 1.2 2008/09/03 13:35:21 nifi Exp $ + * $Id: MoteFinder.java,v 1.1 2010/11/03 14:53:05 adamdunkels Exp $ * * ----------------------------------------------------------------- * @@ -34,8 +34,8 @@ * * Authors : Joakim Eriksson, Niclas Finne * Created : 4 jul 2008 - * Updated : $Date: 2008/09/03 13:35:21 $ - * $Revision: 1.2 $ + * Updated : $Date: 2010/11/03 14:53:05 $ + * $Revision: 1.1 $ */ package se.sics.contiki.collect; diff --git a/examples/sky-shell/src/se/sics/contiki/collect/MoteProgrammer.java b/tools/collect-view/src/se/sics/contiki/collect/MoteProgrammer.java similarity index 98% rename from examples/sky-shell/src/se/sics/contiki/collect/MoteProgrammer.java rename to tools/collect-view/src/se/sics/contiki/collect/MoteProgrammer.java index 92a0a948e..25d014ed6 100644 --- a/examples/sky-shell/src/se/sics/contiki/collect/MoteProgrammer.java +++ b/tools/collect-view/src/se/sics/contiki/collect/MoteProgrammer.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: MoteProgrammer.java,v 1.2 2008/09/03 13:35:21 nifi Exp $ + * $Id: MoteProgrammer.java,v 1.1 2010/11/03 14:53:05 adamdunkels Exp $ * * ----------------------------------------------------------------- * @@ -34,8 +34,8 @@ * * Authors : Joakim Eriksson, Niclas Finne * Created : 10 jul 2008 - * Updated : $Date: 2008/09/03 13:35:21 $ - * $Revision: 1.2 $ + * Updated : $Date: 2010/11/03 14:53:05 $ + * $Revision: 1.1 $ */ package se.sics.contiki.collect; diff --git a/examples/sky-shell/src/se/sics/contiki/collect/MoteProgrammerProcess.java b/tools/collect-view/src/se/sics/contiki/collect/MoteProgrammerProcess.java similarity index 97% rename from examples/sky-shell/src/se/sics/contiki/collect/MoteProgrammerProcess.java rename to tools/collect-view/src/se/sics/contiki/collect/MoteProgrammerProcess.java index ae7ab32e5..1864accbd 100644 --- a/examples/sky-shell/src/se/sics/contiki/collect/MoteProgrammerProcess.java +++ b/tools/collect-view/src/se/sics/contiki/collect/MoteProgrammerProcess.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: MoteProgrammerProcess.java,v 1.2 2008/09/03 13:35:21 nifi Exp $ + * $Id: MoteProgrammerProcess.java,v 1.1 2010/11/03 14:53:05 adamdunkels Exp $ * * ----------------------------------------------------------------- * @@ -34,8 +34,8 @@ * * Authors : Joakim Eriksson, Niclas Finne * Created : 10 jul 2008 - * Updated : $Date: 2008/09/03 13:35:21 $ - * $Revision: 1.2 $ + * Updated : $Date: 2010/11/03 14:53:05 $ + * $Revision: 1.1 $ */ package se.sics.contiki.collect; diff --git a/examples/sky-shell/src/se/sics/contiki/collect/Node.java b/tools/collect-view/src/se/sics/contiki/collect/Node.java similarity index 97% rename from examples/sky-shell/src/se/sics/contiki/collect/Node.java rename to tools/collect-view/src/se/sics/contiki/collect/Node.java index a4d9613b6..bcd1fbd0e 100644 --- a/examples/sky-shell/src/se/sics/contiki/collect/Node.java +++ b/tools/collect-view/src/se/sics/contiki/collect/Node.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: Node.java,v 1.9 2010/10/14 18:53:08 nifi Exp $ + * $Id: Node.java,v 1.1 2010/11/03 14:53:05 adamdunkels Exp $ * * ----------------------------------------------------------------- * @@ -34,8 +34,8 @@ * * Authors : Joakim Eriksson, Niclas Finne * Created : 3 jul 2008 - * Updated : $Date: 2010/10/14 18:53:08 $ - * $Revision: 1.9 $ + * Updated : $Date: 2010/11/03 14:53:05 $ + * $Revision: 1.1 $ */ package se.sics.contiki.collect; diff --git a/examples/sky-shell/src/se/sics/contiki/collect/SensorData.java b/tools/collect-view/src/se/sics/contiki/collect/SensorData.java similarity index 98% rename from examples/sky-shell/src/se/sics/contiki/collect/SensorData.java rename to tools/collect-view/src/se/sics/contiki/collect/SensorData.java index a10f62b26..3cfe7b5fa 100644 --- a/examples/sky-shell/src/se/sics/contiki/collect/SensorData.java +++ b/tools/collect-view/src/se/sics/contiki/collect/SensorData.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: SensorData.java,v 1.11 2010/10/07 21:01:46 nifi Exp $ + * $Id: SensorData.java,v 1.1 2010/11/03 14:53:05 adamdunkels Exp $ * * ----------------------------------------------------------------- * @@ -34,8 +34,8 @@ * * Authors : Joakim Eriksson, Niclas Finne * Created : 3 jul 2008 - * Updated : $Date: 2010/10/07 21:01:46 $ - * $Revision: 1.11 $ + * Updated : $Date: 2010/11/03 14:53:05 $ + * $Revision: 1.1 $ */ package se.sics.contiki.collect; diff --git a/examples/sky-shell/src/se/sics/contiki/collect/SensorDataAggregator.java b/tools/collect-view/src/se/sics/contiki/collect/SensorDataAggregator.java similarity index 98% rename from examples/sky-shell/src/se/sics/contiki/collect/SensorDataAggregator.java rename to tools/collect-view/src/se/sics/contiki/collect/SensorDataAggregator.java index f103abe6f..818e9006e 100644 --- a/examples/sky-shell/src/se/sics/contiki/collect/SensorDataAggregator.java +++ b/tools/collect-view/src/se/sics/contiki/collect/SensorDataAggregator.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: SensorDataAggregator.java,v 1.12 2010/10/24 21:40:54 nifi Exp $ + * $Id: SensorDataAggregator.java,v 1.1 2010/11/03 14:53:05 adamdunkels Exp $ * * ----------------------------------------------------------------- * @@ -34,8 +34,8 @@ * * Authors : Joakim Eriksson, Niclas Finne * Created : 20 aug 2008 - * Updated : $Date: 2010/10/24 21:40:54 $ - * $Revision: 1.12 $ + * Updated : $Date: 2010/11/03 14:53:05 $ + * $Revision: 1.1 $ */ package se.sics.contiki.collect; diff --git a/examples/sky-shell/src/se/sics/contiki/collect/SensorInfo.java b/tools/collect-view/src/se/sics/contiki/collect/SensorInfo.java similarity index 96% rename from examples/sky-shell/src/se/sics/contiki/collect/SensorInfo.java rename to tools/collect-view/src/se/sics/contiki/collect/SensorInfo.java index 54e9627eb..96e37ef52 100644 --- a/examples/sky-shell/src/se/sics/contiki/collect/SensorInfo.java +++ b/tools/collect-view/src/se/sics/contiki/collect/SensorInfo.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: SensorInfo.java,v 1.5 2010/10/24 21:40:54 nifi Exp $ + * $Id: SensorInfo.java,v 1.1 2010/11/03 14:53:05 adamdunkels Exp $ * * ----------------------------------------------------------------- * @@ -34,8 +34,8 @@ * * Authors : Joakim Eriksson, Niclas Finne * Created : 20 aug 2008 - * Updated : $Date: 2010/10/24 21:40:54 $ - * $Revision: 1.5 $ + * Updated : $Date: 2010/11/03 14:53:05 $ + * $Revision: 1.1 $ */ package se.sics.contiki.collect; diff --git a/examples/sky-shell/src/se/sics/contiki/collect/SerialConnection.java b/tools/collect-view/src/se/sics/contiki/collect/SerialConnection.java similarity index 96% rename from examples/sky-shell/src/se/sics/contiki/collect/SerialConnection.java rename to tools/collect-view/src/se/sics/contiki/collect/SerialConnection.java index a1ff4b872..289c6237b 100644 --- a/examples/sky-shell/src/se/sics/contiki/collect/SerialConnection.java +++ b/tools/collect-view/src/se/sics/contiki/collect/SerialConnection.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: SerialConnection.java,v 1.4 2010/10/07 21:13:00 nifi Exp $ + * $Id: SerialConnection.java,v 1.1 2010/11/03 14:53:05 adamdunkels Exp $ * * ----------------------------------------------------------------- * @@ -34,8 +34,8 @@ * * Authors : Joakim Eriksson, Niclas Finne * Created : 5 jul 2008 - * Updated : $Date: 2010/10/07 21:13:00 $ - * $Revision: 1.4 $ + * Updated : $Date: 2010/11/03 14:53:05 $ + * $Revision: 1.1 $ */ package se.sics.contiki.collect; diff --git a/examples/sky-shell/src/se/sics/contiki/collect/SerialConnectionListener.java b/tools/collect-view/src/se/sics/contiki/collect/SerialConnectionListener.java similarity index 94% rename from examples/sky-shell/src/se/sics/contiki/collect/SerialConnectionListener.java rename to tools/collect-view/src/se/sics/contiki/collect/SerialConnectionListener.java index 81fe72956..081f9eba9 100644 --- a/examples/sky-shell/src/se/sics/contiki/collect/SerialConnectionListener.java +++ b/tools/collect-view/src/se/sics/contiki/collect/SerialConnectionListener.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: SerialConnectionListener.java,v 1.1 2010/10/07 21:13:00 nifi Exp $ + * $Id: SerialConnectionListener.java,v 1.1 2010/11/03 14:53:05 adamdunkels Exp $ * * ----------------------------------------------------------------- * @@ -34,7 +34,7 @@ * * Authors : Joakim Eriksson, Niclas Finne * Created : 5 oct 2010 - * Updated : $Date: 2010/10/07 21:13:00 $ + * Updated : $Date: 2010/11/03 14:53:05 $ * $Revision: 1.1 $ */ package se.sics.contiki.collect; diff --git a/examples/sky-shell/src/se/sics/contiki/collect/SerialDumpConnection.java b/tools/collect-view/src/se/sics/contiki/collect/SerialDumpConnection.java similarity index 96% rename from examples/sky-shell/src/se/sics/contiki/collect/SerialDumpConnection.java rename to tools/collect-view/src/se/sics/contiki/collect/SerialDumpConnection.java index 2593593f2..e0847b31e 100644 --- a/examples/sky-shell/src/se/sics/contiki/collect/SerialDumpConnection.java +++ b/tools/collect-view/src/se/sics/contiki/collect/SerialDumpConnection.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: SerialDumpConnection.java,v 1.1 2010/10/07 21:13:00 nifi Exp $ + * $Id: SerialDumpConnection.java,v 1.1 2010/11/03 14:53:05 adamdunkels Exp $ * * ----------------------------------------------------------------- * @@ -34,7 +34,7 @@ * * Authors : Joakim Eriksson, Niclas Finne * Created : 5 oct 2010 - * Updated : $Date: 2010/10/07 21:13:00 $ + * Updated : $Date: 2010/11/03 14:53:05 $ * $Revision: 1.1 $ */ diff --git a/examples/sky-shell/src/se/sics/contiki/collect/StdinConnection.java b/tools/collect-view/src/se/sics/contiki/collect/StdinConnection.java similarity index 97% rename from examples/sky-shell/src/se/sics/contiki/collect/StdinConnection.java rename to tools/collect-view/src/se/sics/contiki/collect/StdinConnection.java index 2298e501b..2c29568c9 100644 --- a/examples/sky-shell/src/se/sics/contiki/collect/StdinConnection.java +++ b/tools/collect-view/src/se/sics/contiki/collect/StdinConnection.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: StdinConnection.java,v 1.1 2010/10/07 21:13:00 nifi Exp $ + * $Id: StdinConnection.java,v 1.1 2010/11/03 14:53:05 adamdunkels Exp $ * * ----------------------------------------------------------------- * @@ -34,7 +34,7 @@ * * Authors : Niclas Finne * Created : 5 oct 2010 - * Updated : $Date: 2010/10/07 21:13:00 $ + * Updated : $Date: 2010/11/03 14:53:05 $ * $Revision: 1.1 $ */ diff --git a/examples/sky-shell/src/se/sics/contiki/collect/Visualizer.java b/tools/collect-view/src/se/sics/contiki/collect/Visualizer.java similarity index 93% rename from examples/sky-shell/src/se/sics/contiki/collect/Visualizer.java rename to tools/collect-view/src/se/sics/contiki/collect/Visualizer.java index 192cfedf6..77024f37b 100644 --- a/examples/sky-shell/src/se/sics/contiki/collect/Visualizer.java +++ b/tools/collect-view/src/se/sics/contiki/collect/Visualizer.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: Visualizer.java,v 1.2 2010/09/15 16:15:10 nifi Exp $ + * $Id: Visualizer.java,v 1.1 2010/11/03 14:53:05 adamdunkels Exp $ * * ----------------------------------------------------------------- * @@ -34,8 +34,8 @@ * * Authors : Joakim Eriksson, Niclas Finne * Created : 3 jul 2008 - * Updated : $Date: 2010/09/15 16:15:10 $ - * $Revision: 1.2 $ + * Updated : $Date: 2010/11/03 14:53:05 $ + * $Revision: 1.1 $ */ package se.sics.contiki.collect; diff --git a/examples/sky-shell/src/se/sics/contiki/collect/gui/AggregatedTimeChartPanel.java b/tools/collect-view/src/se/sics/contiki/collect/gui/AggregatedTimeChartPanel.java similarity index 98% rename from examples/sky-shell/src/se/sics/contiki/collect/gui/AggregatedTimeChartPanel.java rename to tools/collect-view/src/se/sics/contiki/collect/gui/AggregatedTimeChartPanel.java index 688eec594..c5c911862 100644 --- a/examples/sky-shell/src/se/sics/contiki/collect/gui/AggregatedTimeChartPanel.java +++ b/tools/collect-view/src/se/sics/contiki/collect/gui/AggregatedTimeChartPanel.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: AggregatedTimeChartPanel.java,v 1.1 2010/09/21 20:24:19 nifi Exp $ + * $Id: AggregatedTimeChartPanel.java,v 1.1 2010/11/03 14:53:05 adamdunkels Exp $ * * ----------------------------------------------------------------- * @@ -34,7 +34,7 @@ * * Authors : Joakim Eriksson, Niclas Finne * Created : 6 sep 2010 - * Updated : $Date: 2010/09/21 20:24:19 $ + * Updated : $Date: 2010/11/03 14:53:05 $ * $Revision: 1.1 $ */ diff --git a/examples/sky-shell/src/se/sics/contiki/collect/gui/BarChartPanel.java b/tools/collect-view/src/se/sics/contiki/collect/gui/BarChartPanel.java similarity index 98% rename from examples/sky-shell/src/se/sics/contiki/collect/gui/BarChartPanel.java rename to tools/collect-view/src/se/sics/contiki/collect/gui/BarChartPanel.java index 7f5739f70..452cc032f 100644 --- a/examples/sky-shell/src/se/sics/contiki/collect/gui/BarChartPanel.java +++ b/tools/collect-view/src/se/sics/contiki/collect/gui/BarChartPanel.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: BarChartPanel.java,v 1.5 2010/09/15 16:15:10 nifi Exp $ + * $Id: BarChartPanel.java,v 1.1 2010/11/03 14:53:05 adamdunkels Exp $ * * ----------------------------------------------------------------- * @@ -34,8 +34,8 @@ * * Authors : Joakim Eriksson, Niclas Finne * Created : 5 jul 2008 - * Updated : $Date: 2010/09/15 16:15:10 $ - * $Revision: 1.5 $ + * Updated : $Date: 2010/11/03 14:53:05 $ + * $Revision: 1.1 $ */ package se.sics.contiki.collect.gui; diff --git a/examples/sky-shell/src/se/sics/contiki/collect/gui/MapPanel.java b/tools/collect-view/src/se/sics/contiki/collect/gui/MapPanel.java similarity index 99% rename from examples/sky-shell/src/se/sics/contiki/collect/gui/MapPanel.java rename to tools/collect-view/src/se/sics/contiki/collect/gui/MapPanel.java index 7d045153e..293033406 100644 --- a/examples/sky-shell/src/se/sics/contiki/collect/gui/MapPanel.java +++ b/tools/collect-view/src/se/sics/contiki/collect/gui/MapPanel.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: MapPanel.java,v 1.8 2010/10/28 21:50:22 nifi Exp $ + * $Id: MapPanel.java,v 1.1 2010/11/03 14:53:05 adamdunkels Exp $ * * ----------------------------------------------------------------- * @@ -34,8 +34,8 @@ * * Authors : Joakim Eriksson, Niclas Finne * Created : 3 jul 2008 - * Updated : $Date: 2010/10/28 21:50:22 $ - * $Revision: 1.8 $ + * Updated : $Date: 2010/11/03 14:53:05 $ + * $Revision: 1.1 $ */ package se.sics.contiki.collect.gui; diff --git a/examples/sky-shell/src/se/sics/contiki/collect/gui/NodeControl.java b/tools/collect-view/src/se/sics/contiki/collect/gui/NodeControl.java similarity index 98% rename from examples/sky-shell/src/se/sics/contiki/collect/gui/NodeControl.java rename to tools/collect-view/src/se/sics/contiki/collect/gui/NodeControl.java index 77a9e07e9..5b4babd95 100644 --- a/examples/sky-shell/src/se/sics/contiki/collect/gui/NodeControl.java +++ b/tools/collect-view/src/se/sics/contiki/collect/gui/NodeControl.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: NodeControl.java,v 1.8 2010/10/24 21:11:13 adamdunkels Exp $ + * $Id: NodeControl.java,v 1.1 2010/11/03 14:53:05 adamdunkels Exp $ * * ----------------------------------------------------------------- * @@ -34,8 +34,8 @@ * * Authors : Niclas Finne * Created : 27 sep 2010 - * Updated : $Date: 2010/10/24 21:11:13 $ - * $Revision: 1.8 $ + * Updated : $Date: 2010/11/03 14:53:05 $ + * $Revision: 1.1 $ */ package se.sics.contiki.collect.gui; diff --git a/examples/sky-shell/src/se/sics/contiki/collect/gui/NodeInfoPanel.java b/tools/collect-view/src/se/sics/contiki/collect/gui/NodeInfoPanel.java similarity index 99% rename from examples/sky-shell/src/se/sics/contiki/collect/gui/NodeInfoPanel.java rename to tools/collect-view/src/se/sics/contiki/collect/gui/NodeInfoPanel.java index 0aac7cff5..9451f9e4c 100644 --- a/examples/sky-shell/src/se/sics/contiki/collect/gui/NodeInfoPanel.java +++ b/tools/collect-view/src/se/sics/contiki/collect/gui/NodeInfoPanel.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: NodeInfoPanel.java,v 1.16 2010/10/26 13:05:08 nifi Exp $ + * $Id: NodeInfoPanel.java,v 1.1 2010/11/03 14:53:05 adamdunkels Exp $ * * ----------------------------------------------------------------- * @@ -34,8 +34,8 @@ * * Authors : Joakim Eriksson, Niclas Finne * Created : 6 sep 2010 - * Updated : $Date: 2010/10/26 13:05:08 $ - * $Revision: 1.16 $ + * Updated : $Date: 2010/11/03 14:53:05 $ + * $Revision: 1.1 $ */ package se.sics.contiki.collect.gui; diff --git a/examples/sky-shell/src/se/sics/contiki/collect/gui/SerialConsole.java b/tools/collect-view/src/se/sics/contiki/collect/gui/SerialConsole.java similarity index 98% rename from examples/sky-shell/src/se/sics/contiki/collect/gui/SerialConsole.java rename to tools/collect-view/src/se/sics/contiki/collect/gui/SerialConsole.java index ca09842c1..a7201e462 100644 --- a/examples/sky-shell/src/se/sics/contiki/collect/gui/SerialConsole.java +++ b/tools/collect-view/src/se/sics/contiki/collect/gui/SerialConsole.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: SerialConsole.java,v 1.3 2010/10/07 21:13:00 nifi Exp $ + * $Id: SerialConsole.java,v 1.1 2010/11/03 14:53:05 adamdunkels Exp $ * * ----------------------------------------------------------------- * @@ -34,8 +34,8 @@ * * Authors : Joakim Eriksson, Niclas Finne * Created : 4 jul 2008 - * Updated : $Date: 2010/10/07 21:13:00 $ - * $Revision: 1.3 $ + * Updated : $Date: 2010/11/03 14:53:05 $ + * $Revision: 1.1 $ */ package se.sics.contiki.collect.gui; diff --git a/examples/sky-shell/src/se/sics/contiki/collect/gui/TimeChartPanel.java b/tools/collect-view/src/se/sics/contiki/collect/gui/TimeChartPanel.java similarity index 98% rename from examples/sky-shell/src/se/sics/contiki/collect/gui/TimeChartPanel.java rename to tools/collect-view/src/se/sics/contiki/collect/gui/TimeChartPanel.java index 0ea370bb5..cacb4c9ba 100644 --- a/examples/sky-shell/src/se/sics/contiki/collect/gui/TimeChartPanel.java +++ b/tools/collect-view/src/se/sics/contiki/collect/gui/TimeChartPanel.java @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: TimeChartPanel.java,v 1.8 2010/10/13 22:55:47 nifi Exp $ + * $Id: TimeChartPanel.java,v 1.1 2010/11/03 14:53:05 adamdunkels Exp $ * * ----------------------------------------------------------------- * @@ -34,8 +34,8 @@ * * Authors : Joakim Eriksson, Niclas Finne * Created : 3 jul 2008 - * Updated : $Date: 2010/10/13 22:55:47 $ - * $Revision: 1.8 $ + * Updated : $Date: 2010/11/03 14:53:05 $ + * $Revision: 1.1 $ */ package se.sics.contiki.collect.gui;