Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java =================================================================== diff -u -r35d5350252748108494c7cb4bfc2e7d5f2271cba -r30ab6476156472b1a4f65aa75999d78cb2d0b545 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java (.../Activity.java) (revision 35d5350252748108494c7cb4bfc2e7d5f2271cba) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java (.../Activity.java) (revision 30ab6476156472b1a4f65aa75999d78cb2d0b545) @@ -34,8 +34,6 @@ import org.apache.commons.lang.builder.ToStringBuilder; import org.lamsfoundation.lams.learningdesign.dto.MonitoringActivityDTO; import org.lamsfoundation.lams.learningdesign.dto.ProgressActivityDTO; -import org.lamsfoundation.lams.learningdesign.strategy.ComplextActivityStrategy; -import org.lamsfoundation.lams.lesson.LearnerProgress; import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.util.Nullable; /** @@ -630,37 +628,7 @@ public boolean isGroupingActivity(){ return getActivityTypeId().intValue()== GROUPING_ACTIVITY_TYPE; } - - /** - * Delegate to activity strategy to check up the status of all children. - * - * @param learnerProgress the progress data that record what has been - * completed - * @return true if all children are completed. - */ -/** public boolean areChildrenCompleted(LearnerProgress learnerProgress) - { - //return activityStrategy.areChildrenCompleted(this,learnerProgress); - return ((ComplexActivity)this).areChildrenCompleted(learnerProgress); - } - - /** - *

Delegate to activity strategy to calculate what is the next activity - * within the parent activity.

- * - * Note: The logic of what is the next activity here is progress - * enigne specific now. Please see the ActivityStrategy - * for details explaination of what is next. - * - * @param currentChild the current child activity in a complex activity. - * @return the next activity within a parent activity - */ -/** public Activity getNextActivityByParent(Activity currentChild) - { - return ((ComplexActivity)this).getNextActivityByParent(currentChild); - } - */ public Integer getActivityCategoryID() { return activityCategoryID; }