Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningLibraryDTO.java =================================================================== diff -u -r668ce921f90746c6dd51a7684c7364ebabf4b989 -r20790f49a06eb6d311bddc9940fe35408a5dd5c4 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningLibraryDTO.java (.../LearningLibraryDTO.java) (revision 668ce921f90746c6dd51a7684c7364ebabf4b989) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningLibraryDTO.java (.../LearningLibraryDTO.java) (revision 20790f49a06eb6d311bddc9940fe35408a5dd5c4) @@ -24,6 +24,7 @@ import java.util.Iterator; import java.util.Vector; +import java.util.List; import org.lamsfoundation.lams.learningdesign.Activity; import org.lamsfoundation.lams.learningdesign.LearningLibrary; @@ -45,6 +46,7 @@ private Boolean validFlag; private Vector templateActivities; + public LearningLibraryDTO(){ } @@ -56,14 +58,27 @@ this.title = title; this.validFlag = validFlag; this.templateActivities = templateActivities; - } + } + + public LearningLibraryDTO(LearningLibrary learningLibrary){ this.learningLibraryID = learningLibrary.getLearningLibraryId(); this.description = learningLibrary.getDescription(); this.title = learningLibrary.getTitle(); this.validFlag = learningLibrary.getValidLibrary(); this.templateActivities = populateActivities(learningLibrary.getActivities().iterator()); - } + } + + public LearningLibraryDTO(LearningLibrary learningLibrary, List templateActivity) + { + this.learningLibraryID = learningLibrary.getLearningLibraryId(); + this.description = learningLibrary.getDescription(); + this.title = learningLibrary.getTitle(); + this.validFlag = learningLibrary.getValidLibrary(); + this.templateActivities = populateActivities(templateActivity.iterator()); + } + + /** * @return Returns the description. */ @@ -94,7 +109,8 @@ */ public Vector getTemplateActivities() { return templateActivities; - } + } + public Vector populateActivities(Iterator iterator){ Vector activities = new Vector(); while(iterator.hasNext()){ @@ -103,4 +119,6 @@ } return activities; } + + }