Index: lams_central/web/lams_authoring.swf
===================================================================
diff -u -rbc0cb5fdeb5ca1b0096d9878301b8ba7327661ab -r7bdba8e8a266408f4e6f807f366c76ed91c570f4
Binary files differ
Index: lams_central/web/lams_authoring_library.swf
===================================================================
diff -u -rbc0cb5fdeb5ca1b0096d9878301b8ba7327661ab -r7bdba8e8a266408f4e6f807f366c76ed91c570f4
Binary files differ
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
===================================================================
diff -u -rbc0cb5fdeb5ca1b0096d9878301b8ba7327661ab -r7bdba8e8a266408f4e6f807f366c76ed91c570f4
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	(.../CanvasBranchView.as)	(revision bc0cb5fdeb5ca1b0096d9878301b8ba7327661ab)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	(.../CanvasBranchView.as)	(revision 7bdba8e8a266408f4e6f807f366c76ed91c570f4)
@@ -48,7 +48,7 @@
     
 	private var _cm:CanvasModel;
     private var _canvasBranchView:CanvasBranchView;
-	private var _canvasBranchingActivity:CanvasBranchingActivity;
+	private var _canvasBranchingActivity:CanvasActivity;
 	
 	private var startTransX:Number;
 	private var startTransY:Number;
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as
===================================================================
diff -u -r979518a0ef7152e3de292b985b041385de5501c2 -r7bdba8e8a266408f4e6f807f366c76ed91c570f4
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as	(.../CanvasActivity.as)	(revision 979518a0ef7152e3de292b985b041385de5501c2)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as	(.../CanvasActivity.as)	(revision 7bdba8e8a266408f4e6f807f366c76ed91c570f4)
@@ -107,6 +107,8 @@
 	private var bgNegative:String = "original";
 	private var authorMenu:ContextMenu;
 	
+	private var _branchView:CanvasBranchView;
+	
 	function CanvasActivity(_connector){
 		_tm = ThemeManager.getInstance();
 		_ccm = CustomContextMenu.getInstance();
@@ -620,6 +622,19 @@
 		}
 		
     }
+	
+	private function destroy() {
+		branchView.removeMovieClip();
+	}
+	
+	public function get branchView():CanvasBranchView {
+		return _branchView;
+	}
+	
+	public function set branchView(a:CanvasBranchView):Void {
+		_branchView = a;
+	}
+	
     
 
 }
