Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java =================================================================== diff -u -r91523738e69ab3ad209d6a8dfb25114cdfcfb719 -r90e9d312233aaad8ee84b66f1f669ba242e2b4db --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java (.../GroupingActivity.java) (revision 91523738e69ab3ad209d6a8dfb25114cdfcfb719) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java (.../GroupingActivity.java) (revision 90e9d312233aaad8ee84b66f1f669ba242e2b4db) @@ -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 =================================================================== diff -u -rfee6e64a584e9b1a7df005ba288332c49310fe7c -r90e9d312233aaad8ee84b66f1f669ba242e2b4db --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/OptionsActivity.java (.../OptionsActivity.java) (revision fee6e64a584e9b1a7df005ba288332c49310fe7c) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/OptionsActivity.java (.../OptionsActivity.java) (revision 90e9d312233aaad8ee84b66f1f669ba242e2b4db) @@ -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 =================================================================== diff -u -rfee6e64a584e9b1a7df005ba288332c49310fe7c -r90e9d312233aaad8ee84b66f1f669ba242e2b4db --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ParallelActivity.java (.../ParallelActivity.java) (revision fee6e64a584e9b1a7df005ba288332c49310fe7c) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ParallelActivity.java (.../ParallelActivity.java) (revision 90e9d312233aaad8ee84b66f1f669ba242e2b4db) @@ -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 =================================================================== diff -u -r174fa126cd5cc9d88eb39d6596af0453a2b77e49 -r90e9d312233aaad8ee84b66f1f669ba242e2b4db --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/PermissionGateActivity.java (.../PermissionGateActivity.java) (revision 174fa126cd5cc9d88eb39d6596af0453a2b77e49) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/PermissionGateActivity.java (.../PermissionGateActivity.java) (revision 90e9d312233aaad8ee84b66f1f669ba242e2b4db) @@ -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 =================================================================== diff -u -r91523738e69ab3ad209d6a8dfb25114cdfcfb719 -r90e9d312233aaad8ee84b66f1f669ba242e2b4db --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/RandomGrouping.java (.../RandomGrouping.java) (revision 91523738e69ab3ad209d6a8dfb25114cdfcfb719) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/RandomGrouping.java (.../RandomGrouping.java) (revision 90e9d312233aaad8ee84b66f1f669ba242e2b4db) @@ -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 =================================================================== diff -u -r174fa126cd5cc9d88eb39d6596af0453a2b77e49 -r90e9d312233aaad8ee84b66f1f669ba242e2b4db --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ScheduleGateActivity.java (.../ScheduleGateActivity.java) (revision 174fa126cd5cc9d88eb39d6596af0453a2b77e49) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ScheduleGateActivity.java (.../ScheduleGateActivity.java) (revision 90e9d312233aaad8ee84b66f1f669ba242e2b4db) @@ -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());