Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml,v diff -u -r1.5 -r1.6 --- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml 8 Feb 2005 05:57:21 -0000 1.5 +++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml 16 Feb 2005 22:00:30 -0000 1.6 @@ -23,8 +23,8 @@ - - @hibernate.property column="id" length="11" + + @hibernate.property column="activity_ui_id" length="11" @@ -34,6 +34,10 @@ @hibernate.property column="title" length="255" + + + @hibernate.property column="help_text" length="65535" + @hibernate.property column="xcoord" length="11" @@ -59,6 +63,12 @@ @hibernate.property column="offline_instructions" length="65535" + + @hibernate.property column="parent_ui_id" length="11" + + + + @hibernate.property column="learning_activity_type_id" length="11" @@ -84,6 +94,13 @@ + + + + @hibernate.column name="libraryActivity" + + + @@ -124,8 +141,14 @@ - @hibernate.class - + @hibernate.class + + @hibernate.property column="grouping_ui_id" length="11" + + + @hibernate.property column="create_grouping_ui_id" length="11" + + @@ -135,17 +158,31 @@ @hibernate.class + @hibernate.class - + + + @hibernate.property column="gate_start_time_offset" length="19" + true + + + + @hibernate.property column="gate_end_time_offset" length="19" + true + + + @hibernate.property column="gate_start_date_time" length="19" true + @hibernate.property column="gate_end_date_time" length="19" true + @hibernate.class @@ -182,6 +219,11 @@ @hibernate.property column="min_number_of_options" length="5" true + + + @hibernate.property column="options_instructions" length="65535" + + @hibernate.class Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml,v diff -u -r1.4 -r1.5 --- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml 11 Feb 2005 01:24:23 -0000 1.4 +++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml 16 Feb 2005 22:00:30 -0000 1.5 @@ -28,9 +28,9 @@ @@ -98,11 +98,11 @@ @@ -118,52 +118,43 @@ @hibernate.property column="version" - length="56" - not-null="true" + length="56" - - + + + @hibernate.property column ="duration" - - + + @hibernate.property column ="license_text" - - + + + @hibernate.column name="license_id" + + + - - @hibernate.many-to-one not-null="true" - @hibernate.column name="first_activity_id" + + @hibernate.column name="first_activity_id" - - @hibernate.many-to-one not-null="true" - @hibernate.column name="parent_learning_design_id" + + @hibernate.column name="parent_learning_design_id" @@ -174,7 +165,7 @@ - + Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Transition.hbm.xml =================================================================== RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Transition.hbm.xml,v diff -u -r1.2 -r1.3 --- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Transition.hbm.xml 8 Feb 2005 05:57:42 -0000 1.2 +++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Transition.hbm.xml 16 Feb 2005 22:00:30 -0000 1.3 @@ -37,18 +37,16 @@ - - - @hibernate.property - column="id" - length="11" - + + @hibernate.property column="transition_ui_id" length="11" + + @hibernate.property column="to_ui_id" length="11" + + + @hibernate.property column="from_ui_id" length="11" + + Note : Returns the activity_id and not the id

