Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java,v diff -u -r1.92 -r1.93 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java 26 Jul 2006 03:32:27 -0000 1.92 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java 28 Aug 2006 05:55:22 -0000 1.93 @@ -406,38 +406,6 @@ copiedLearningDesign.setTitle(newName); - // 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 = copiedLearningDesign.getActivities().iterator(); i.hasNext();) - { - Activity currentActivity = (Activity) i.next(); - if (currentActivity.isToolActivity()) - { - try { - ToolActivity toolActivity = (ToolActivity) activityDAO.getActivityByActivityId(currentActivity.getActivityId()); - // copy the content, but don't set the define later flags if it is preview - Long newContentId = lamsCoreToolService.notifyToolToCopyContent(toolActivity, copyType != LearningDesign.COPY_TYPE_PREVIEW); - toolActivity.setToolContentId(newContentId); - } catch (DataMissingException e) { - String error = "Unable to initialise the lesson. Data is missing for activity "+currentActivity.getActivityUIID() - +" in learning design "+originalLearningDesign.getLearningDesignId() - +" default content may be missing for the tool. Error was " - +e.getMessage(); - log.error(error,e); - throw new MonitoringServiceException(error,e); - } catch (ToolException e) { - String error = "Unable to initialise the lesson. Tool encountered an error copying the data is missing for activity " - +currentActivity.getActivityUIID() - +" in learning design "+originalLearningDesign.getLearningDesignId() - +" default content may be missing for the tool. Error was " - +e.getMessage(); - log.error(error,e); - throw new MonitoringServiceException(error,e); - } - - } - } authoringService.saveLearningDesign(copiedLearningDesign); return createNewLesson(lessonName,lessonDescription,user,copiedLearningDesign);