From 20ea27c468991b678cb831eeb8ececb2f276fb11 Mon Sep 17 00:00:00 2001
From: nifi <nifi>
Date: Wed, 8 Sep 2010 12:39:40 +0000
Subject: [PATCH] Updated to sort nodes by numeric id instead of name

---
 .../sics/contiki/collect/CollectServer.java   | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/examples/sky-shell/src/se/sics/contiki/collect/CollectServer.java b/examples/sky-shell/src/se/sics/contiki/collect/CollectServer.java
index 66f8005dc..6ca315e9e 100644
--- a/examples/sky-shell/src/se/sics/contiki/collect/CollectServer.java
+++ b/examples/sky-shell/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.11 2010/09/06 22:42:29 nifi Exp $
+ * $Id: CollectServer.java,v 1.12 2010/09/08 12:39:40 nifi Exp $
  *
  * -----------------------------------------------------------------
  *
@@ -34,8 +34,8 @@
  *
  * Authors : Joakim Eriksson, Niclas Finne
  * Created : 3 jul 2008
- * Updated : $Date: 2010/09/06 22:42:29 $
- *           $Revision: 1.11 $
+ * Updated : $Date: 2010/09/08 12:39:40 $
+ *           $Revision: 1.12 $
  */
 
 package se.sics.contiki.collect;
@@ -731,11 +731,18 @@ public class CollectServer {
         final Node newNode = node;
         SwingUtilities.invokeLater(new Runnable() {
             public void run() {
-              // Insert the node sorted by name
-              String nodeName = newNode.getName();
+              // Insert the node sorted by id
+              String nodeID = newNode.getID();
               boolean added = false;
               for (int i = 0, n = nodeModel.size(); i < n; i++) {
-                int cmp = nodeName.compareTo(((Node) nodeModel.get(i)).getName());
+                String id = ((Node) nodeModel.get(i)).getID();
+                int cmp;
+                // Shorter id first (4.0 before 10.0)
+                if (nodeID.length() == id.length()) {
+                  cmp = nodeID.compareTo(id);
+                } else {
+                  cmp = nodeID.length() - id.length();
+                }
                 if (cmp < 0) {
                   nodeModel.insertElementAt(newNode, i);
                   added = true;