From 5a94145f7e7c85be16ec6fa3dca1d4c9c0a9d733 Mon Sep 17 00:00:00 2001
From: nifi <nifi>
Date: Thu, 14 Oct 2010 18:53:08 +0000
Subject: [PATCH] Bug fix: corrected sort with average numbers

---
 .../src/se/sics/contiki/collect/Node.java     | 12 +++++---
 .../contiki/collect/gui/NodeInfoPanel.java    | 29 +++++++++++++++----
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/examples/sky-shell/src/se/sics/contiki/collect/Node.java b/examples/sky-shell/src/se/sics/contiki/collect/Node.java
index 56bd21a95..a4d9613b6 100644
--- a/examples/sky-shell/src/se/sics/contiki/collect/Node.java
+++ b/examples/sky-shell/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.8 2010/10/10 22:39:09 nifi Exp $
+ * $Id: Node.java,v 1.9 2010/10/14 18:53:08 nifi Exp $
  *
  * -----------------------------------------------------------------
  *
@@ -34,8 +34,8 @@
  *
  * Authors : Joakim Eriksson, Niclas Finne
  * Created : 3 jul 2008
- * Updated : $Date: 2010/10/10 22:39:09 $
- *           $Revision: 1.8 $
+ * Updated : $Date: 2010/10/14 18:53:08 $
+ *           $Revision: 1.9 $
  */
 
 package se.sics.contiki.collect;
@@ -61,8 +61,12 @@ public class Node implements Comparable<Node> {
   private long lastActive;
 
   public Node(String nodeID) {
+    this(nodeID, nodeID);
+  }
+
+  public Node(String nodeID, String nodeName) {
     this.id = nodeID;
-    this.name = nodeID;
+    this.name = nodeName;
     sensorDataAggregator = new SensorDataAggregator(this);
   }
 
diff --git a/examples/sky-shell/src/se/sics/contiki/collect/gui/NodeInfoPanel.java b/examples/sky-shell/src/se/sics/contiki/collect/gui/NodeInfoPanel.java
index 6f8f10796..8b209729d 100644
--- a/examples/sky-shell/src/se/sics/contiki/collect/gui/NodeInfoPanel.java
+++ b/examples/sky-shell/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.13 2010/10/14 17:00:56 nifi Exp $
+ * $Id: NodeInfoPanel.java,v 1.14 2010/10/14 18:53:08 nifi Exp $
  *
  * -----------------------------------------------------------------
  *
@@ -34,8 +34,8 @@
  *
  * Authors : Joakim Eriksson, Niclas Finne
  * Created : 6 sep 2010
- * Updated : $Date: 2010/10/14 17:00:56 $
- *           $Revision: 1.13 $
+ * Updated : $Date: 2010/10/14 18:53:08 $
+ *           $Revision: 1.14 $
  */
 
 package se.sics.contiki.collect.gui;
@@ -46,6 +46,7 @@ import java.awt.Font;
 import java.awt.event.ActionEvent;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.util.Comparator;
 import java.util.Properties;
 
 import javax.swing.AbstractAction;
@@ -77,6 +78,16 @@ public class NodeInfoPanel extends JPanel implements Visualizer, Configurable {
 
   private static final long serialVersionUID = -1060893468047793431L;
 
+  private static Comparator<Number> NUMBER_COMPARATOR = new Comparator<Number>() {
+
+    public int compare(Number o1, Number o2) {
+      double v1 = o1.doubleValue();
+      double v2 = o2.doubleValue();
+      return (v1 < v2 ? -1 : (v1 == v2 ? 0 : 1));
+    }
+
+  };
+
   private final CollectServer server;
   private final String category;
   private final JTable table;
@@ -234,13 +245,19 @@ public class NodeInfoPanel extends JPanel implements Visualizer, Configurable {
     };
 
     // Do not sort column when clicking between the columns (resizing)
-    table.setRowSorter(new TableRowSorter<NodeModel>(nodeModel) {
+    TableRowSorter<NodeModel> sorter = new TableRowSorter<NodeModel>(nodeModel) {
       public void toggleSortOrder(int column) {
         if(table.getTableHeader().getCursor().getType() != Cursor.E_RESIZE_CURSOR) {
           super.toggleSortOrder(column);
         }
       }
-    });
+    };
+    for(int c = 0; c < columns.length; c++) {
+      if (columns[c].dataClass == Number.class) {
+        sorter.setComparator(c, NUMBER_COMPARATOR);
+      }
+    }
+    table.setRowSorter(sorter);
     // Pack the column when double clicking between columns (resizing)
     table.getTableHeader().addMouseListener(new MouseAdapter() {
       public void mouseClicked(MouseEvent e) {
@@ -514,7 +531,7 @@ public class NodeInfoPanel extends JPanel implements Visualizer, Configurable {
   public static abstract class TableData extends AbstractAction {
     private static final long serialVersionUID = -3045755073722516926L;
 
-    private final static Node AVERAGE_NODE = new Node("Avg");
+    private final static Node AVERAGE_NODE = new Node("99999999.9", "Avg");
 
     public final String name;
     public final Class<?> dataClass;