Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java,v
diff -u -r1.26 -r1.27
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java	13 Apr 2005 07:07:50 -0000	1.26
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java	14 Apr 2005 03:48:10 -0000	1.27
@@ -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<contributionType.length;i++){
+			dtoSet.add(new MonitoringActivityDTO(this,contributionType[i]));
 		}
-		return children;
-	}	
+		return dtoSet;
+	}
 	public AuthoringActivityDTO getAuthoringActivityDTO(){
 		return new AuthoringActivityDTO(this);
 	}
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/MonitoringActivityDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/Attic/MonitoringActivityDTO.java,v
diff -u -r1.2 -r1.3
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/MonitoringActivityDTO.java	13 Apr 2005 01:36:00 -0000	1.2
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/MonitoringActivityDTO.java	14 Apr 2005 03:48:20 -0000	1.3
@@ -7,6 +7,7 @@
 package org.lamsfoundation.lams.learningdesign.dto;
 
 import org.lamsfoundation.lams.learningdesign.Activity;
+import org.lamsfoundation.lams.learningdesign.strategy.SimpleActivityStrategy;
 import org.lamsfoundation.lams.util.wddx.WDDXTAGS;
 
 /**
@@ -25,23 +26,27 @@
 	private Integer contributionType;
 	private Boolean isRequired;
 	
-	
-	public MonitoringActivityDTO(Activity activity){
+	public MonitoringActivityDTO(){
+		
+	}
+	public MonitoringActivityDTO(Activity activity,Integer contributionType){
 		this.title = activity.getTitle();
 		this.description = activity.getDescription();
 		this.activityID = activity.getActivityId();
-		this.activityTypeID = activity.getActivityTypeId();		
-		this.orderID = activity.getOrderId();		
-	}	
-	public MonitoringActivityDTO(Activity activity,Integer contributionType,Boolean required){
-		this.title = activity.getTitle();
-		this.description = activity.getDescription();
-		this.activityID = activity.getActivityId();
 		this.activityTypeID = activity.getActivityTypeId();
 		this.contributionType = contributionType;
 		this.orderID = activity.getOrderId();		
-		this.isRequired = required;
+		this.isRequired = new Boolean(calculateIsRequired(contributionType));
 	}
+	private boolean calculateIsRequired(Integer contributionType){
+		if(contributionType.equals(SimpleActivityStrategy.DEFINE_LATER) ||
+				contributionType.equals(SimpleActivityStrategy.PERMISSION_GATE)||
+				contributionType.equals(SimpleActivityStrategy.CHOSEN_GROUPING))
+			return true;
+		else
+			return false;
+		
+	}
 	/**
 	 * @return Returns the activityID.
 	 */