* - * @return Returns the firstActivityId in the design + * */ - public Long calculateFirstActivityID(){ - Long firstID = null; - HashSet allActivities = new HashSet(); - - if(this.getActivities()!=null) - allActivities.addAll(this.getActivities()); - if(this.getOptionalActivities()!=null) - allActivities.addAll(this.getOptionalActivities()); - - Set nonFirstActivities = getAllSubsequentActivityIds(); - Set activitiesFromOptionalActivities = getAllActivityIdsFromOptionalActivities(); - if(activitiesFromOptionalActivities!=null) - nonFirstActivities.addAll(activitiesFromOptionalActivities); - - Iterator iter = allActivities.iterator(); - while(iter.hasNext()&& firstID==null){ - Activity activity = (Activity)iter.next(); - Long activityID = activity.getActivityId(); - if(!nonFirstActivities.contains(activityID)) - firstID = activityID; - - } - return firstID; + public Set getTransitions() { + return this.transitions; } - + + public void setTransitions(Set transitions) { + this.transitions = transitions; + } + /** - * @return Returns a list of all the activity_id 's following another - * activity, within this learning design. - */ - private Set getAllSubsequentActivityIds(){ - Set transitions = this.getTransitions(); - Iterator iter = transitions.iterator(); - HashSet set = new HashSet(); - while(iter.hasNext()){ - Transition trans = (Transition)iter.next(); - Activity toActivity = trans.getActivityByToActivityId(); - if(toActivity!=null) - set.add(toActivity.getActivityId()); - } - return set; - } - - /** - * @return Returns a list of all activity_id 's of the activities - * which are in the Optional Activities set in the Learning Design * + * */ - private Set getAllActivityIdsFromOptionalActivities(){ - Set optionalActivities = this.getOptionalActivities(); - HashSet activityIds =null; - if(optionalActivities!=null){ - activityIds = new HashSet(); - Iterator iter = optionalActivities.iterator(); - while(iter.hasNext()){ - OptionsActivity optActivity =(OptionsActivity)iter.next(); - Set activities = optActivity.getActivities(); - if(activities!=null){ - Iterator optIterator = activities.iterator(); - while(optIterator.hasNext()){ - Activity act = (Activity)optIterator.next(); - activityIds.add(act.getActivityId()); - } - } - } - - } - return activityIds; + public Set getActivities() { + return this.activities; } - private void populateDesignActivitySets(Activity activity, Integer activityTypeID){ - int typeID = activityTypeID.intValue(); - if(typeID==7){ - if(paralleActivities==null) - paralleActivities = new HashSet(); - paralleActivities.add(activity); - }else if(typeID==8){ - if(optionalActivities==null) - optionalActivities = new HashSet(); - optionalActivities.add(activity); - }else if(typeID==9){ - if(sequenceActivities==null) - sequenceActivities = new HashSet(); - sequenceActivities.add(activity); - } - + + public void setActivities(Set activities) { + this.activities = activities; } + public String toString() { + return new ToStringBuilder(this).append("learningDesignId", + getLearningDesignId()).toString(); + } + + public boolean equals(Object other) { + if ((this == other)) + return true; + if (!(other instanceof LearningDesign)) + return false; + LearningDesign castOther = (LearningDesign) other; + return new EqualsBuilder().append(this.getReadOnly(), + castOther.getReadOnly()).isEquals(); + } + + public int hashCode() { + return new HashCodeBuilder().append(getReadOnly()).toHashCode(); + } + public HashSet getParentActivities(){ + HashSet parentActivities = new HashSet(); + Iterator iterator = this.getActivities().iterator(); + while(iterator.hasNext()){ + Activity activity = (Activity)iterator.next(); + if(activity.getParentActivity()==null) + parentActivities.add(activity); + } + return parentActivities; + } /** * @return Returns the workspaceFolder. */ public WorkspaceFolder getWorkspaceFolder() { return workspaceFolder; } + /** - * @param workspaceFolder The workspaceFolder to set. + * @param workspaceFolder + * The workspaceFolder to set. */ public void setWorkspaceFolder(WorkspaceFolder workspaceFolder) { this.workspaceFolder = workspaceFolder; } -} + public Long getDuration() { + return duration; + } + public void setDuration(Long duration) { + this.duration = duration; + } + public String getLicenseText() { + return licenseText; + } + public void setLicenseText(String licenseText) { + this.licenseText = licenseText; + } + public Integer getCopyTypeID() { + return copyTypeID; + } + public void setCopyTypeID(Integer copyTypeID) { + this.copyTypeID = copyTypeID; + } +} \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/License.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/License.java,v diff -u --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/License.java 16 Feb 2005 22:03:26 -0000 1.1 @@ -0,0 +1,88 @@ +/* + * Created on Feb 15, 2005 + * + * TODO To change the template for this generated file go to + * Window - Preferences - Java - Code Style - Code Templates + */ +package org.lamsfoundation.lams.learningdesign; + +import java.io.Serializable; + +/** + * @author Minhas + * + * TODO To change the template for this generated type comment go to + * Window - Preferences - Java - Code Style - Code Templates + */ +public class License implements Serializable{ + + /** persistent field */ + private Long licenseID; + /** persistent field */ + private String name; + /** persistent field */ + private String code; + /** persistent field */ + private String url; + /** persistent field */ + private Boolean defaultLicense; + /** persistent field */ + private String pictureURL; + + /** default constructor*/ + public License(){ + + } + /** full constructor*/ + public License(Long licenseID, + String name, + String code, + String url, + Boolean defaultLicense, + String pictureURL){ + this.licenseID = licenseID; + this.name = name; + this.code = code; + this.url = url; + this.defaultLicense = defaultLicense; + this.pictureURL = pictureURL; + } + + + public Boolean getDefaultLicense() { + return defaultLicense; + } + public void setDefaultLicense(Boolean defaultLicense) { + this.defaultLicense = defaultLicense; + } + public Long getLicenseID() { + return licenseID; + } + public void setLicenseID(Long licenseID) { + this.licenseID = licenseID; + } + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + public String getPictureURL() { + return pictureURL; + } + public void setPictureURL(String pictureURL) { + this.pictureURL = pictureURL; + } + public String getUrl() { + return url; + } + public void setUrl(String url) { + this.url = url; + } + public String getCode() { + return code; + } + public void setCode(String code) { + this.code = code; + } +} Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/OptionsActivity.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/OptionsActivity.java,v diff -u -r1.3 -r1.4 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/OptionsActivity.java 8 Feb 2005 06:02:23 -0000 1.3 +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/OptionsActivity.java 16 Feb 2005 22:03:26 -0000 1.4 @@ -1,6 +1,9 @@ package org.lamsfoundation.lams.learningdesign; import java.io.Serializable; +import java.util.Date; +import java.util.HashSet; + import org.apache.commons.lang.builder.ToStringBuilder; @@ -14,6 +17,9 @@ /** nullable persistent field */ private Integer minNumberOfOptions; + + /** nullable persistent field */ + private String optionsInstructions; /** full constructor */ public OptionsActivity(Long activityId, @@ -28,14 +34,17 @@ String offlineInstructions, LearningLibrary learningLibrary, Activity parentActivity, + Activity libraryActivity, + Integer parentUIID, LearningDesign learningDesign, Grouping grouping, Integer activityTypeId, Transition transitionTo, Transition transitionFrom, java.util.Set activities, Integer maxNumberOfOptions, - Integer minNumberOfOptions) { + Integer minNumberOfOptions, + String options_instructions) { super(activityId, id, description, @@ -48,6 +57,8 @@ offlineInstructions, learningLibrary, parentActivity, + libraryActivity, + parentUIID, learningDesign, grouping, activityTypeId, @@ -56,6 +67,7 @@ activities); this.maxNumberOfOptions = maxNumberOfOptions; this.minNumberOfOptions = minNumberOfOptions; + this.optionsInstructions = options_instructions; } /** default constructor */ @@ -87,6 +99,31 @@ transitionFrom, activities); } + public static OptionsActivity createCopy(OptionsActivity originalActivity){ + OptionsActivity newOptionsActivity = new OptionsActivity(); + + newOptionsActivity.setMaxNumberOfOptions(originalActivity.getMaxNumberOfOptions()); + newOptionsActivity.setMinNumberOfOptions(originalActivity.getMinNumberOfOptions()); + newOptionsActivity.setOptionsInstructions(originalActivity.getOptionsInstructions()); + + newOptionsActivity.setActivityUIID(originalActivity.getActivityUIID()); + newOptionsActivity.setDescription(originalActivity.getDescription()); + newOptionsActivity.setTitle(originalActivity.getTitle()); + newOptionsActivity.setXcoord(originalActivity.getXcoord()); + newOptionsActivity.setYcoord(originalActivity.getYcoord()); + newOptionsActivity.setDefineLater(originalActivity.getDefineLater()); + newOptionsActivity.setCreateDateTime(new Date()); + newOptionsActivity.setOfflineInstructions(originalActivity.getOfflineInstructions()); + newOptionsActivity.setLearningLibrary(originalActivity.getLearningLibrary()); + newOptionsActivity.setActivityTypeId(originalActivity.getActivityTypeId()); + newOptionsActivity.setActivities(new HashSet()); + + /** TODO */ + //newOptionsActivity.setTransitionTo(); + //newOptionsActivity.setTransitionFrom(); + + return newOptionsActivity; + } /** * @hibernate.property column="max_number_of_options" length="5" @@ -116,4 +153,10 @@ .toString(); } + public String getOptionsInstructions() { + return optionsInstructions; + } + public void setOptionsInstructions(String options_instructions) { + this.optionsInstructions = options_instructions; + } } Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ParallelActivity.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/ParallelActivity.java,v diff -u -r1.3 -r1.4 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ParallelActivity.java 8 Feb 2005 06:02:23 -0000 1.3 +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ParallelActivity.java 16 Feb 2005 22:03:26 -0000 1.4 @@ -1,6 +1,8 @@ package org.lamsfoundation.lams.learningdesign; import java.io.Serializable; +import java.util.Date; +import java.util.HashSet; import org.apache.commons.lang.builder.ToStringBuilder; @@ -20,10 +22,12 @@ Boolean defineLater, java.util.Date createDateTime, String offlineInstructions, - org.lamsfoundation.lams.learningdesign.LearningLibrary learningLibrary, - org.lamsfoundation.lams.learningdesign.Activity parentActivity, - org.lamsfoundation.lams.learningdesign.LearningDesign learningDesign, - org.lamsfoundation.lams.learningdesign.Grouping grouping, + LearningLibrary learningLibrary, + Activity parentActivity, + Activity libraryActivity, + Integer parentUIID, + LearningDesign learningDesign, + Grouping grouping, Integer activityTypeId, Transition transitionTo, Transition transitionFrom, @@ -40,6 +44,8 @@ offlineInstructions, learningLibrary, parentActivity, + libraryActivity, + parentUIID, learningDesign, grouping, activityTypeId, @@ -76,6 +82,28 @@ transitionFrom, activities); } + public static ParallelActivity createCopy(ParallelActivity originalActivity){ + + ParallelActivity newParallelActivity = new ParallelActivity(); + + newParallelActivity.setActivityUIID(originalActivity.getActivityUIID()); + newParallelActivity.setDescription(originalActivity.getDescription()); + newParallelActivity.setTitle(originalActivity.getTitle()); + newParallelActivity.setXcoord(originalActivity.getXcoord()); + newParallelActivity.setYcoord(originalActivity.getYcoord()); + newParallelActivity.setDefineLater(originalActivity.getDefineLater()); + 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(); + + return newParallelActivity; + } public String toString() { return new ToStringBuilder(this) Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/PermissionGateActivity.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/PermissionGateActivity.java,v diff -u -r1.2 -r1.3 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/PermissionGateActivity.java 8 Feb 2005 06:02:23 -0000 1.2 +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/PermissionGateActivity.java 16 Feb 2005 22:03:26 -0000 1.3 @@ -1,6 +1,8 @@ package org.lamsfoundation.lams.learningdesign; import java.io.Serializable; +import java.util.Date; + import org.apache.commons.lang.builder.ToStringBuilder; @@ -21,10 +23,12 @@ Boolean defineLater, java.util.Date createDateTime, String offlineInstructions, - org.lamsfoundation.lams.learningdesign.LearningLibrary learningLibrary, - org.lamsfoundation.lams.learningdesign.Activity parentActivity, - org.lamsfoundation.lams.learningdesign.LearningDesign learningDesign, - org.lamsfoundation.lams.learningdesign.Grouping grouping, + LearningLibrary learningLibrary, + Activity parentActivity, + Activity libraryActivity, + Integer parentUIID, + LearningDesign learningDesign, + Grouping grouping, Integer activityTypeId, Transition transitionTo, Transition transitionFrom, @@ -42,6 +46,8 @@ offlineInstructions, learningLibrary, parentActivity, + libraryActivity, + parentUIID, learningDesign, grouping, activityTypeId, @@ -80,6 +86,29 @@ transitionFrom, gateActivityLevelId); } + public static PermissionGateActivity createCopy(PermissionGateActivity originalActivity){ + PermissionGateActivity newPermissionGateActivity = new PermissionGateActivity(); + + newPermissionGateActivity.setActivityUIID(originalActivity.getActivityUIID()); + newPermissionGateActivity.setDescription(originalActivity.getDescription()); + newPermissionGateActivity.setTitle(originalActivity.getTitle()); + newPermissionGateActivity.setXcoord(originalActivity.getXcoord()); + newPermissionGateActivity.setYcoord(originalActivity.getYcoord()); + newPermissionGateActivity.setDefineLater(originalActivity.getDefineLater()); + newPermissionGateActivity.setCreateDateTime(new Date()); + newPermissionGateActivity.setOfflineInstructions(originalActivity.getOfflineInstructions()); + newPermissionGateActivity.setLearningLibrary(originalActivity.getLearningLibrary()); + newPermissionGateActivity.setActivityTypeId(originalActivity.getActivityTypeId()); + + /** + * TODO calculate how these two values would be set for COPY + * */ + //newPermissionGateActivity.setTransitionTo(); + //newPermissionGateActivity.setTransitionFrom(); + + return newPermissionGateActivity; + + } public String toString() { Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ScheduleGateActivity.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/ScheduleGateActivity.java,v diff -u -r1.2 -r1.3 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ScheduleGateActivity.java 8 Feb 2005 06:02:23 -0000 1.2 +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ScheduleGateActivity.java 16 Feb 2005 22:03:26 -0000 1.3 @@ -11,11 +11,29 @@ public class ScheduleGateActivity extends GateActivity implements Serializable { /** nullable persistent field */ + private Date gateStartTimeOffset; + + /** nullable persistent field */ + private Date gateEndTimeOffset; + + /** nullable persistent field */ private Date gateStartDateTime; /** nullable persistent field */ private Date gateEndDateTime; + public Date getGateEndDateTime() { + return gateEndDateTime; + } + public void setGateEndDateTime(Date gateEndDateTime) { + this.gateEndDateTime = gateEndDateTime; + } + public Date getGateStartDateTime() { + return gateStartDateTime; + } + public void setGateStartDateTime(Date gateStartDateTime) { + this.gateStartDateTime = gateStartDateTime; + } /** full constructor */ public ScheduleGateActivity(Long activityId, Integer id, @@ -27,16 +45,18 @@ Boolean defineLater, java.util.Date createDateTime, String offlineInstructions, - org.lamsfoundation.lams.learningdesign.LearningLibrary learningLibrary, - org.lamsfoundation.lams.learningdesign.Activity parentActivity, - org.lamsfoundation.lams.learningdesign.LearningDesign learningDesign, - org.lamsfoundation.lams.learningdesign.Grouping grouping, + LearningLibrary learningLibrary, + Activity parentActivity, + Activity libraryActivity, + Integer parentUIID, + LearningDesign learningDesign, + Grouping grouping, Integer activityTypeId, Transition transitionTo, Transition transitionFrom, Integer gateActivityLevelId, - Date gateStartDateTime, - Date gateEndDateTime) { + Date gateStartTimeOffset, + Date gateEndTimeOffset) { super(activityId, id, description, @@ -49,14 +69,16 @@ offlineInstructions, learningLibrary, parentActivity, + libraryActivity, + parentUIID, learningDesign, grouping, activityTypeId, transitionTo, transitionFrom, gateActivityLevelId); - this.gateStartDateTime = gateStartDateTime; - this.gateEndDateTime = gateEndDateTime; + this.gateStartTimeOffset = gateStartTimeOffset; + this.gateEndTimeOffset = gateEndTimeOffset; } /** default constructor */ @@ -75,8 +97,8 @@ Transition transitionTo, Transition transitionFrom, Integer gateActivityLevelId, - Date gateStartDateTime, - Date gateEndDateTime) { + Date gateStartTimeOffset, + Date gateEndTimeOffset) { super(activityId, defineLater, createDateTime, @@ -88,30 +110,57 @@ transitionTo, transitionFrom, gateActivityLevelId); - this.gateStartDateTime = gateStartDateTime; - this.gateEndDateTime = gateEndDateTime; + this.gateStartTimeOffset = gateStartTimeOffset; + this.gateEndTimeOffset = gateEndTimeOffset; } + public static ScheduleGateActivity createCopy(ScheduleGateActivity originalActivity){ + ScheduleGateActivity newScheduleGateActivity = new ScheduleGateActivity(); + + newScheduleGateActivity.setGateEndTimeOffset(originalActivity.getGateEndTimeOffset()); + newScheduleGateActivity.setGateStartTimeOffset(originalActivity.getGateStartTimeOffset()); + + newScheduleGateActivity.setActivityUIID(originalActivity.getActivityUIID()); + newScheduleGateActivity.setDescription(originalActivity.getDescription()); + newScheduleGateActivity.setTitle(originalActivity.getTitle()); + newScheduleGateActivity.setXcoord(originalActivity.getXcoord()); + newScheduleGateActivity.setYcoord(originalActivity.getYcoord()); + newScheduleGateActivity.setDefineLater(originalActivity.getDefineLater()); + newScheduleGateActivity.setCreateDateTime(new Date()); + newScheduleGateActivity.setOfflineInstructions(originalActivity.getOfflineInstructions()); + newScheduleGateActivity.setLearningLibrary(originalActivity.getLearningLibrary()); + newScheduleGateActivity.setActivityTypeId(originalActivity.getActivityTypeId()); + newScheduleGateActivity.setGateActivityLevelId(originalActivity.getGateActivityLevelId()); + + + /** + * TODO calculate how these two values would be set for COPY + * */ + //newScheduleGateActivity.setTransitionTo(); + //newScheduleGateActivity.setTransitionFrom(); + + return newScheduleGateActivity; + } /** * @hibernate.property column="gate_start_date_time" length="19" */ - public Date getGateStartDateTime() { - return this.gateStartDateTime; + public Date getGateStartTimeOffset() { + return this.gateStartTimeOffset; } - public void setGateStartDateTime(Date gateStartDateTime) { - this.gateStartDateTime = gateStartDateTime; + public void setGateStartTimeOffset(Date gateStartTimeOffset) { + this.gateStartTimeOffset = gateStartTimeOffset; } /** * @hibernate.property column="gate_end_date_time" length="19" */ - public Date getGateEndDateTime() { - return this.gateEndDateTime; + public Date getGateEndTimeOffset() { + return this.gateEndTimeOffset; } - public void setGateEndDateTime(Date gateEndDateTime) { - this.gateEndDateTime = gateEndDateTime; + public void setGateEndTimeOffset(Date gateEndTimeOffset) { + this.gateEndTimeOffset = gateEndTimeOffset; } public String toString() { Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java,v diff -u -r1.2 -r1.3 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java 8 Feb 2005 06:02:23 -0000 1.2 +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java 16 Feb 2005 22:03:26 -0000 1.3 @@ -1,6 +1,9 @@ package org.lamsfoundation.lams.learningdesign; import java.io.Serializable; +import java.util.Date; +import java.util.HashSet; + import org.apache.commons.lang.builder.ToStringBuilder; @@ -20,10 +23,12 @@ Boolean defineLater, java.util.Date createDateTime, String offlineInstructions, - org.lamsfoundation.lams.learningdesign.LearningLibrary learningLibrary, - org.lamsfoundation.lams.learningdesign.Activity parentActivity, - org.lamsfoundation.lams.learningdesign.LearningDesign learningDesign, - org.lamsfoundation.lams.learningdesign.Grouping grouping, + LearningLibrary learningLibrary, + Activity parentActivity, + Activity libraryActivity, + Integer parentUIID, + LearningDesign learningDesign, + Grouping grouping, Integer activityTypeId, Transition transitionTo, Transition transitionFrom, @@ -40,6 +45,8 @@ offlineInstructions, learningLibrary, parentActivity, + libraryActivity, + parentUIID, learningDesign, grouping, activityTypeId, @@ -77,6 +84,27 @@ transitionFrom, activities); } + public static SequenceActivity createCopy(SequenceActivity originalActivity){ + SequenceActivity newSequenceActivity = new SequenceActivity(); + + newSequenceActivity.setActivityUIID(originalActivity.getActivityUIID()); + newSequenceActivity.setDescription(originalActivity.getDescription()); + newSequenceActivity.setTitle(originalActivity.getTitle()); + newSequenceActivity.setXcoord(originalActivity.getXcoord()); + newSequenceActivity.setYcoord(originalActivity.getYcoord()); + newSequenceActivity.setDefineLater(originalActivity.getDefineLater()); + newSequenceActivity.setCreateDateTime(new Date()); + newSequenceActivity.setOfflineInstructions(originalActivity.getOfflineInstructions()); + newSequenceActivity.setLearningLibrary(originalActivity.getLearningLibrary()); + newSequenceActivity.setActivityTypeId(originalActivity.getActivityTypeId()); + newSequenceActivity.setActivities(new HashSet()); + + /** TODO */ + //newSequenceActivity.setTransitionTo(); + //newSequenceActivity.setTransitionFrom(); + + return newSequenceActivity; + } public String toString() { return new ToStringBuilder(this) Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/SimpleActivity.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/SimpleActivity.java,v diff -u -r1.2 -r1.3 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/SimpleActivity.java 8 Feb 2005 06:02:23 -0000 1.2 +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/SimpleActivity.java 16 Feb 2005 22:03:26 -0000 1.3 @@ -22,10 +22,12 @@ Boolean defineLater, Date createDateTime, String offlineInstructions, - org.lamsfoundation.lams.learningdesign.LearningLibrary learningLibrary, - org.lamsfoundation.lams.learningdesign.Activity parentActivity, - org.lamsfoundation.lams.learningdesign.LearningDesign learningDesign, - org.lamsfoundation.lams.learningdesign.Grouping grouping, + LearningLibrary learningLibrary, + Activity parentActivity, + Activity libraryActivity, + Integer parentUIID, + LearningDesign learningDesign, + Grouping grouping, Integer activityTypeId, Transition transitionTo, Transition transitionFrom){ super(activityId, @@ -40,6 +42,8 @@ offlineInstructions, learningLibrary, parentActivity, + libraryActivity, + parentUIID, learningDesign, grouping, activityTypeId, @@ -73,8 +77,7 @@ activityTypeId, transitionTo, transitionFrom); - } - + } public String toString() { return new ToStringBuilder(this) Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/SynchGateActivity.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/SynchGateActivity.java,v diff -u -r1.2 -r1.3 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/SynchGateActivity.java 8 Feb 2005 06:02:23 -0000 1.2 +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/SynchGateActivity.java 16 Feb 2005 22:03:26 -0000 1.3 @@ -1,6 +1,8 @@ package org.lamsfoundation.lams.learningdesign; import java.io.Serializable; +import java.util.Date; + import org.apache.commons.lang.builder.ToStringBuilder; @@ -20,9 +22,11 @@ Boolean defineLater, java.util.Date createDateTime, String offlineInstructions, - org.lamsfoundation.lams.learningdesign.LearningLibrary learningLibrary, - org.lamsfoundation.lams.learningdesign.Activity parentActivity, - org.lamsfoundation.lams.learningdesign.LearningDesign learningDesign, + LearningLibrary learningLibrary, + Activity parentActivity, + Activity libraryActivity, + Integer parentUIID, + LearningDesign learningDesign, org.lamsfoundation.lams.learningdesign.Grouping grouping, Integer activityTypeId, Transition transitionTo, @@ -39,7 +43,9 @@ createDateTime, offlineInstructions, learningLibrary, - parentActivity, + parentActivity, + libraryActivity, + parentUIID, learningDesign, grouping, activityTypeId, @@ -76,6 +82,28 @@ transitionFrom, gateActivityLevelId); } + public static SynchGateActivity createCopy(SynchGateActivity originalActivity){ + SynchGateActivity newSynchGateActivity = new SynchGateActivity(); + + newSynchGateActivity.setActivityUIID(originalActivity.getActivityUIID()); + newSynchGateActivity.setDescription(originalActivity.getDescription()); + newSynchGateActivity.setTitle(originalActivity.getTitle()); + newSynchGateActivity.setXcoord(originalActivity.getXcoord()); + newSynchGateActivity.setYcoord(originalActivity.getYcoord()); + newSynchGateActivity.setDefineLater(originalActivity.getDefineLater()); + newSynchGateActivity.setCreateDateTime(new Date()); + newSynchGateActivity.setOfflineInstructions(originalActivity.getOfflineInstructions()); + newSynchGateActivity.setLearningLibrary(originalActivity.getLearningLibrary()); + newSynchGateActivity.setActivityTypeId(originalActivity.getActivityTypeId()); + newSynchGateActivity.setGateActivityLevelId(originalActivity.getGateActivityLevelId()); + /** + * TODO calculate how these two values would be set for COPY + * */ + //newSynchGateActivity.setTransitionTo(); + //newSynchGateActivity.setTransitionFrom(); + + return newSynchGateActivity; + } public String toString() { return new ToStringBuilder(this) Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java,v diff -u -r1.4 -r1.5 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java 11 Feb 2005 01:24:22 -0000 1.4 +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java 16 Feb 2005 22:07:09 -0000 1.5 @@ -1,6 +1,7 @@ package org.lamsfoundation.lams.learningdesign; import java.io.Serializable; +import java.util.Date; import java.util.Set; import org.apache.commons.lang.builder.ToStringBuilder; @@ -39,6 +40,8 @@ String offlineInstructions, LearningLibrary learningLibrary, Activity parentActivity, + Activity libraryActivity, + Integer parentUIID, LearningDesign learningDesign, Grouping grouping, Integer activityTypeId, @@ -59,6 +62,8 @@ offlineInstructions, learningLibrary, parentActivity, + libraryActivity, + parentUIID, learningDesign, grouping, activityTypeId, @@ -100,6 +105,27 @@ this.tool = tool; this.toolContentId = toolContentId; } + public static ToolActivity createCopy(ToolActivity originalActivity){ + + ToolActivity newToolActivity = new ToolActivity(); + newToolActivity.setActivityUIID(originalActivity.getActivityUIID()); + newToolActivity.setDescription(originalActivity.getDescription()); + newToolActivity.setTitle(originalActivity.getTitle()); + newToolActivity.setXcoord(originalActivity.getXcoord()); + newToolActivity.setYcoord(originalActivity.getYcoord()); + newToolActivity.setDefineLater(originalActivity.getDefineLater()); + newToolActivity.setCreateDateTime(new Date()); + newToolActivity.setOfflineInstructions(originalActivity.getOfflineInstructions()); + newToolActivity.setLearningLibrary(originalActivity.getLearningLibrary()); + newToolActivity.setActivityTypeId(originalActivity.getActivityTypeId()); + /** + * TODO calculate how these two values would be set for COPY + * */ + //newToolActivity.setTransitionTo(); + //newToolActivity.setTransitionFrom(); + newToolActivity.setTool(originalActivity.getTool()); + return newToolActivity; + } public String toString() { Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Transition.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/Transition.java,v diff -u -r1.1 -r1.2 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Transition.java 28 Jan 2005 04:20:45 -0000 1.1 +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Transition.java 16 Feb 2005 22:03:26 -0000 1.2 @@ -6,196 +6,230 @@ import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; - -/** - * @hibernate.class - * table="lams_learning_transition" - * -*/ +/** + * @hibernate.class table="lams_learning_transition" + * + */ public class Transition implements Serializable { - /** identifier field */ - private Long transitionId; + /** identifier field */ + private Long transitionId; - /** nullable persistent field */ - private Integer id; + /** nullable persistent field */ + private Integer transitionUIID; - /** nullable persistent field */ - private String description; + /** nullable persistent field */ + private Integer toUIID; - /** nullable persistent field */ - private String title; + /** nullable persistent field */ + private Integer fromUIID; - /** persistent field */ - private Date createDateTime; + /** nullable persistent field */ + private String description; - /** persistent field */ - private org.lamsfoundation.lams.learningdesign.Activity activityByToActivityId; + /** nullable persistent field */ + private String title; - /** persistent field */ - private org.lamsfoundation.lams.learningdesign.Activity activityByFromActivityId; + /** persistent field */ + private Date createDateTime; - /** persistent field */ - private org.lamsfoundation.lams.learningdesign.LearningDesign learningDesign; + /** persistent field */ + Activity activityByToActivityId; - /** full constructor */ - public Transition(Long transitionId, Integer id, String description, String title, Date createDateTime, org.lamsfoundation.lams.learningdesign.Activity activityByToActivityId, org.lamsfoundation.lams.learningdesign.Activity activityByFromActivityId, org.lamsfoundation.lams.learningdesign.LearningDesign learningDesign) { - this.transitionId = transitionId; - this.id = id; - this.description = description; - this.title = title; - this.createDateTime = createDateTime; - this.activityByToActivityId = activityByToActivityId; - this.activityByFromActivityId = activityByFromActivityId; - this.learningDesign = learningDesign; - } + /** persistent field */ + Activity activityByFromActivityId; - /** default constructor */ - public Transition() { - } + /** persistent field */ + LearningDesign learningDesign; - /** minimal constructor */ - public Transition(Long transitionId, Date createDateTime, org.lamsfoundation.lams.learningdesign.Activity activityByToActivityId, org.lamsfoundation.lams.learningdesign.Activity activityByFromActivityId, org.lamsfoundation.lams.learningdesign.LearningDesign learningDesign) { - this.transitionId = transitionId; - this.createDateTime = createDateTime; - this.activityByToActivityId = activityByToActivityId; - this.activityByFromActivityId = activityByFromActivityId; - this.learningDesign = learningDesign; - } + /** full constructor */ + public Transition( + Long transitionId, + Integer id, + String description, + String title, + Date createDateTime, + Activity activityByToActivityId, + Activity activityByFromActivityId, + LearningDesign learningDesign, + Integer toUIID, + Integer fromUIID) { + this.transitionId = transitionId; + this.transitionUIID = id; + this.description = description; + this.title = title; + this.createDateTime = createDateTime; + this.activityByToActivityId = activityByToActivityId; + this.activityByFromActivityId = activityByFromActivityId; + this.learningDesign = learningDesign; + this.toUIID = toUIID; + this.fromUIID = fromUIID; + } - /** - * @hibernate.id - * generator-class="identity" - * type="java.lang.Long" - * column="transition_id" - * - */ - public Long getTransitionId() { - return this.transitionId; - } + /** default constructor */ + public Transition() { + } - public void setTransitionId(Long transitionId) { - this.transitionId = transitionId; - } + /** minimal constructor */ + public Transition( + Long transitionId, + Date createDateTime, + Activity activityByToActivityId, + Activity activityByFromActivityId, + LearningDesign learningDesign) { + this.transitionId = transitionId; + this.createDateTime = createDateTime; + this.activityByToActivityId = activityByToActivityId; + this.activityByFromActivityId = activityByFromActivityId; + this.learningDesign = learningDesign; + } + public static Transition createCopy(Transition originalTransition){ + Transition newTransition = new Transition(); + + newTransition.setTransitionUIID(originalTransition.getTransitionUIID()); + newTransition.setDescription(originalTransition.getDescription()); + newTransition.setTitle(originalTransition.getTitle()); + newTransition.setCreateDateTime(new Date()); + newTransition.setToUIID(originalTransition.getToUIID()); + newTransition.setFromUIID(originalTransition.getFromUIID()); + return newTransition; + } - /** - * @hibernate.property - * column="id" - * length="11" - * - */ - public Integer getId() { - return this.id; - } + /** + * @hibernate.transitionUIID generator-class="identity" + * type="java.lang.Long" column="transition_id" + * + */ + public Long getTransitionId() { + return this.transitionId; + } - public void setId(Integer id) { - this.id = id; - } + public void setTransitionId(Long transitionId) { + this.transitionId = transitionId; + } - /** - * @hibernate.property - * column="description" - * length="65535" - * - */ - public String getDescription() { - return this.description; - } + /** + * @hibernate.property column="transitionUIID" length="11" + * + */ + public Integer getTransitionUIID() { + return this.transitionUIID; + } - public void setDescription(String description) { - this.description = description; - } + public void setTransitionUIID(Integer id) { + this.transitionUIID = id; + } - /** - * @hibernate.property - * column="title" - * length="255" - * - */ - public String getTitle() { - return this.title; - } + /** + * @hibernate.property column="description" length="65535" + * + */ + public String getDescription() { + return this.description; + } - public void setTitle(String title) { - this.title = title; - } + public void setDescription(String description) { + this.description = description; + } - /** - * @hibernate.property - * column="create_date_time" - * length="19" - * not-null="true" - * - */ - public Date getCreateDateTime() { - return this.createDateTime; - } + /** + * @hibernate.property column="title" length="255" + * + */ + public String getTitle() { + return this.title; + } - public void setCreateDateTime(Date createDateTime) { - this.createDateTime = createDateTime; - } + public void setTitle(String title) { + this.title = title; + } - /** - * @hibernate.many-to-one - * not-null="true" - * @hibernate.column name="to_activity_id" - * - */ - public org.lamsfoundation.lams.learningdesign.Activity getActivityByToActivityId() { - return this.activityByToActivityId; - } + /** + * @hibernate.property column="create_date_time" length="19" not-null="true" + * + */ + public Date getCreateDateTime() { + return this.createDateTime; + } - public void setActivityByToActivityId(org.lamsfoundation.lams.learningdesign.Activity activityByToActivityId) { - this.activityByToActivityId = activityByToActivityId; - } + public void setCreateDateTime(Date createDateTime) { + this.createDateTime = createDateTime; + } - /** - * @hibernate.many-to-one - * not-null="true" - * @hibernate.column name="from_activity_id" - * - */ - public org.lamsfoundation.lams.learningdesign.Activity getActivityByFromActivityId() { - return this.activityByFromActivityId; - } + /** + * @hibernate.many-to-one not-null="true" + * @hibernate.column name="to_activity_id" + * + */ + public org.lamsfoundation.lams.learningdesign.Activity getActivityByToActivityId() { + return this.activityByToActivityId; + } - public void setActivityByFromActivityId(org.lamsfoundation.lams.learningdesign.Activity activityByFromActivityId) { - this.activityByFromActivityId = activityByFromActivityId; - } + public void setActivityByToActivityId( + org.lamsfoundation.lams.learningdesign.Activity activityByToActivityId) { + this.activityByToActivityId = activityByToActivityId; + } - /** - * @hibernate.many-to-one - * not-null="true" - * @hibernate.column name="learning_design_id" - * - */ - public org.lamsfoundation.lams.learningdesign.LearningDesign getLearningDesign() { - return this.learningDesign; - } + /** + * @hibernate.many-to-one not-null="true" + * @hibernate.column name="from_activity_id" + * + */ + public org.lamsfoundation.lams.learningdesign.Activity getActivityByFromActivityId() { + return this.activityByFromActivityId; + } - public void setLearningDesign(org.lamsfoundation.lams.learningdesign.LearningDesign learningDesign) { - this.learningDesign = learningDesign; - } + public void setActivityByFromActivityId( + org.lamsfoundation.lams.learningdesign.Activity activityByFromActivityId) { + this.activityByFromActivityId = activityByFromActivityId; + } - public String toString() { - return new ToStringBuilder(this) - .append("transitionId", getTransitionId()) - .toString(); - } + /** + * @hibernate.many-to-one not-null="true" + * @hibernate.column name="learning_design_id" + * + */ + public org.lamsfoundation.lams.learningdesign.LearningDesign getLearningDesign() { + return this.learningDesign; + } - public boolean equals(Object other) { - if ( (this == other ) ) return true; - if ( !(other instanceof Transition) ) return false; - Transition castOther = (Transition) other; - return new EqualsBuilder() - .append(this.getTransitionId(), castOther.getTransitionId()) - .isEquals(); - } + public void setLearningDesign( + org.lamsfoundation.lams.learningdesign.LearningDesign learningDesign) { + this.learningDesign = learningDesign; + } - public int hashCode() { - return new HashCodeBuilder() - .append(getTransitionId()) - .toHashCode(); - } + public String toString() { + return new ToStringBuilder(this).append("transitionId", + getTransitionId()).toString(); + } -} + public boolean equals(Object other) { + if ((this == other)) + return true; + if (!(other instanceof Transition)) + return false; + Transition castOther = (Transition) other; + return new EqualsBuilder().append(this.getTransitionId(), + castOther.getTransitionId()).isEquals(); + } + + public int hashCode() { + return new HashCodeBuilder().append(getTransitionId()).toHashCode(); + } + + public Integer getFromUIID() { + return fromUIID; + } + + public void setFromUIID(Integer fromUIID) { + this.fromUIID = fromUIID; + } + + public Integer getToUIID() { + return toUIID; + } + + public void setToUIID(Integer toUIID) { + this.toUIID = toUIID; + } +} \ No newline at end of file