Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java,v diff -u -r1.6 -r1.7 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java 24 Feb 2005 05:46:03 -0000 1.6 +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java 28 Feb 2005 22:53:52 -0000 1.7 @@ -113,19 +113,14 @@ groupingActivity.setTitle(originalActivity.getTitle()); groupingActivity.setHelpText(originalActivity.getHelpText()); groupingActivity.setXcoord(originalActivity.getXcoord()); - groupingActivity.setYcoord(originalActivity.getYcoord()); + groupingActivity.setYcoord(originalActivity.getYcoord()); + groupingActivity.setActivityTypeId(originalActivity.getActivityTypeId()); groupingActivity.setDefineLater(originalActivity.getDefineLater()); - groupingActivity.setCreateDateTime(new Date()); - groupingActivity.setLibraryActivityUiImage(originalActivity.getLibraryActivityUiImage()); - Grouping oldGrouping = originalActivity.getGrouping(); - - if(oldGrouping.getGroupingTypeId()==Grouping.CHOSEN_GROUPING_TYPE) - groupingActivity.setGrouping(ChosenGrouping.createCopy((ChosenGrouping)oldGrouping)); - else - groupingActivity.setGrouping(RandomGrouping.createCopy((RandomGrouping)oldGrouping)); - + groupingActivity.setCreateDateTime(new Date()); + groupingActivity.setRunOffline(originalActivity.getRunOffline()); + groupingActivity.setLibraryActivityUiImage(originalActivity.getLibraryActivityUiImage()); return groupingActivity; - } + } public String toString() { return new ToStringBuilder(this) Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/OptionsActivity.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/OptionsActivity.java,v diff -u -r1.8 -r1.9 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/OptionsActivity.java 24 Feb 2005 01:29:09 -0000 1.8 +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/OptionsActivity.java 28 Feb 2005 22:54:30 -0000 1.9 @@ -2,8 +2,6 @@ import java.io.Serializable; import java.util.Date; -import java.util.HashSet; - import org.apache.commons.lang.builder.ToStringBuilder; import org.lamsfoundation.lams.lesson.OptionsActivityStrategy; @@ -123,10 +121,10 @@ newOptionsActivity.setDefineLater(originalActivity.getDefineLater()); newOptionsActivity.setLearningLibrary(originalActivity.getLearningLibrary()); newOptionsActivity.setCreateDateTime(new Date()); + newOptionsActivity.setRunOffline(originalActivity.getRunOffline()); newOptionsActivity.setOfflineInstructions(originalActivity.getOfflineInstructions()); newOptionsActivity.setLibraryActivityUiImage(originalActivity.getLibraryActivityUiImage()); newOptionsActivity.setLibraryActivity(originalActivity.getLibraryActivity()); - newOptionsActivity.setActivities(new HashSet()); return newOptionsActivity; } Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ParallelActivity.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/ParallelActivity.java,v diff -u -r1.9 -r1.10 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ParallelActivity.java 24 Feb 2005 01:29:09 -0000 1.9 +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ParallelActivity.java 28 Feb 2005 22:54:52 -0000 1.10 @@ -2,7 +2,6 @@ import java.io.Serializable; import java.util.Date; -import java.util.HashSet; import org.apache.commons.lang.builder.ToStringBuilder; import org.lamsfoundation.lams.lesson.ParallelActivityStrategy; @@ -103,15 +102,19 @@ newParallelActivity.setXcoord(originalActivity.getXcoord()); newParallelActivity.setYcoord(originalActivity.getYcoord()); newParallelActivity.setActivityTypeId(originalActivity.getActivityTypeId()); + newParallelActivity.setGrouping(originalActivity.getGrouping()); + newParallelActivity.setLearningLibrary(originalActivity.getLearningLibrary()); newParallelActivity.setGroupingUIID(originalActivity.getGroupingUIID()); + newParallelActivity.setDefineLater(originalActivity.getDefineLater()); - newParallelActivity.setLearningLibrary(originalActivity.getLearningLibrary()); newParallelActivity.setCreateDateTime(new Date()); + newParallelActivity.setRunOffline(originalActivity.getRunOffline()); + newParallelActivity.setOfflineInstructions(originalActivity.getOfflineInstructions()); newParallelActivity.setLibraryActivityUiImage(originalActivity.getLibraryActivityUiImage()); newParallelActivity.setLibraryActivity(originalActivity.getLibraryActivity()); - newParallelActivity.setActivities(new HashSet()); + return newParallelActivity; } Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/PermissionGateActivity.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/PermissionGateActivity.java,v diff -u -r1.7 -r1.8 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/PermissionGateActivity.java 23 Feb 2005 05:17:34 -0000 1.7 +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/PermissionGateActivity.java 28 Feb 2005 22:55:27 -0000 1.8 @@ -110,6 +110,7 @@ newPermissionGateActivity.setLearningLibrary(originalActivity.getLearningLibrary()); newPermissionGateActivity.setDefineLater(originalActivity.getDefineLater()); newPermissionGateActivity.setCreateDateTime(new Date()); + newPermissionGateActivity.setRunOffline(originalActivity.getRunOffline()); newPermissionGateActivity.setOfflineInstructions(originalActivity.getOfflineInstructions()); newPermissionGateActivity.setLibraryActivity(originalActivity.getLibraryActivity()); newPermissionGateActivity.setLibraryActivityUiImage(originalActivity.getLibraryActivityUiImage()); Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/RandomGrouping.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/RandomGrouping.java,v diff -u -r1.5 -r1.6 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/RandomGrouping.java 24 Feb 2005 05:46:03 -0000 1.5 +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/RandomGrouping.java 28 Feb 2005 22:56:14 -0000 1.6 @@ -84,8 +84,7 @@ randomGrouping.setGroupingUIID(originalGrouping.getGroupingUIID()); randomGrouping.setNumberOfGroups(originalGrouping.getNumberOfGroups()); - randomGrouping.setLearnersPerGroup(originalGrouping.getLearnersPerGroup()); - + randomGrouping.setLearnersPerGroup(originalGrouping.getLearnersPerGroup()); return randomGrouping; } Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ScheduleGateActivity.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/ScheduleGateActivity.java,v diff -u -r1.6 -r1.7 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ScheduleGateActivity.java 23 Feb 2005 05:17:34 -0000 1.6 +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ScheduleGateActivity.java 28 Feb 2005 22:56:30 -0000 1.7 @@ -143,6 +143,7 @@ newScheduleGateActivity.setLearningLibrary(originalActivity.getLearningLibrary()); newScheduleGateActivity.setDefineLater(originalActivity.getDefineLater()); newScheduleGateActivity.setCreateDateTime(new Date()); + newScheduleGateActivity.setRunOffline(originalActivity.getRunOffline()); newScheduleGateActivity.setOfflineInstructions(originalActivity.getOfflineInstructions()); newScheduleGateActivity.setLibraryActivity(originalActivity.getLibraryActivity()); newScheduleGateActivity.setLibraryActivityUiImage(originalActivity.getLibraryActivityUiImage()); Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java,v diff -u -r1.9 -r1.10 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java 27 Feb 2005 22:23:15 -0000 1.9 +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java 28 Feb 2005 23:02:32 -0000 1.10 @@ -2,7 +2,6 @@ import java.io.Serializable; import java.util.Date; -import java.util.HashSet; import org.apache.commons.lang.builder.ToStringBuilder; import org.lamsfoundation.lams.lesson.SequenceActivityStrategy; @@ -110,11 +109,13 @@ newSequenceActivity.setLearningLibrary(originalActivity.getLearningLibrary()); newSequenceActivity.setDefineLater(originalActivity.getDefineLater()); newSequenceActivity.setCreateDateTime(new Date()); + newSequenceActivity.setRunOffline(originalActivity.getRunOffline()); + newSequenceActivity.setOfflineInstructions(originalActivity.getOfflineInstructions()); newSequenceActivity.setLibraryActivity(originalActivity.getLibraryActivity()); newSequenceActivity.setLibraryActivityUiImage(originalActivity.getLibraryActivityUiImage()); - newSequenceActivity.setActivities(new HashSet()); - return newSequenceActivity; + + return newSequenceActivity; } /** Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/SynchGateActivity.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/SynchGateActivity.java,v diff -u -r1.6 -r1.7 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/SynchGateActivity.java 23 Feb 2005 05:17:34 -0000 1.6 +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/SynchGateActivity.java 28 Feb 2005 23:03:41 -0000 1.7 @@ -107,6 +107,7 @@ newSynchGateActivity.setLearningLibrary(originalActivity.getLearningLibrary()); newSynchGateActivity.setDefineLater(originalActivity.getDefineLater()); newSynchGateActivity.setCreateDateTime(new Date()); + newSynchGateActivity.setRunOffline(originalActivity.getRunOffline()); newSynchGateActivity.setOfflineInstructions(originalActivity.getOfflineInstructions()); newSynchGateActivity.setLibraryActivity(originalActivity.getLibraryActivity()); newSynchGateActivity.setLibraryActivityUiImage(originalActivity.getLibraryActivityUiImage()); Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java,v diff -u -r1.10 -r1.11 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java 23 Feb 2005 22:57:54 -0000 1.10 +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java 28 Feb 2005 23:03:51 -0000 1.11 @@ -135,6 +135,7 @@ newToolActivity.setDefineLater(originalActivity.getDefineLater()); newToolActivity.setLearningLibrary(originalActivity.getLearningLibrary()); newToolActivity.setCreateDateTime(new Date()); + newToolActivity.setRunOffline(originalActivity.getRunOffline()); newToolActivity.setOfflineInstructions(originalActivity.getOfflineInstructions()); newToolActivity.setLibraryActivityUiImage(originalActivity.getLibraryActivityUiImage()); newToolActivity.setLibraryActivity(originalActivity.getLibraryActivity());