perfsonar development work

Author: nina
Date: 2007-10-28 16:18:15 -0400 (Sun, 28 Oct 2007)
New Revision: 3005

Modified:
   
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/UserDataComparator.java
Log:
to ensure stable order if the compared fields have equal values

Modified: 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/UserDataComparator.java
===================================================================
--- 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/UserDataComparator.java 
      2007-10-28 13:27:30 UTC (rev 3004)
+++ 
branches/perfsonarui/src/org/perfsonar/perfsonarui/ma/UserDataComparator.java 
      2007-10-28 20:18:15 UTC (rev 3005)
@@ -42,7 +42,9 @@
         super();
         this.mode = mode;
     }
-
+    private int compareByOrder(IUserData o1, IUserData o2) {
+            return ((UserData) o1).getNum() - ((UserData) o2).getNum();
+    }
     /* (non-Javadoc)
      * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
      */
@@ -103,10 +105,8 @@
                        break;
                }
                }
-               /*
-            if (r==0)
-                r = ((UserData) o1).compareTo((UserData) o2);
-            */
+               //to ensure stable order if the compared fields have N/A
+            if (r==0) r = compareByOrder(o1, o2);
             if (decreasing) return r; else return -r;    
        } else return 0;
     }