Author: knguyen
Date: Wed Jun 6 12:38:40 2007
New Revision: 17467
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17467&repname=
=3Djahia
Log:
fix events comparator
Modified:
trunk/core/src/java/org/jahia/services/events/JahiaEventGeneratorBaseSe=
rvice.java
Modified: trunk/core/src/java/org/jahia/services/events/JahiaEventGenerator=
BaseService.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/services/events/JahiaEventGeneratorBaseService.java&rev=3D17467&re=
pname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/services/events/JahiaEventGeneratorBaseSe=
rvice.java (original)
+++ trunk/core/src/java/org/jahia/services/events/JahiaEventGeneratorBaseSe=
rvice.java Wed Jun 6 12:38:40 2007
@@ -102,7 +102,7 @@
}
aggEvent.getEvents().add(methodWithEvent.event);
}
- SortedSet orderedEvents =3D new TreeSet();
+ SortedSet orderedEvents =3D new TreeSet(new AggregateEvent=
Comparator());
orderedEvents.addAll(aggregateEvents.values());
for (Iterator iterator =3D orderedEvents.iterator(); itera=
tor.hasNext();) {
aggEvent =3D (AggregatedEvents) iterator.next();
@@ -113,7 +113,6 @@
} catch (JahiaException e) {
e.printStackTrace();
}
-
}
}
}
@@ -497,7 +496,7 @@
}
}
=
- class AggregatedEvents implements Comparable {
+ class AggregatedEvents {
=
String name;
List events;
@@ -538,16 +537,16 @@
public void setWeight(int weight) {
this.weight =3D weight;
}
+ }
=
- public int compareTo(Object o){
- AggregatedEvents obj =3D (AggregatedEvents) o;
- if ( obj.getWeight()>this.weight ){
+ class AggregateEventComparator implements Comparator {
+ public int compare(Object obj1, Object obj2){
+ AggregatedEvents agEv1 =3D (AggregatedEvents) obj1;
+ AggregatedEvents agEv2 =3D (AggregatedEvents) obj2;
+ if ( agEv2.getWeight()>agEv1.getWeight() ){
return 1;
- } else if ( this.weight=3D=3Dobj.getWeight() ){
- return 0;
- } else {
- return -1;
}
+ return -1;
}
}
}
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
