Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ParallelActivity.java =================================================================== diff -u -rff33e0186519a13311fda92640e42a1bcbf61b1a -rabb47d2c4be2715536640454a589db41e208fecc --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ParallelActivity.java (.../ParallelActivity.java) (revision ff33e0186519a13311fda92640e42a1bcbf61b1a) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ParallelActivity.java (.../ParallelActivity.java) (revision abb47d2c4be2715536640454a589db41e208fecc) @@ -83,7 +83,7 @@ activities); } /** - * Makes a copy of the ToolActivity for authoring, preview and monitoring enviornment + * Makes a copy of the ParallelActivity for authoring, preview and monitoring enviornment * * @param originalActivity The activity that needs to be deep-copied * @return ParallelActivity Returns a deep-copy of the originalActivity Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/PermissionGateActivity.java =================================================================== diff -u -r7f203b0b0a2e56896f7eee5367b52d1ec4db483e -rabb47d2c4be2715536640454a589db41e208fecc --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/PermissionGateActivity.java (.../PermissionGateActivity.java) (revision 7f203b0b0a2e56896f7eee5367b52d1ec4db483e) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/PermissionGateActivity.java (.../PermissionGateActivity.java) (revision abb47d2c4be2715536640454a589db41e208fecc) @@ -86,26 +86,28 @@ transitionFrom, gateActivityLevelId); } + /** + * Makes a copy of the PermissionGateActivity for authoring, preview and monitoring enviornment + * + * @param originalActivity The activity that needs to be deep-copied + * @return PermissionGateActivity Returns a deep-copy of the originalActivity + */ public static PermissionGateActivity createCopy(PermissionGateActivity originalActivity){ PermissionGateActivity newPermissionGateActivity = new PermissionGateActivity(); newPermissionGateActivity.setActivityUIID(originalActivity.getActivityUIID()); newPermissionGateActivity.setDescription(originalActivity.getDescription()); newPermissionGateActivity.setTitle(originalActivity.getTitle()); + newPermissionGateActivity.setHelpText(originalActivity.getHelpText()); newPermissionGateActivity.setXcoord(originalActivity.getXcoord()); newPermissionGateActivity.setYcoord(originalActivity.getYcoord()); + newPermissionGateActivity.setActivityTypeId(originalActivity.getActivityTypeId()); + newPermissionGateActivity.setLearningLibrary(originalActivity.getLearningLibrary()); newPermissionGateActivity.setDefineLater(originalActivity.getDefineLater()); newPermissionGateActivity.setCreateDateTime(new Date()); newPermissionGateActivity.setOfflineInstructions(originalActivity.getOfflineInstructions()); - newPermissionGateActivity.setLearningLibrary(originalActivity.getLearningLibrary()); - newPermissionGateActivity.setActivityTypeId(originalActivity.getActivityTypeId()); - - /** - * TODO calculate how these two values would be set for COPY - * */ - //newPermissionGateActivity.setTransitionTo(); - //newPermissionGateActivity.setTransitionFrom(); - + newPermissionGateActivity.setLibraryActivity(originalActivity.getLibraryActivity()); + newPermissionGateActivity.setLibraryActivityUiImage(originalActivity.getLibraryActivityUiImage()); return newPermissionGateActivity; } Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java =================================================================== diff -u -rff33e0186519a13311fda92640e42a1bcbf61b1a -rabb47d2c4be2715536640454a589db41e208fecc --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java (.../SequenceActivity.java) (revision ff33e0186519a13311fda92640e42a1bcbf61b1a) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java (.../SequenceActivity.java) (revision abb47d2c4be2715536640454a589db41e208fecc) @@ -86,7 +86,7 @@ } /** - * Makes a copy of the ToolActivity for authoring, preview and monitoring enviornment + * Makes a copy of the SequenceActivity for authoring, preview and monitoring enviornment * * @param originalActivity The activity that needs to be deep-copied * @return SequenceActivity Returns a deep-copy of the originalActivity