Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java =================================================================== diff -u -r174fa126cd5cc9d88eb39d6596af0453a2b77e49 -r12a10b3a9b214f1207131e316912fdc6710d4992 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java (.../LearningDesign.java) (revision 174fa126cd5cc9d88eb39d6596af0453a2b77e49) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java (.../LearningDesign.java) (revision 12a10b3a9b214f1207131e316912fdc6710d4992) @@ -5,9 +5,10 @@ import java.io.Serializable; import java.util.Date; -import java.util.HashSet; import java.util.Iterator; import java.util.Set; +import java.util.TreeSet; + import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; @@ -331,8 +332,8 @@ public int hashCode() { return new HashCodeBuilder().append(getReadOnly()).toHashCode(); } - public HashSet getParentActivities(){ - HashSet parentActivities = new HashSet(); + public TreeSet getParentActivities(){ + TreeSet parentActivities = new TreeSet(new ActivityOrderComparator()); Iterator iterator = this.getActivities().iterator(); while(iterator.hasNext()){ Activity activity = (Activity)iterator.next(); @@ -343,7 +344,7 @@ } public Activity calculateFirstActivity(){ Activity firstActivity = null; - HashSet parentActivities = this.getParentActivities(); + TreeSet parentActivities = this.getParentActivities(); Iterator parentIterator = parentActivities.iterator(); while(parentIterator.hasNext()){ Activity activity = (Activity)parentIterator.next();