Index: lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/SimpleVersionDetail.java =================================================================== RCS file: /usr/local/cvsroot/lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/SimpleVersionDetail.java,v diff -u -r1.5 -r1.5.14.1 --- lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/SimpleVersionDetail.java 17 Sep 2006 06:16:10 -0000 1.5 +++ lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/SimpleVersionDetail.java 22 May 2015 00:56:09 -0000 1.5.14.1 @@ -38,7 +38,7 @@ * * @author Fiona Malikoff */ -public class SimpleVersionDetail implements IVersionDetail { +public class SimpleVersionDetail implements IVersionDetail, Comparable { private Long versionId; private Date createdDateTime; @@ -138,4 +138,5 @@ } } + } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McOptsContent.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McOptsContent.java,v diff -u -r1.10 -r1.10.2.1 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McOptsContent.java 17 May 2014 19:54:43 -0000 1.10 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McOptsContent.java 22 May 2015 00:57:30 -0000 1.10.2.1 @@ -32,7 +32,7 @@ * * @author Ozgur Demirtas */ -public class McOptsContent implements Serializable, Comparable { +public class McOptsContent implements Serializable, Comparable { /** identifier field */ private Long uid; @@ -124,8 +124,7 @@ this.mcQueContentId = mcQueContentId; } - public int compareTo(Object o) { - McOptsContent optContent = (McOptsContent) o; + public int compareTo(McOptsContent optContent) { // if the object does not exist yet, then just return any one of 0, -1, 1. Should not make a difference. if (uid == null) return 1; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McQueContent.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McQueContent.java,v diff -u -r1.13 -r1.13.2.1 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McQueContent.java 17 May 2014 19:54:43 -0000 1.13 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McQueContent.java 22 May 2015 00:57:30 -0000 1.13.2.1 @@ -38,7 +38,7 @@ * * @author Ozgur Demirtas */ -public class McQueContent implements Serializable, Comparable { +public class McQueContent implements Serializable, Comparable { /** identifier field */ private Long uid; @@ -207,8 +207,7 @@ this.feedback = feedback; } - public int compareTo(Object o) { - McQueContent queContent = (McQueContent) o; + public int compareTo(McQueContent queContent) { // if the object does not exist yet, then just return any one of 0, -1, 1. Should not make a difference. if (mcQueContentId == null) return 1; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McQueUsr.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McQueUsr.java,v diff -u -r1.9 -r1.9.2.1 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McQueUsr.java 12 Aug 2013 16:29:03 -0000 1.9 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McQueUsr.java 22 May 2015 00:57:30 -0000 1.9.2.1 @@ -35,7 +35,7 @@ * * @author Ozgur Demirtas */ -public class McQueUsr implements Serializable { +public class McQueUsr implements Serializable, Comparable { /** identifier field */ private Long uid; @@ -191,4 +191,13 @@ } return false; } + + public int compareTo(McQueUsr other) { + // if the object does not exist yet, then just return any one of 0, -1, 1. Should not make a difference. + if (uid == null) + return 1; + else + return (int) (uid.longValue() - other.uid.longValue()); + } + } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McSession.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McSession.java,v diff -u -r1.8 -r1.8.2.1 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McSession.java 29 Jan 2014 20:22:12 -0000 1.8 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McSession.java 22 May 2015 00:57:30 -0000 1.8.2.1 @@ -37,7 +37,7 @@ * * @author Ozgur Demirtas */ -public class McSession implements Serializable { +public class McSession implements Serializable, Comparable { public final static String INCOMPLETE = "INCOMPLETE"; @@ -237,4 +237,13 @@ boolean isUserLeader = (groupLeader != null) && user.getUid().equals(groupLeader.getUid()); return isUserLeader; } + + public int compareTo(McSession other) { + // if the object does not exist yet, then just return any one of 0, -1, 1. Should not make a difference. + if (uid == null) + return 1; + else + return (int) (uid.longValue() - other.uid.longValue()); + } + } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McUsrAttempt.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McUsrAttempt.java,v diff -u -r1.12 -r1.12.2.1 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McUsrAttempt.java 17 May 2014 19:54:43 -0000 1.12 +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/pojos/McUsrAttempt.java 22 May 2015 00:57:30 -0000 1.12.2.1 @@ -35,7 +35,7 @@ * * @author Ozgur Demirtas */ -public class McUsrAttempt implements Serializable { +public class McUsrAttempt implements Serializable, Comparable { private static final long serialVersionUID = 4514268732673337338L; @@ -240,4 +240,12 @@ return getMark(); } + public int compareTo(McUsrAttempt other) { + // if the object does not exist yet, then just return any one of 0, -1, 1. Should not make a difference. + if (uid == null) + return 1; + else + return (int) (uid.longValue() - other.uid.longValue()); + } + } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.java,v diff -u -r1.14 -r1.14.2.1 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.java 4 Jul 2013 10:27:29 -0000 1.14 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueUsr.java 22 May 2015 00:57:31 -0000 1.14.2.1 @@ -40,7 +40,7 @@ * * Represents tool users. */ -public class QaQueUsr implements Serializable, Nullable { +public class QaQueUsr implements Serializable, Nullable, Comparable { private static final long serialVersionUID = -6768077344827699440L; @@ -234,4 +234,13 @@ public void setLearnerFinished(boolean learnerFinished) { this.learnerFinished = learnerFinished; } + + public int compareTo(QaQueUsr user) { + if (user.getUid() != null && uid != null) { + return user.getUid().compareTo(uid) * -1; + } else { + return 1; + } + } + } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteQueContent.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteQueContent.java,v diff -u -r1.10 -r1.10.2.1 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteQueContent.java 26 May 2014 22:44:39 -0000 1.10 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteQueContent.java 22 May 2015 00:58:36 -0000 1.10.2.1 @@ -32,7 +32,7 @@ * * @author Ozgur Demirtas */ -public class VoteQueContent implements Serializable, Comparable { +public class VoteQueContent implements Serializable, Comparable { /** identifier field */ private Long uid; @@ -106,8 +106,7 @@ return new ToStringBuilder(this).append("uid", getUid()).toString(); } - public int compareTo(Object o) { - VoteQueContent queContent = (VoteQueContent) o; + public int compareTo(VoteQueContent queContent) { // if the object does not exist yet, then just return any one of 0, -1, 1. Should not make a difference. if (uid == null) return 1; Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteQueUsr.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteQueUsr.java,v diff -u -r1.7 -r1.7.2.1 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteQueUsr.java 2 Jan 2014 23:12:50 -0000 1.7 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteQueUsr.java 22 May 2015 00:58:36 -0000 1.7.2.1 @@ -37,7 +37,7 @@ * * @author Ozgur Demirtas */ -public class VoteQueUsr implements Serializable { +public class VoteQueUsr implements Serializable, Comparable { private static final long serialVersionUID = 7303944502340276133L; @@ -193,4 +193,13 @@ public void setFinalScreenRequested(boolean finalScreenRequested) { this.finalScreenRequested = finalScreenRequested; } + + public int compareTo(VoteQueUsr other) { + // if the object does not exist yet, then just return any one of 0, -1, 1. Should not make a difference. + if (uid == null) + return 1; + else + return (int) (uid.longValue() - other.uid.longValue()); + } + } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteSession.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteSession.java,v diff -u -r1.5 -r1.5.2.1 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteSession.java 2 Jan 2014 23:12:50 -0000 1.5 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteSession.java 22 May 2015 00:58:36 -0000 1.5.2.1 @@ -36,7 +36,7 @@ * * @author Ozgur Demirtas */ -public class VoteSession implements Serializable { +public class VoteSession implements Serializable, Comparable { public final static String INCOMPLETE = "INCOMPLETE"; @@ -231,4 +231,14 @@ public void setGroupLeader(VoteQueUsr groupLeader) { this.groupLeader = groupLeader; } + + public int compareTo(VoteSession other) { + // if the object does not exist yet, then just return any one of 0, -1, 1. Should not make a difference. + if (uid == null) + return 1; + else + return (int) (uid.longValue() - other.uid.longValue()); + } + + } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteUsrAttempt.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteUsrAttempt.java,v diff -u -r1.15 -r1.15.2.1 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteUsrAttempt.java 6 Mar 2014 22:43:34 -0000 1.15 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/pojos/VoteUsrAttempt.java 22 May 2015 00:58:36 -0000 1.15.2.1 @@ -35,7 +35,7 @@ * * @author Ozgur Demirtas */ -public class VoteUsrAttempt implements Serializable { +public class VoteUsrAttempt implements Serializable, Comparable { /** identifier field */ private Long uid; @@ -222,4 +222,12 @@ this.visible = visible; } + public int compareTo(VoteUsrAttempt other) { + // if the object does not exist yet, then just return any one of 0, -1, 1. Should not make a difference. + if (uid == null) + return 1; + else + return (int) (uid.longValue() - other.uid.longValue()); + } + }