Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentSessionComparator.java =================================================================== diff -u -r56d960690e7e4d738f1a2200c383a05e4f786ab6 -r3d350cca3620b3521afde8aa2ae0d2cc6edddbfe --- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentSessionComparator.java (.../AssessmentSessionComparator.java) (revision 56d960690e7e4d738f1a2200c383a05e4f786ab6) +++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentSessionComparator.java (.../AssessmentSessionComparator.java) (revision 3d350cca3620b3521afde8aa2ae0d2cc6edddbfe) @@ -26,23 +26,24 @@ import java.util.Comparator; import org.lamsfoundation.lams.tool.assessment.model.AssessmentSession; +import org.lamsfoundation.lams.util.AlphanumComparator; /** - * AssessmentSessionComparator. + * AssessmentSession comparator. * * @author Andrey Balan * */ public class AssessmentSessionComparator implements Comparator { - public int compare(AssessmentSession o1, AssessmentSession o2) { - if ((o1 != null) && (o2 != null) & (o1.getSessionStartDate() != null) && (o2.getSessionStartDate() != null)) { - return (o1.getSessionStartDate().getTime() - o2.getSessionStartDate().getTime()) > 0 ? 1 : -1; - } else if (o1 != null) { - return 1; - } else { - return -1; - } + private static AlphanumComparator alphanumComparator = new AlphanumComparator(); + + public int compare(AssessmentSession session1, AssessmentSession session2) { + + String session1Name = session1 != null ? session1.getSessionName() : ""; + String session2Name = session2 != null ? session2.getSessionName() : ""; + + return alphanumComparator.compare(session1Name, session2Name); } }