Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
===================================================================
diff -u -r209087915bc219f430c282ad00e5d1e6462f9b5f -r6d0ec5db1add705fb9da59656aaa4916e1163893
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml	(.../Activity.hbm.xml)	(revision 209087915bc219f430c282ad00e5d1e6462f9b5f)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml	(.../Activity.hbm.xml)	(revision 6d0ec5db1add705fb9da59656aaa4916e1163893)
@@ -134,6 +134,12 @@
    		<key><column name="activity_id" /></key>
    		<many-to-many column="input_activity_id" class="org.lamsfoundation.lams.learningdesign.Activity"/>
 	</set>
+	
+	<!-- bi-directional assocation to BranchActivityEntry -->
+	<set name="branchActivityEntries" lazy="true" inverse="true" cascade="all-delete-orphan">
+		<key><column name="branch_activity_id" /></key>
+		<one-to-many class="org.lamsfoundation.lams.learningdesign.BranchActivityEntry"/>
+	</set>  
     
     <!-- Subclass definations for polymorphic persistence -->
     <subclass name="org.lamsfoundation.lams.learningdesign.SimpleActivity" >
@@ -324,7 +330,7 @@
 	             <!-- uni-directional many-to-one association to System Tool -->
 	             <many-to-one name="systemTool" class="org.lamsfoundation.lams.tool.SystemTool" lazy="false" >
 	             	<column name="system_tool_id" not-null="false"/>
-	             </many-to-one>                 
+	             </many-to-one>
 
 	  			<property name="startXcoord" type="java.lang.Integer" column="start_xcoord" length="11" >
 			       <meta attribute="field-description">@hibernate.property column="start_xcoord" length="11" </meta>    
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/BranchActivityEntry.hbm.xml
===================================================================
diff -u -r209087915bc219f430c282ad00e5d1e6462f9b5f -r6d0ec5db1add705fb9da59656aaa4916e1163893
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/BranchActivityEntry.hbm.xml	(.../BranchActivityEntry.hbm.xml)	(revision 209087915bc219f430c282ad00e5d1e6462f9b5f)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/BranchActivityEntry.hbm.xml	(.../BranchActivityEntry.hbm.xml)	(revision 6d0ec5db1add705fb9da59656aaa4916e1163893)
@@ -33,7 +33,7 @@
         <column name="sequence_activity_id" />
     </many-to-one>
 