\ No newline at end of file
Fisheye: Tag 7bdba8e8a266408f4e6f807f366c76ed91c570f4 refers to a dead (removed) revision in file `lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasBranchingActivity.as'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
===================================================================
diff -u -rbc0cb5fdeb5ca1b0096d9878301b8ba7327661ab -r7bdba8e8a266408f4e6f807f366c76ed91c570f4
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision bc0cb5fdeb5ca1b0096d9878301b8ba7327661ab)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(.../CanvasController.as)	(revision 7bdba8e8a266408f4e6f807f366c76ed91c570f4)
@@ -578,10 +578,6 @@
 				Debugger.log("Casting to CanvasOptionalActivity", Debugger.GEN,'createValidTransitionTarget','CanvasController');
 				targetCA = CanvasOptionalActivity(transitionTargetObj);
 				return (isValidTransitionTarget(targetCA) || isInitTarget) ? targetCA : new LFError();
-			}else if(CanvasBranchingActivity(transitionTargetObj)!=null){
-				Debugger.log("Casting to CanvasBranchingActivity", Debugger.GEN,'createValidTransitionTarget','CanvasController');
-				targetCA = CanvasBranchingActivity(transitionTargetObj);
-				return (isValidTransitionTarget(targetCA) || isInitTarget) ? targetCA : new LFError();
 			}
 	}
 	
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
===================================================================
diff -u -rbc0cb5fdeb5ca1b0096d9878301b8ba7327661ab -r7bdba8e8a266408f4e6f807f366c76ed91c570f4
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision bc0cb5fdeb5ca1b0096d9878301b8ba7327661ab)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision 7bdba8e8a266408f4e6f807f366c76ed91c570f4)
@@ -253,7 +253,7 @@
 		Debugger.log("Locking all Complex Activities", Debugger.GEN, "lockAllComplexActivities", "CanvasModel");
 		var k:Array = _activitiesDisplayed.values();
 		for (var i=0; i<k.length; i++){
-			if (k[i].activity.activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE || k[i].activity.activityTypeID == Activity.PARALLEL_ACTIVITY_TYPE || k[i].activity.isBranchingActivity()){
+			if (k[i].activity.activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE || k[i].activity.activityTypeID == Activity.PARALLEL_ACTIVITY_TYPE){
 				k[i].locked = true;
 			}
 		}
@@ -264,7 +264,7 @@
 		Debugger.log("Unlocking all Complex Activities", Debugger.GEN, "unlockAllComplexActivities", "CanvasModel");
 		var k:Array = _activitiesDisplayed.values();
 		for (var i=0; i<k.length; i++){
-			if (k[i].activity.activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE || k[i].activity.activityTypeID == Activity.PARALLEL_ACTIVITY_TYPE || k[i].activity.isBranchingActivity()){
+			if (k[i].activity.activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE || k[i].activity.activityTypeID == Activity.PARALLEL_ACTIVITY_TYPE){
 				k[i].locked = (k[i].activity.readOnly) ? true : false;
 			}
 		}
@@ -603,7 +603,7 @@
 	public function addActivityToConnection(ca:Object):Object{
 		var activity:Activity;
 		//check we have not added too many
-		if(ca instanceof CanvasActivity || ca instanceof CanvasParallelActivity || ca instanceof CanvasOptionalActivity || ca instanceof CanvasBranchingActivity){
+		if(ca instanceof CanvasActivity || ca instanceof CanvasParallelActivity || ca instanceof CanvasOptionalActivity){
 			activity = ca.activity;
 		} else if(ca instanceof Activity){
 			activity = Activity(ca);
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as
===================================================================
diff -u -rbc0cb5fdeb5ca1b0096d9878301b8ba7327661ab -r7bdba8e8a266408f4e6f807f366c76ed91c570f4
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as	(.../CanvasView.as)	(revision bc0cb5fdeb5ca1b0096d9878301b8ba7327661ab)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as	(.../CanvasView.as)	(revision 7bdba8e8a266408f4e6f807f366c76ed91c570f4)
@@ -295,7 +295,7 @@
 		}
 		else if(a.isBranchingActivity()){	
 			var newActivity_mc = activityLayer.createChildAtDepth("CanvasActivity",DepthManager.kTop,{_activity:a,_canvasController:cvc,_canvasView:cvv});
-			cm.activitiesDisplayed.put(a.activityUIID,newActivity_mc);
+			cm.activitiesDisplayed.put(a.activityUIID, newActivity_mc);
 			Debugger.log('Branching activity Type a.title:'+a.title+','+a.activityUIID+' added to the cm.activitiesDisplayed hashtable :'+newActivity_mc,4,'drawActivity','CanvasView');
 	
 		}else{
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as
===================================================================
diff -u -rbc0cb5fdeb5ca1b0096d9878301b8ba7327661ab -r7bdba8e8a266408f4e6f807f366c76ed91c570f4
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	(.../PropertyInspector.as)	(revision bc0cb5fdeb5ca1b0096d9878301b8ba7327661ab)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	(.../PropertyInspector.as)	(revision 7bdba8e8a266408f4e6f807f366c76ed91c570f4)
@@ -342,19 +342,16 @@
 	 */
 	public function viewUpdate(event:Object):Void{
 		Debugger.log('Recived an Event dispather UPDATE!, updateType:'+event.updateType+', target'+event.target,4,'viewUpdate','PropertyInspector');
-		 //Update view from info object
+		//Update view from info object
       
-       var cm:CanvasModel = event.target;
+        var cm:CanvasModel = event.target;
 	   
-	   switch (event.updateType){
+	    switch (event.updateType){
             case 'SELECTED_ITEM' :
                 updateItemProperties(cm);
-
                 break;
                    
-				
             default :
-                //Debugger.log('unknown update type :' + event.updateType,Debugger.CRITICAL,'update','org.lamsfoundation.lams.CanvasView');
 		}
 
 	}
@@ -369,6 +366,7 @@
 	 */
 	private function updateItemProperties(cm:CanvasModel):Void{
 		//try to cast the selected item to see what we have (instance of des not seem to work)
+			
 		if(CanvasActivity(cm.selectedItem) != null){
 			cover_pnl.visible = false;
 			
@@ -386,6 +384,7 @@
 				showToolActivityControls(false);
 				showGeneralInfo(false);
 				showOptionalControls(false);
+				showBranchingControls(false);
 				showGateControls(true, !a.readOnly);
 				showAppliedGroupingControls(false);
 				checkEnableGateControls();
@@ -394,11 +393,31 @@
 				
 				showGeneralControls(true, !a.readOnly);
 				
+			} else if(a.isBranchingActivity()) {
+				var ba:BranchingActivity = BranchingActivity(ca.activity);
+				
+				cover_pnl.visible = false;
+				delimitLine._visible = true;
+				
+				showBranchingControls(true, !ba.readOnly);
+				showGeneralControls(true, !ba.readOnly);
+					
+				showOptionalControls(false);
+				showGeneralInfo(false);
+				showToolActivityControls(false);
+				showGateControls(false);
+				showAppliedGroupingControls(false);
+				
+				showBranchingActivityProperties(ba);
+				showAppliedGroupingProperties(ba);
+					
 			} else if(a.isGroupActivity()) {
+			
 			
 				showGroupingControls(true, !a.readOnly);
 				showGeneralControls(true, !a.readOnly);
 				showOptionalControls(false);
+				showBranchingControls(false);
 				showGeneralInfo(false);
 				showRelevantGroupOptions();
 				showToolActivityControls(false);
@@ -413,6 +432,7 @@
 				showGroupingControls(false);
 				showToolActivityControls(false);
 				showGateControls(false);
+				showBranchingControls(false);
 				showGeneralInfo(false);
 				showAppliedGroupingControls(false);
 				showOptionalControls(true, !a.readOnly);
@@ -426,6 +446,7 @@
 				showGeneralControls(true, !a.readOnly);
 				showGeneralInfo(false);
 				showGroupingControls(false);
+				showBranchingControls(false);
 				showToolActivityControls(false);
 				showGateControls(false);
 				showAppliedGroupingControls(true, !a.readOnly);
@@ -437,6 +458,7 @@
 				showOptionalControls(false);
 				showGeneralControls(true, !a.readOnly);
 				showGroupingControls(false);
+				showBranchingControls(false);
 				showGeneralInfo(false);
 				showAppliedGroupingControls(true, !a.readOnly);
 				showToolActivityControls(true, !a.readOnly);
@@ -450,28 +472,6 @@
 			title_txt.text = StringUtils.cleanNull(a.title);
 			desc_txt.text = StringUtils.cleanNull(a.description);
 			
-		} else if(CanvasBranchingActivity(cm.selectedItem) != null) {
-			var cb = CanvasBranchingActivity(cm.selectedItem);
-			var ba:BranchingActivity = BranchingActivity(cb.activity);
-			
-			cover_pnl.visible = false;
-			delimitLine._visible = true;
-			
-			showBranchingControls(true, !ba.readOnly);
-			showGeneralControls(true, !ba.readOnly);
-				
-			showOptionalControls(false);
-			showGeneralInfo(false);
-			showToolActivityControls(false);
-			showGateControls(false);
-			showAppliedGroupingControls(false);
-			
-			showBranchingActivityProperties(ba);
-			showAppliedGroupingProperties(ba);
-				
-			title_txt.text = StringUtils.cleanNull(ba.title);
-			desc_txt.text = StringUtils.cleanNull(ba.description);
-			
 		} else if(CanvasOptionalActivity(cm.selectedItem) != null){
 			var co = CanvasOptionalActivity(cm.selectedItem);
 			var cca:ComplexActivity = ComplexActivity(co.activity);
@@ -481,6 +481,7 @@
 				
 			showGeneralControls(true, !co.activity.readOnly);
 			showGroupingControls(false);
+			showBranchingControls(false);
 			showToolActivityControls(false);
 			showGateControls(false);
 			showGeneralInfo(false);
@@ -504,6 +505,7 @@
 			showGeneralControls(true, !co.activity.readOnly);
 			showGeneralInfo(false);
 			showGroupingControls(false);
+			showBranchingControls(false);
 			
 			showToolActivityControls(false);
 			showGateControls(false);
@@ -528,6 +530,7 @@
 			showGeneralControls(false);
 			showOptionalControls(false);
 			showGroupingControls(false);
+			showBranchingControls(false);
 			showToolActivityControls(false);
 			showGateControls(false);
 			showAppliedGroupingControls(false);
@@ -540,6 +543,7 @@
 			
 			showGeneralInfo(true);
 			showGroupingControls(false);
+			showBranchingControls(false);
 			showGeneralControls(false);
 			showOptionalControls(false);
 			showRelevantGroupOptions();