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.44 -r1.45
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml 16 Sep 2008 03:18:13 -0000 1.44
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml 18 Sep 2008 02:30:14 -0000 1.45
@@ -134,6 +134,12 @@
+
+
+
+
+
+
@@ -324,7 +330,7 @@
-
+
@hibernate.property column="start_xcoord" length="11"
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/BranchActivityEntry.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/BranchActivityEntry.hbm.xml,v
diff -u -r1.2 -r1.3
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/BranchActivityEntry.hbm.xml 16 Sep 2008 03:18:13 -0000 1.2
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/BranchActivityEntry.hbm.xml 18 Sep 2008 02:30:14 -0000 1.3
@@ -33,7 +33,7 @@
-
+
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java,v
diff -u -r1.73 -r1.74
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java 16 Sep 2008 03:18:13 -0000 1.73
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java 18 Sep 2008 02:30:14 -0000 1.74
@@ -227,6 +227,12 @@
* The activities that supplied inputs to this activity.
*/
private Set inputActivities;
+
+ /**
+ * The BranchActivityEntries that map conditions to this Activity; bi-directional association
+ * required (e.g. LDEV-1910)
+ */
+ private Set branchActivityEntries;
//---------------------------------------------------------------------
// Object constructors
@@ -241,7 +247,7 @@
Integer orderId, Boolean defineLater, Date createDateTime, LearningLibrary learningLibrary, Activity parentActivity,
Activity libraryActivity, Integer parentUIID, LearningDesign learningDesign, Grouping grouping,
Integer activityTypeId, Transition transitionTo, Transition transitionFrom, String languageFile,
- Boolean stopAfterActivity, Set inputActivities) {
+ Boolean stopAfterActivity, Set inputActivities, Set branchActivityEntries) {
this.activityId = activityId;
activityUIID = id;
this.description = description;
@@ -265,6 +271,7 @@
initialised = false;
this.stopAfterActivity = stopAfterActivity;
this.inputActivities = inputActivities;
+ this.branchActivityEntries = branchActivityEntries;
}
/** default constructor */
@@ -613,7 +620,21 @@
public void setInputActivities(Set inputActivities) {
this.inputActivities = inputActivities;
}
+
+ /**
+ * @return Returns the branchActivityEntries.
+ */
+ public Set getBranchActivityEntries() {
+ return branchActivityEntries;
+ }
+ /**
+ * @param branchActivityEntries The branchActivityEntries to set.
+ */
+ public void setBranchActivityEntries(Set branchActivityEntries) {
+ this.branchActivityEntries = branchActivityEntries;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this).append("activityId", activityId).append("activityUIID", activityUIID).append(
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchingActivity.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchingActivity.java,v
diff -u -r1.9 -r1.10
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchingActivity.java 15 Oct 2007 07:55:45 -0000 1.9
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchingActivity.java 18 Sep 2008 02:30:14 -0000 1.10
@@ -80,7 +80,8 @@
Set inputActivities,
Set activities,
Activity defaultActivity,
- SystemTool systemTool) {
+ SystemTool systemTool,
+ Set branchActivityEntries) {
super(activityId,
id,
description,
@@ -103,7 +104,8 @@
stopAfterActivity,
inputActivities,
activities,
- defaultActivity);
+ defaultActivity,
+ branchActivityEntries);
super.activityStrategy = new BranchingActivityStrategy(this);
this.systemTool = systemTool;
this.startXcoord = startXcoord;
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ChosenBranchingActivity.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/ChosenBranchingActivity.java,v
diff -u -r1.8 -r1.9
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ChosenBranchingActivity.java 16 Jun 2008 02:49:49 -0000 1.8
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ChosenBranchingActivity.java 18 Sep 2008 02:30:14 -0000 1.9
@@ -67,7 +67,8 @@
Set inputActivities,
Set activities,
Activity defaultActivity,
- SystemTool systemTool) {
+ SystemTool systemTool,
+ Set branchActivityEntries) {
super(activityId,
id,
description,
@@ -95,7 +96,8 @@
inputActivities,
activities,
defaultActivity,
- systemTool);
+ systemTool,
+ branchActivityEntries);
}
/** default constructor */
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java,v
diff -u -r1.31 -r1.32
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java 11 Feb 2008 04:21:14 -0000 1.31
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java 18 Sep 2008 02:30:14 -0000 1.32
@@ -77,11 +77,12 @@
Boolean stopAfterActivity,
Set inputActivities,
Set activities,
- Activity defaultActivity) {
+ Activity defaultActivity,
+ Set branchActivityEntries) {
super(activityId, id, description, title, xcoord, ycoord, orderId,
defineLater, createDateTime,
learningLibrary, parentActivity, libraryActivity,parentUIID,learningDesign, grouping,
- activityTypeId, transitionTo,transitionFrom, languageFile, stopAfterActivity, inputActivities);
+ activityTypeId, transitionTo,transitionFrom, languageFile, stopAfterActivity, inputActivities, branchActivityEntries);
this.activities = activities;
}
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ConditionGateActivity.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/ConditionGateActivity.java,v
diff -u -r1.1 -r1.2
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ConditionGateActivity.java 16 Sep 2008 03:18:13 -0000 1.1
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ConditionGateActivity.java 18 Sep 2008 02:30:14 -0000 1.2
@@ -50,10 +50,12 @@
Integer orderId, Boolean defineLater, java.util.Date createDateTime, LearningLibrary learningLibrary,
Activity parentActivity, Activity libraryActivity, Integer parentUIID, LearningDesign learningDesign,
Grouping grouping, Integer activityTypeId, Transition transitionTo, Transition transitionFrom, String languageFile,
- Boolean stopAfterActivity, Set inputActivities, Integer gateActivityLevelId, Set waitingLearners, SystemTool sysTool) {
+ Boolean stopAfterActivity, Set inputActivities, Integer gateActivityLevelId, Set waitingLearners, SystemTool sysTool,
+ Set branchActivityEntries) {
super(activityId, id, description, title, xcoord, ycoord, orderId, defineLater, createDateTime, learningLibrary,
parentActivity, libraryActivity, parentUIID, learningDesign, grouping, activityTypeId, transitionTo,
- transitionFrom, languageFile, stopAfterActivity, inputActivities, gateActivityLevelId, waitingLearners, sysTool);
+ transitionFrom, languageFile, stopAfterActivity, inputActivities, gateActivityLevelId, waitingLearners, sysTool,
+ branchActivityEntries);
super.simpleActivityStrategy = new ConditionGateActivityStrategy(this);
}
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/GateActivity.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/GateActivity.java,v
diff -u -r1.24 -r1.25
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/GateActivity.java 13 Sep 2008 02:11:47 -0000 1.24
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/GateActivity.java 18 Sep 2008 02:30:14 -0000 1.25
@@ -71,10 +71,11 @@
Integer orderId, Boolean defineLater, java.util.Date createDateTime, LearningLibrary learningLibrary,
Activity parentActivity, Activity libraryActivity, Integer parentUIID, LearningDesign learningDesign,
Grouping grouping, Integer activityTypeId, Transition transitionTo, Transition transitionFrom, String languageFile,
- Boolean stopAfterActivity, Set inputActivities, Integer gateActivityLevelId, Set waitingLearners, SystemTool sysTool) {
+ Boolean stopAfterActivity, Set inputActivities, Integer gateActivityLevelId, Set waitingLearners, SystemTool sysTool,
+ Set branchActivityEntries) {
super(activityId, id, description, title, xcoord, ycoord, orderId, defineLater, createDateTime, learningLibrary,
parentActivity, libraryActivity, parentUIID, learningDesign, grouping, activityTypeId, transitionTo,
- transitionFrom, languageFile, stopAfterActivity, inputActivities);
+ transitionFrom, languageFile, stopAfterActivity, inputActivities, branchActivityEntries);
this.gateActivityLevelId = gateActivityLevelId;
this.waitingLearners = waitingLearners;
systemTool = sysTool;
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupBranchingActivity.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupBranchingActivity.java,v
diff -u -r1.9 -r1.10
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupBranchingActivity.java 13 May 2008 23:18:07 -0000 1.9
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupBranchingActivity.java 18 Sep 2008 02:30:14 -0000 1.10
@@ -71,7 +71,8 @@
Set inputActivities,
Set activities,
Activity defaultActivity,
- SystemTool systemTool) {
+ SystemTool systemTool,
+ Set branchActivityEntries) {
super(activityId,
id,
description,
@@ -99,7 +100,8 @@
inputActivities,
activities,
defaultActivity,
- systemTool);
+ systemTool,
+ branchActivityEntries);
}
/** default constructor */
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java,v
diff -u -r1.25 -r1.26
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java 9 Dec 2007 09:55:22 -0000 1.25
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java 18 Sep 2008 02:30:14 -0000 1.26
@@ -73,7 +73,8 @@
String languageFile,
Boolean stopAfterActivity,
Set inputActivities,
- SystemTool sysTool)
+ SystemTool sysTool,
+ Set branchActivityEntries)
{
super(activityId,
id,
@@ -95,7 +96,8 @@
transitionFrom,
languageFile,
stopAfterActivity,
- inputActivities);
+ inputActivities,
+ branchActivityEntries);
this.createGrouping = createGrouping;
this.createGroupingUIID = create_grouping_ui_id;
this.systemTool = sysTool;
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.29 -r1.30
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/OptionsActivity.java 9 Dec 2007 09:55:22 -0000 1.29
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/OptionsActivity.java 18 Sep 2008 02:30:14 -0000 1.30
@@ -72,7 +72,8 @@
Activity defaultActivity,
Integer maxNumberOfOptions,
Integer minNumberOfOptions,
- String options_instructions) {
+ String options_instructions,
+ Set branchActivityEntries) {
super(activityId,
id,
description,
@@ -95,7 +96,8 @@
stopAfterActivity,
inputActivities,
activities,
- defaultActivity);
+ defaultActivity,
+ branchActivityEntries);
this.maxNumberOfOptions = maxNumberOfOptions;
this.minNumberOfOptions = minNumberOfOptions;
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.28 -r1.29
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ParallelActivity.java 9 Dec 2007 09:55:22 -0000 1.28
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ParallelActivity.java 18 Sep 2008 02:30:14 -0000 1.29
@@ -59,7 +59,8 @@
Boolean stopAfterActivity,
Set inputActivities,
Set activities,
- Activity defaultActivity) {
+ Activity defaultActivity,
+ Set branchActivityEntries) {
super(activityId,
id,
description,
@@ -82,7 +83,8 @@
stopAfterActivity,
inputActivities,
activities,
- defaultActivity);
+ defaultActivity,
+ branchActivityEntries);
super.activityStrategy = new ParallelActivityStrategy(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.24 -r1.25
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/PermissionGateActivity.java 9 Dec 2007 09:55:22 -0000 1.24
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/PermissionGateActivity.java 18 Sep 2008 02:30:14 -0000 1.25
@@ -63,7 +63,8 @@
Set inputActivities,
Integer gateActivityLevelId,
Set waitingLearners,
- SystemTool sysTool)
+ SystemTool sysTool,
+ Set branchActivityEntries)
{
super(activityId,
id,
@@ -88,7 +89,8 @@
inputActivities,
gateActivityLevelId,
waitingLearners,
- sysTool);
+ sysTool,
+ branchActivityEntries);
super.simpleActivityStrategy = new PermissionGateActivityStrategy(this);
}
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.32 -r1.33
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ScheduleGateActivity.java 9 Dec 2007 09:55:22 -0000 1.32
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ScheduleGateActivity.java 18 Sep 2008 02:30:14 -0000 1.33
@@ -111,7 +111,8 @@
Long gateStartTimeOffset,
Long gateEndTimeOffset,
Set waitingLearners,
- SystemTool sysTool) {
+ SystemTool sysTool,
+ Set branchActivityEntries) {
super(activityId,
id,
description,
@@ -135,7 +136,8 @@
inputActivities,
gateActivityLevelId,
waitingLearners,
- sysTool);
+ sysTool,
+ branchActivityEntries);
//validate pre-condition.
if(gateStartTimeOffset != null && gateEndTimeOffset != null && (gateStartTimeOffset.intValue()>gateEndTimeOffset.intValue()))
throw new IllegalStateException("End time offset must be larger" +
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.42 -r1.43
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java 27 May 2008 02:32:40 -0000 1.42
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java 18 Sep 2008 02:30:13 -0000 1.43
@@ -75,7 +75,8 @@
Set activities,
Activity defaultActivity,
Set branchEntries,
- SystemTool systemTool) {
+ SystemTool systemTool,
+ Set branchActivityEntries) {
super(activityId,
id,
description,
@@ -98,7 +99,8 @@
stopAfterActivity,
inputActivities,
activities,
- defaultActivity);
+ defaultActivity,
+ branchActivityEntries);
super.activityStrategy = new SequenceActivityStrategy(this);
this.branchEntries = branchEntries;
this.systemTool = systemTool;
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.17 -r1.18
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/SimpleActivity.java 15 Aug 2007 01:51:15 -0000 1.17
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/SimpleActivity.java 18 Sep 2008 02:30:14 -0000 1.18
@@ -59,7 +59,8 @@
Transition transitionFrom,
String languageFile,
Boolean stopAfterActivity,
- Set inputActivities){
+ Set inputActivities,
+ Set branchActivityEntries){
super(activityId,
id,
description,
@@ -80,7 +81,8 @@
transitionFrom,
languageFile,
stopAfterActivity,
- inputActivities);
+ inputActivities,
+ branchActivityEntries);
}
/** default constructor */
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.24 -r1.25
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/SynchGateActivity.java 9 Dec 2007 09:55:22 -0000 1.24
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/SynchGateActivity.java 18 Sep 2008 02:30:14 -0000 1.25
@@ -62,7 +62,8 @@
Set inputActivities,
Integer gateActivityLevelId,
Set waitingLearners,
- SystemTool sysTool) {
+ SystemTool sysTool,
+ Set branchActivityEntries) {
super(activityId,
id,
description,
@@ -86,7 +87,8 @@
inputActivities,
gateActivityLevelId,
waitingLearners,
- sysTool);
+ sysTool,
+ branchActivityEntries);
super.simpleActivityStrategy = new SynchGateActivityStrategy(this);
}
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/SystemGateActivity.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/SystemGateActivity.java,v
diff -u -r1.5 -r1.6
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/SystemGateActivity.java 9 Dec 2007 09:55:22 -0000 1.5
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/SystemGateActivity.java 18 Sep 2008 02:30:14 -0000 1.6
@@ -62,7 +62,8 @@
Set inputActivities,
Integer gateActivityLevelId,
Set waitingLearners,
- SystemTool sysTool) {
+ SystemTool sysTool,
+ Set branchActivityEntries) {
super(activityId,
id,
description,
@@ -86,7 +87,8 @@
inputActivities,
gateActivityLevelId,
waitingLearners,
- sysTool);
+ sysTool,
+ branchActivityEntries);
super.simpleActivityStrategy = new SystemGateActivityStrategy(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.31 -r1.32
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java 9 Dec 2007 09:55:22 -0000 1.31
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java 18 Sep 2008 02:30:14 -0000 1.32
@@ -83,7 +83,8 @@
Boolean stopAfterActivity,
Set inputActivities,
Tool tool,
- Long toolContentId)
+ Long toolContentId,
+ Set branchActivityEntries)
{
super(activityId,
id,
@@ -105,7 +106,8 @@
transitionFrom,
languageFile,
stopAfterActivity,
- inputActivities);
+ inputActivities,
+ branchActivityEntries);
this.tool = tool;
this.toolContentId = toolContentId;
super.simpleActivityStrategy = new ToolActivityStrategy(this);
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolBranchingActivity.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolBranchingActivity.java,v
diff -u -r1.10 -r1.11
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolBranchingActivity.java 16 Jun 2008 02:49:49 -0000 1.10
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolBranchingActivity.java 18 Sep 2008 02:30:14 -0000 1.11
@@ -71,7 +71,8 @@
Set inputActivities,
Set activities,
Activity defaultActivity,
- SystemTool systemTool) {
+ SystemTool systemTool,
+ Set branchActivityEntries) {
super(activityId,
id,
description,
@@ -99,7 +100,8 @@
inputActivities,
activities,
defaultActivity,
- systemTool);
+ systemTool,
+ branchActivityEntries);
}
/** default constructor */