Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java =================================================================== diff -u -r18a6557581248f0473b47ebf2a6ee2d3f45350eb -rcd32e8611c801a0169b9a2296cacdd33da4567d7 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java (.../Activity.java) (revision 18a6557581248f0473b47ebf2a6ee2d3f45350eb) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java (.../Activity.java) (revision cd32e8611c801a0169b9a2296cacdd33da4567d7) @@ -24,10 +24,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 java.util.Vector; import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; @@ -647,22 +647,13 @@ public void setActivityCategoryID(Integer activityCategoryID) { this.activityCategoryID = activityCategoryID; } - - public MonitoringActivityDTO getMonitoringActivityDTO(){ - return new MonitoringActivityDTO(this); - } - public MonitoringActivityDTO getMonitoringActivityDTO(Integer contributionType,Boolean required){ - return new MonitoringActivityDTO(this,contributionType,required); - } - public Vector getMonitoringActivityDTOSet(Set activities){ - Vector children = new Vector(); - Iterator iterator = activities.iterator(); - while(iterator.hasNext()){ - Activity activity = (Activity)iterator.next(); - children.add(new MonitoringActivityDTO(activity)); + public Set getMonitoringActivityDTO(Integer[] contributionType){ + HashSet dtoSet = new HashSet(); + for(int i=0;i