Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ParallelActivity.java =================================================================== diff -u -r7f203b0b0a2e56896f7eee5367b52d1ec4db483e -rff33e0186519a13311fda92640e42a1bcbf61b1a --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ParallelActivity.java (.../ParallelActivity.java) (revision 7f203b0b0a2e56896f7eee5367b52d1ec4db483e) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ParallelActivity.java (.../ParallelActivity.java) (revision ff33e0186519a13311fda92640e42a1bcbf61b1a) @@ -82,26 +82,30 @@ transitionFrom, activities); } + /** + * Makes a copy of the ToolActivity 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 + */ public static ParallelActivity createCopy(ParallelActivity originalActivity){ ParallelActivity newParallelActivity = new ParallelActivity(); newParallelActivity.setActivityUIID(originalActivity.getActivityUIID()); newParallelActivity.setDescription(originalActivity.getDescription()); newParallelActivity.setTitle(originalActivity.getTitle()); + newParallelActivity.setHelpText(originalActivity.getHelpText()); newParallelActivity.setXcoord(originalActivity.getXcoord()); newParallelActivity.setYcoord(originalActivity.getYcoord()); + newParallelActivity.setActivityTypeId(originalActivity.getActivityTypeId()); newParallelActivity.setDefineLater(originalActivity.getDefineLater()); + newParallelActivity.setLearningLibrary(originalActivity.getLearningLibrary()); newParallelActivity.setCreateDateTime(new Date()); newParallelActivity.setOfflineInstructions(originalActivity.getOfflineInstructions()); - newParallelActivity.setLearningLibrary(originalActivity.getLearningLibrary()); - newParallelActivity.setActivityTypeId(originalActivity.getActivityTypeId()); - newParallelActivity.setActivities(new HashSet()); - - /** TODO */ - //newParallelActivity.setTransitionTo(); - //newParallelActivity.setTransitionFrom(); - + newParallelActivity.setLibraryActivityUiImage(originalActivity.getLibraryActivityUiImage()); + newParallelActivity.setLibraryActivity(originalActivity.getLibraryActivity()); + newParallelActivity.setActivities(new HashSet()); return newParallelActivity; } Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java =================================================================== diff -u -r7f203b0b0a2e56896f7eee5367b52d1ec4db483e -rff33e0186519a13311fda92640e42a1bcbf61b1a --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java (.../SequenceActivity.java) (revision 7f203b0b0a2e56896f7eee5367b52d1ec4db483e) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java (.../SequenceActivity.java) (revision ff33e0186519a13311fda92640e42a1bcbf61b1a) @@ -84,25 +84,30 @@ transitionFrom, activities); } + + /** + * Makes a copy of the ToolActivity 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 + */ public static SequenceActivity createCopy(SequenceActivity originalActivity){ SequenceActivity newSequenceActivity = new SequenceActivity(); newSequenceActivity.setActivityUIID(originalActivity.getActivityUIID()); newSequenceActivity.setDescription(originalActivity.getDescription()); newSequenceActivity.setTitle(originalActivity.getTitle()); + newSequenceActivity.setHelpText(originalActivity.getHelpText()); newSequenceActivity.setXcoord(originalActivity.getXcoord()); newSequenceActivity.setYcoord(originalActivity.getYcoord()); + newSequenceActivity.setActivityTypeId(originalActivity.getActivityTypeId()); + newSequenceActivity.setLearningLibrary(originalActivity.getLearningLibrary()); newSequenceActivity.setDefineLater(originalActivity.getDefineLater()); newSequenceActivity.setCreateDateTime(new Date()); newSequenceActivity.setOfflineInstructions(originalActivity.getOfflineInstructions()); - newSequenceActivity.setLearningLibrary(originalActivity.getLearningLibrary()); - newSequenceActivity.setActivityTypeId(originalActivity.getActivityTypeId()); + newSequenceActivity.setLibraryActivity(originalActivity.getLibraryActivity()); + newSequenceActivity.setLibraryActivityUiImage(originalActivity.getLibraryActivityUiImage()); newSequenceActivity.setActivities(new HashSet()); - - /** TODO */ - //newSequenceActivity.setTransitionTo(); - //newSequenceActivity.setTransitionFrom(); - return newSequenceActivity; }