-    <!-- bi-directional many-to-one association from the Branch's Sequence Activity -->
+    <!-- bi-directional many-to-one association from the Branch or other Activity -->
     <many-to-one name="branchingActivity" class="org.lamsfoundation.lams.learningdesign.Activity">
         <column name="branch_activity_id" />
     </many-to-one>
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java
===================================================================
diff -u -r209087915bc219f430c282ad00e5d1e6462f9b5f -r6d0ec5db1add705fb9da59656aaa4916e1163893
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java	(.../Activity.java)	(revision 209087915bc219f430c282ad00e5d1e6462f9b5f)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java	(.../Activity.java)	(revision 6d0ec5db1add705fb9da59656aaa4916e1163893)
@@ -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
===================================================================
diff -u -r30acfe9f54a7c8e0e67b987665d8e8d9e93f496c -r6d0ec5db1add705fb9da59656aaa4916e1163893
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchingActivity.java	(.../BranchingActivity.java)	(revision 30acfe9f54a7c8e0e67b987665d8e8d9e93f496c)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchingActivity.java	(.../BranchingActivity.java)	(revision 6d0ec5db1add705fb9da59656aaa4916e1163893)
@@ -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
===================================================================
diff -u -r21c2c5458bc48ec75db4e917444cca70448b4dea -r6d0ec5db1add705fb9da59656aaa4916e1163893
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ChosenBranchingActivity.java	(.../ChosenBranchingActivity.java)	(revision 21c2c5458bc48ec75db4e917444cca70448b4dea)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ChosenBranchingActivity.java	(.../ChosenBranchingActivity.java)	(revision 6d0ec5db1add705fb9da59656aaa4916e1163893)
@@ -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
===================================================================
diff -u -r870373d635bc769aee2dc271e6ff12818fcfcea6 -r6d0ec5db1add705fb9da59656aaa4916e1163893
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java	(.../ComplexActivity.java)	(revision 870373d635bc769aee2dc271e6ff12818fcfcea6)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java	(.../ComplexActivity.java)	(revision 6d0ec5db1add705fb9da59656aaa4916e1163893)
@@ -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
===================================================================
diff -u -r209087915bc219f430c282ad00e5d1e6462f9b5f -r6d0ec5db1add705fb9da59656aaa4916e1163893
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ConditionGateActivity.java	(.../ConditionGateActivity.java)	(revision 209087915bc219f430c282ad00e5d1e6462f9b5f)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ConditionGateActivity.java	(.../ConditionGateActivity.java)	(revision 6d0ec5db1add705fb9da59656aaa4916e1163893)
@@ -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
===================================================================
diff -u -r418a30a76094c56762b5beb23cb2dd72619e316c -r6d0ec5db1add705fb9da59656aaa4916e1163893
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/GateActivity.java	(.../GateActivity.java)	(revision 418a30a76094c56762b5beb23cb2dd72619e316c)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/GateActivity.java	(.../GateActivity.java)	(revision 6d0ec5db1add705fb9da59656aaa4916e1163893)
@@ -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
===================================================================
diff -u -rfd75ff4bac204cc358183623e946df6102e7eefc -r6d0ec5db1add705fb9da59656aaa4916e1163893
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupBranchingActivity.java	(.../GroupBranchingActivity.java)	(revision fd75ff4bac204cc358183623e946df6102e7eefc)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupBranchingActivity.java	(.../GroupBranchingActivity.java)	(revision 6d0ec5db1add705fb9da59656aaa4916e1163893)
@@ -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
===================================================================
diff -u -r309a597eada52a4079f2985e0d97beedf9adda42 -r6d0ec5db1add705fb9da59656aaa4916e1163893
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java	(.../GroupingActivity.java)	(revision 309a597eada52a4079f2985e0d97beedf9adda42)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java	(.../GroupingActivity.java)	(revision 6d0ec5db1add705fb9da59656aaa4916e1163893)
@@ -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
===================================================================
diff -u -r309a597eada52a4079f2985e0d97beedf9adda42 -r6d0ec5db1add705fb9da59656aaa4916e1163893
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/OptionsActivity.java	(.../OptionsActivity.java)	(revision 309a597eada52a4079f2985e0d97beedf9adda42)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/OptionsActivity.java	(.../OptionsActivity.java)	(revision 6d0ec5db1add705fb9da59656aaa4916e1163893)
@@ -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
===================================================================
diff -u -r309a597eada52a4079f2985e0d97beedf9adda42 -r6d0ec5db1add705fb9da59656aaa4916e1163893
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ParallelActivity.java	(.../ParallelActivity.java)	(revision 309a597eada52a4079f2985e0d97beedf9adda42)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ParallelActivity.java	(.../ParallelActivity.java)	(revision 6d0ec5db1add705fb9da59656aaa4916e1163893)
@@ -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
===================================================================
diff -u -r309a597eada52a4079f2985e0d97beedf9adda42 -r6d0ec5db1add705fb9da59656aaa4916e1163893
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/PermissionGateActivity.java	(.../PermissionGateActivity.java)	(revision 309a597eada52a4079f2985e0d97beedf9adda42)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/PermissionGateActivity.java	(.../PermissionGateActivity.java)	(revision 6d0ec5db1add705fb9da59656aaa4916e1163893)
@@ -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
===================================================================
diff -u -r309a597eada52a4079f2985e0d97beedf9adda42 -r6d0ec5db1add705fb9da59656aaa4916e1163893
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ScheduleGateActivity.java	(.../ScheduleGateActivity.java)	(revision 309a597eada52a4079f2985e0d97beedf9adda42)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ScheduleGateActivity.java	(.../ScheduleGateActivity.java)	(revision 6d0ec5db1add705fb9da59656aaa4916e1163893)
@@ -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
===================================================================
diff -u -r01349ae55aa04376236920a2314eda93d93d5f6d -r6d0ec5db1add705fb9da59656aaa4916e1163893
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java	(.../SequenceActivity.java)	(revision 01349ae55aa04376236920a2314eda93d93d5f6d)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java	(.../SequenceActivity.java)	(revision 6d0ec5db1add705fb9da59656aaa4916e1163893)
@@ -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
===================================================================
diff -u -r09048f91f2dcbb6b63449f3c1fb9e1a09221a35e -r6d0ec5db1add705fb9da59656aaa4916e1163893
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/SimpleActivity.java	(.../SimpleActivity.java)	(revision 09048f91f2dcbb6b63449f3c1fb9e1a09221a35e)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/SimpleActivity.java	(.../SimpleActivity.java)	(revision 6d0ec5db1add705fb9da59656aaa4916e1163893)
@@ -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
===================================================================
diff -u -r309a597eada52a4079f2985e0d97beedf9adda42 -r6d0ec5db1add705fb9da59656aaa4916e1163893
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/SynchGateActivity.java	(.../SynchGateActivity.java)	(revision 309a597eada52a4079f2985e0d97beedf9adda42)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/SynchGateActivity.java	(.../SynchGateActivity.java)	(revision 6d0ec5db1add705fb9da59656aaa4916e1163893)
@@ -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
===================================================================
diff -u -r309a597eada52a4079f2985e0d97beedf9adda42 -r6d0ec5db1add705fb9da59656aaa4916e1163893
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/SystemGateActivity.java	(.../SystemGateActivity.java)	(revision 309a597eada52a4079f2985e0d97beedf9adda42)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/SystemGateActivity.java	(.../SystemGateActivity.java)	(revision 6d0ec5db1add705fb9da59656aaa4916e1163893)
@@ -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
===================================================================
diff -u -r309a597eada52a4079f2985e0d97beedf9adda42 -r6d0ec5db1add705fb9da59656aaa4916e1163893
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java	(.../ToolActivity.java)	(revision 309a597eada52a4079f2985e0d97beedf9adda42)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java	(.../ToolActivity.java)	(revision 6d0ec5db1add705fb9da59656aaa4916e1163893)
@@ -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
===================================================================
diff -u -r21c2c5458bc48ec75db4e917444cca70448b4dea -r6d0ec5db1add705fb9da59656aaa4916e1163893
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolBranchingActivity.java	(.../ToolBranchingActivity.java)	(revision 21c2c5458bc48ec75db4e917444cca70448b4dea)
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolBranchingActivity.java	(.../ToolBranchingActivity.java)	(revision 6d0ec5db1add705fb9da59656aaa4916e1163893)
@@ -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 */