[freenet-cvs] r19438 - trunk/freenet/src/freenet/node/useralerts

[t...@freenetproject.org]

Author: toad
Date: 2008-04-19 17:19:21 +0000 (Sat, 19 Apr 2008)
New Revision: 19438

Modified:
   trunk/freenet/src/freenet/node/useralerts/UserAlertManager.java
Log:
Sort by class first so similar types of alerts are grouped together

Modified: trunk/freenet/src/freenet/node/useralerts/UserAlertManager.java
===================================================================
--- trunk/freenet/src/freenet/node/useralerts/UserAlertManager.java     
2008-04-19 17:09:32 UTC (rev 19437)
+++ trunk/freenet/src/freenet/node/useralerts/UserAlertManager.java     
2008-04-19 17:19:21 UTC (rev 19438)
@@ -80,6 +80,12 @@
                short prio0 = a0.getPriorityClass();
                short prio1 = a1.getPriorityClass();
                if(prio0 - prio1 == 0) {
+                       // First go by class
+                       int classHash0 = a0.getClass().hashCode();
+                       int classHash1 = a1.getClass().hashCode();
+                       if(classHash0 > classHash1) return 1;
+                       else if(classHash0 < classHash1) return -1;
+                       // Then by object hashCode
                        int hash0 = a0.hashCode();
                        int hash1 = a1.hashCode();
                        if(hash0 > hash1) return 1;