Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java =================================================================== diff -u -r42ddbd4c509c956cc9f5328cea8d45d6e593e796 -recf8899873fe2472fe2aaab77d88110b2b006b22 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java (.../ComplexActivity.java) (revision 42ddbd4c509c956cc9f5328cea8d45d6e593e796) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java (.../ComplexActivity.java) (revision ecf8899873fe2472fe2aaab77d88110b2b006b22) @@ -24,12 +24,14 @@ import java.io.Serializable; import java.util.Date; +import java.util.HashSet; import java.util.Iterator; import java.util.Set; import java.util.SortedSet; import java.util.TreeSet; import org.apache.commons.lang.builder.ToStringBuilder; +import org.lamsfoundation.lams.learningdesign.dto.AuthoringActivityDTO; import org.lamsfoundation.lams.learningdesign.strategy.ComplexActivityStrategy; import org.lamsfoundation.lams.lesson.LearnerProgress; @@ -180,4 +182,18 @@ } } + + public Set getAuthoringActivityDTOSet() + { + HashSet dtoSet = new HashSet(); + dtoSet.add(new AuthoringActivityDTO(this)); //add parent activity + + //add the DTO for all child activities + for(Iterator i = this.getActivities().iterator();i.hasNext();) { + Activity child = (Activity)i.next(); + dtoSet.add(new AuthoringActivityDTO(child)); + } + + return dtoSet; + } } \ No newline at end of file