From 7496952a3287ab1fc3109d3c64bebe30605b19b3 Mon Sep 17 00:00:00 2001
From: Fredrik Norberg <fnorbe@dsv.su.se>
Date: Tue, 2 Aug 2011 14:37:32 +0200
Subject: [PATCH] fixed a bugg where events didnt order properly
---
.../se/su/dsv/scipro/data/dataobjects/Event.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/src/main/java/se/su/dsv/scipro/data/dataobjects/Event.java b/src/main/java/se/su/dsv/scipro/data/dataobjects/Event.java
index 413633c472..931c51f226 100644
--- a/src/main/java/se/su/dsv/scipro/data/dataobjects/Event.java
+++ b/src/main/java/se/su/dsv/scipro/data/dataobjects/Event.java
@@ -154,7 +154,17 @@ public abstract class Event extends LazyDeletableDomainObject
@Override
public int compareTo(Event other) {
- return (int) (dueDate.getTime() - other.dueDate.getTime());
+ int dcomp = dueDate.compareTo(other.dueDate);
+ if (dcomp == 0){
+ if (id == null){
+ return -1;
+ }else if(other.id == null){
+ return 1;
+ }
+ else return id.compareTo(other.id);
+ }
+
+ return dcomp;
}
public Panel getDisplayPanel(String id){