Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java =================================================================== diff -u -raaa9a8f28fa1b2a222690dbb3a2d7647efb30cd5 -rfb75427cc2eefc24f942e89b3c938bed84a0ff7f --- lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java (.../AuthoringService.java) (revision aaa9a8f28fa1b2a222690dbb3a2d7647efb30cd5) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java (.../AuthoringService.java) (revision fb75427cc2eefc24f942e89b3c938bed84a0ff7f) @@ -1426,15 +1426,14 @@ * but will be put straight into run sequences folder of the organisation. */ @Override - @SuppressWarnings("unchecked") public Long insertSingleActivityLearningDesign(String learningDesignTitle, Long toolID, Long toolContentID, Long learningLibraryID, String contentFolderID, Integer organisationID) { Integer userID = AuthoringService.getUserId(); User user = (User) baseDAO.find(User.class, userID); LearningDesign learningDesign = new LearningDesign(null, null, null, learningDesignTitle, null, null, 1, false, false, null, null, null, new Date(), Configuration.get(ConfigurationKeys.SERVER_VERSION_NUMBER), user, - user, null, null, null, null, null, null, null, null, contentFolderID, false, null, 1, null); + user, null, null, null, null, null, null, null, contentFolderID, false, null, 1, null); WorkspaceFolder folder = null; Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java =================================================================== diff -u -r9e1d6b2a7e9dd1e5f3e43d10c6c2b87365692f4a -rfb75427cc2eefc24f942e89b3c938bed84a0ff7f --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java (.../LearningDesign.java) (revision 9e1d6b2a7e9dd1e5f3e43d10c6c2b87365692f4a) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java (.../LearningDesign.java) (revision fb75427cc2eefc24f942e89b3c938bed84a0ff7f) @@ -142,10 +142,6 @@ @JoinColumn(name = "original_learning_design_id") private LearningDesign originalLearningDesign; - @OneToMany - @JoinColumn(name = "parent_learning_design_id") - private Set childLearningDesigns = new HashSet(); - @OneToMany(mappedBy = "learningDesign") private Set lessons = new HashSet(); @@ -193,16 +189,18 @@ * are null, then it will default to the current datetime. */ - /** Full constructor. This is called by AuthoringService.insertSingleActivityLearningDesign with nulls for the - * sets, so if they are null let the default initialisation (above) stand - don't overwrite the empty sets with nulls. + /** + * Full constructor. This is called by AuthoringService.insertSingleActivityLearningDesign with nulls for the + * sets, so if they are null let the default initialisation (above) stand - don't overwrite the empty sets with + * nulls. */ public LearningDesign(Long learningDesignId, Integer ui_id, String description, String title, Activity firstActivity, FloatingActivity floatingActivity, Integer maxID, Boolean validDesign, Boolean readOnly, Date dateReadOnly, String helpText, Integer copyTypeID, Date createDateTime, - String version, User user, User originalUser, LearningDesign originalLearningDesign, - Set childLearningDesigns, Set lessons, Set transitions, - SortedSet activities, Long duration, String licenseText, License license, String contentFolderID, - Boolean editOverrideLock, User editOverrideUser, Integer designVersion, String designType) { + String version, User user, User originalUser, LearningDesign originalLearningDesign, Set lessons, + Set transitions, SortedSet activities, Long duration, String licenseText, + License license, String contentFolderID, Boolean editOverrideLock, User editOverrideUser, + Integer designVersion, String designType) { this.learningDesignId = learningDesignId; this.learningDesignUIID = ui_id; this.description = description; @@ -220,13 +218,15 @@ this.user = user; this.originalUser = originalUser; this.originalLearningDesign = originalLearningDesign; - this.childLearningDesigns = childLearningDesigns; - if ( lessons != null ) + if (lessons != null) { this.lessons = lessons; - if ( transitions != null ) + } + if (transitions != null) { this.transitions = transitions; - if ( activities != null ) + } + if (activities != null) { this.activities = activities; + } this.duration = duration; this.licenseText = licenseText; this.license = license; @@ -448,14 +448,6 @@ this.originalLearningDesign = originalLearningDesign; } - public Set getChildLearningDesigns() { - return this.childLearningDesigns; - } - - public void setChildLearningDesigns(Set childLearningDesigns) { - this.childLearningDesigns = childLearningDesigns; - } - public Set getLessons() { return this.lessons; }