Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java =================================================================== diff -u -r75c2d483b799dcf9614657788178b410e55c4235 -r9214a5d232a6d9d60d5a482517b168724ce40f50 --- lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java (.../AuthoringService.java) (revision 75c2d483b799dcf9614657788178b410e55c4235) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java (.../AuthoringService.java) (revision 9214a5d232a6d9d60d5a482517b168724ce40f50) @@ -731,18 +731,15 @@ /** * @see org.lamsfoundation.lams.authoring.service.IAuthoringService#copyLearningDesignToolContent(org.lamsfoundation.lams.learningdesign.LearningDesign, org.lamsfoundation.lams.learningdesign.LearningDesign, java.lang.Integer) */ - public LearningDesign copyLearningDesignToolContent(LearningDesign design, LearningDesign originalLearningDesign, Integer copyType ) throws LearningDesignException { + private LearningDesign copyLearningDesignToolContent(LearningDesign design, LearningDesign originalLearningDesign, Integer copyType ) throws LearningDesignException { - // copy the tool content - // unfortuanately, we have to reaccess the activities to make sure we get the - // subclass, not a hibernate proxy. for (Iterator i = design.getActivities().iterator(); i.hasNext();) { Activity currentActivity = (Activity) i.next(); if (currentActivity.isToolActivity()) { try { - ToolActivity toolActivity = (ToolActivity) activityDAO.getActivityByActivityId(currentActivity.getActivityId()); + ToolActivity toolActivity = (ToolActivity) currentActivity; // copy the content, but don't set the define later flags if it is preview Long newContentId = lamsCoreToolService.notifyToolToCopyContent(toolActivity, copyType.intValue() != LearningDesign.COPY_TYPE_PREVIEW); toolActivity.setToolContentId(newContentId); @@ -848,6 +845,7 @@ // newLearningDesign.getActivities() will create a new TreeSet(new ActivityOrderComparator()) if there isn't an existing set newLearningDesign.getActivities().clear(); newLearningDesign.getActivities().addAll(activities); + } /** As part of updateDesignActivities(), process an activity and, via recursive calls, the activity's child activities. Need to keep track @@ -866,7 +864,6 @@ newActivity.setParentActivity(parentActivity); newActivity.setParentUIID(parentActivity.getActivityUIID()); } -// activityDAO.insert(newActivity); newActivities.put(newActivity.getActivityUIID(),newActivity); Set oldChildActivities = getChildActivities((Activity)activity); Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java =================================================================== diff -u -rfb25ea600503d3eea142b305696081f882d6552a -r9214a5d232a6d9d60d5a482517b168724ce40f50 --- lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java (.../IAuthoringService.java) (revision fb25ea600503d3eea142b305696081f882d6552a) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java (.../IAuthoringService.java) (revision 9214a5d232a6d9d60d5a482517b168724ce40f50) @@ -98,17 +98,6 @@ WorkspaceFolderException, IOException; /** - * - * @param design - * @param originalLearningDesign - * @param copyType - * @return - * @throws LearningDesignException - */ - public LearningDesign copyLearningDesignToolContent(LearningDesign design, LearningDesign originalLearningDesign, Integer copyType ) throws LearningDesignException; - - - /** * @return List Returns the list of all the available LearningDesign's * */ public List getAllLearningDesigns();