Index: lams_flex/LamsAuthor/.actionScriptProperties
===================================================================
diff -u -rd8dfc7bb7a4c77a846cfcd2cb0bc71d500df0af3 -rb18306871e780d0266af4b3135c37780f09d2b72
--- lams_flex/LamsAuthor/.actionScriptProperties	(.../.actionScriptProperties)	(revision d8dfc7bb7a4c77a846cfcd2cb0bc71d500df0af3)
+++ lams_flex/LamsAuthor/.actionScriptProperties	(.../.actionScriptProperties)	(revision b18306871e780d0266af4b3135c37780f09d2b72)
@@ -1,19 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<actionScriptProperties mainApplicationPath="LamsAuthor.mxml" version="3">
-<compiler additionalCompilerArguments="-locale en_US" copyDependentFiles="true" enableModuleDebug="true" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="true" htmlHistoryManagement="true" htmlPlayerVersion="9.0.124" htmlPlayerVersionCheck="true" outputFolderPath="bin-debug" sourceFolderPath="src" strict="true" useApolloConfig="false" verifyDigests="true" warn="true">
-<compilerSourcePath/>
-<libraryPath defaultLinkType="1">
-<libraryPathEntry kind="4" path=""/>
-<libraryPathEntry kind="1" linkType="1" path="libs"/>
-<libraryPathEntry kind="3" linkType="1" path="/LamsFlexCommon/libs/Mate_08_7.swc" useDefaultLinkType="false"/>
-<libraryPathEntry kind="3" linkType="1" path="/LamsFlexCommon/bin/LamsFlexCommon.swc" useDefaultLinkType="false"/>
-<libraryPathEntry kind="3" linkType="1" path="/LamsFlexCommon/libs/flexlib.swc" useDefaultLinkType="false"/>
-</libraryPath>
-<sourceAttachmentPath/>
-</compiler>
-<applications>
-<application path="LamsAuthor.mxml"/>
-</applications>
-<modules/>
-<buildCSSFiles/>
-</actionScriptProperties>
+<?xml version="1.0" encoding="UTF-8"?>
+<actionScriptProperties mainApplicationPath="LamsAuthor.mxml" version="3">
+<compiler additionalCompilerArguments="-locale en_US" copyDependentFiles="true" enableModuleDebug="true" flexSDK="Flex 3.5" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="true" htmlHistoryManagement="true" htmlPlayerVersion="9.0.124" htmlPlayerVersionCheck="true" outputFolderPath="bin-debug" sourceFolderPath="src" strict="true" useApolloConfig="false" verifyDigests="true" warn="true">
+<compilerSourcePath/>
+<libraryPath defaultLinkType="1">
+<libraryPathEntry kind="4" path="">
+<modifiedEntries>
+<libraryPathEntry kind="3" linkType="4" path="${PROJECT_FRAMEWORKS}/libs/framework.swc" useDefaultLinkType="true">
+<crossDomainRsls>
+<crossDomainRslEntry autoExtract="true" policyFileUrl="" rslUrl="framework_3.1.0.2710.swz"/>
+<crossDomainRslEntry autoExtract="true" policyFileUrl="" rslUrl="framework_3.1.0.2710.swf"/>
+</crossDomainRsls>
+</libraryPathEntry>
+</modifiedEntries>
+</libraryPathEntry>
+<libraryPathEntry kind="1" linkType="1" path="libs"/>
+<libraryPathEntry kind="3" linkType="1" path="/LamsFlexCommon/libs/Mate_08_7.swc" useDefaultLinkType="false"/>
+<libraryPathEntry kind="3" linkType="1" path="/LamsFlexCommon/bin/LamsFlexCommon.swc" useDefaultLinkType="false"/>
+<libraryPathEntry kind="3" linkType="1" path="/LamsFlexCommon/libs/flexlib.swc" useDefaultLinkType="false"/>
+</libraryPath>
+<sourceAttachmentPath/>
+</compiler>
+<applications>
+<application path="LamsAuthor.mxml"/>
+</applications>
+<modules/>
+<buildCSSFiles/>
+</actionScriptProperties>
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasBox.mxml
===================================================================
diff -u -r2ceaea37dd2a14f76d28626f47274d188a4863f7 -rb18306871e780d0266af4b3135c37780f09d2b72
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasBox.mxml	(.../CanvasBox.mxml)	(revision 2ceaea37dd2a14f76d28626f47274d188a4863f7)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/CanvasBox.mxml	(.../CanvasBox.mxml)	(revision b18306871e780d0266af4b3135c37780f09d2b72)
@@ -11,6 +11,7 @@
 	
 	<mx:Script>
 		<![CDATA[
+			import org.lamsfoundation.lams.author.events.DropActivityEvent;
 			import org.lamsfoundation.lams.author.components.toolbar.SystemActivityComponent;
 			import mx.containers.Canvas;
 			import org.lamsfoundation.lams.author.util.Constants;
@@ -45,7 +46,12 @@
             // "dropping" it in its new location.
             private function dragDropHandler(event:DragEvent):void {
                 
-                if (event.dragInitiator is ActivityComponent) {
+                
+                var dropActivityEvent:DropActivityEvent = new DropActivityEvent(DropActivityEvent.DROP_ACTIVITY_EVENT, event);
+                
+                Application.application.dispatchEvent(dropActivityEvent);
+                
+                /*  if (event.dragInitiator is ActivityComponent) {
                 	var activityComponent:ActivityComponent;
                 	activityComponent = event.dragInitiator as ActivityComponent;
                 	activityComponent.x = UIComponent(event.currentTarget).mouseX;
@@ -87,7 +93,7 @@
                 }
                 
                 // Return cursor state to normal
-				Application.application.changeCursorState(Constants.CURSOR_STATE_NORMAL);                    
+				Application.application.changeCursorState(Constants.CURSOR_STATE_NORMAL);  */                    
             }
 			
 			public function doZoom(isOut:Boolean):void
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml
===================================================================
diff -u -r2ceaea37dd2a14f76d28626f47274d188a4863f7 -rb18306871e780d0266af4b3135c37780f09d2b72
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml	(.../ActivityComponent.mxml)	(revision 2ceaea37dd2a14f76d28626f47274d188a4863f7)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml	(.../ActivityComponent.mxml)	(revision b18306871e780d0266af4b3135c37780f09d2b72)
@@ -28,16 +28,15 @@
 			public var centerX:int;
 			public var centerY:int;
 			
-			private var transitionIn:TransitionComponent
-			private var transitionOut:TransitionComponent;
+			public var transitionIn:TransitionComponent
+			public var transitionOut:TransitionComponent;
 			
 			// Activity states
 			public var isDragable:Boolean = true;
-			public var isTransitionable:Boolean = true;
+			public var canStartTransitions:Boolean = true;  	// True if this activty can start transitions
+			public var canAcceptTransitions:Boolean = true;		// True if this activty can accept transitions
+			public var state:int = Constants.ACTIVITY_STATE_NORMAL;
 			
-			
-			private var state:int = Constants.ACTIVITY_STATE_NORMAL;
-			
 			// Function used to load a new activity 
 			public function load():void { 	
 		    }
@@ -72,13 +71,8 @@
 		    	
 		    	switch (Application.application.cursorState) {
 		    		case Constants.CURSOR_STATE_TRANSITION:
-			    		if (this.isTransitionable) {
-			    			var transitionEvent:TransitionEvent = new TransitionEvent(TransitionEvent.TRANSITION_EVENT);
-				    		transitionEvent.sourceAcivityComponent = this;
-				    		transitionEvent.localX = event.localX;
-				    		transitionEvent.localY = event.localY;
-				    		//Application.application.dispatchEvent(transitionEvent);
-			    			startDragging(transitionEvent);
+			    		if (this.canStartTransitions) {
+			    			startDragging(event);
 			    		}
 			    		
 		    			break;	
@@ -91,7 +85,7 @@
 				centerY = y + height/2 -10;
 		    }
 		    
-	        protected function startDragging(event:TransitionEvent):void {
+	        protected function startDragging(event:MouseEvent):void {
 			 
 				if (transitionOut != null) {
 					parent.removeChild(transitionOut);
@@ -103,10 +97,10 @@
 
 				Application.application.uiState = Constants.UI_STATE_DRAWING;
 				transitionOut = new TransitionComponent();
-				transitionOut.startX = event.sourceAcivityComponent.centerX;
-				transitionOut.startY = event.sourceAcivityComponent.centerY;
-				transitionOut.endX = event.sourceAcivityComponent.centerX;
-				transitionOut.endY = event.sourceAcivityComponent.centerY;
+				transitionOut.startX = centerX;
+				transitionOut.startY = centerY;
+				transitionOut.endX = centerX;
+				transitionOut.endY = centerY;
 				transitionOut.invalidateProperties();
 				
 				parent.addChild(transitionOut);
@@ -123,8 +117,6 @@
 			    systemManager.removeEventListener(MouseEvent.MOUSE_MOVE, systemManagerMouseMoveHandler, true);			
 			    systemManager.removeEventListener(MouseEvent.MOUSE_UP, systemManagerMouseUpHandler, true);
 			    systemManager.stage.removeEventListener(Event.MOUSE_LEAVE, stageMouseLeaveHandler);
-			    
-				updateTransitionPositions();
 			}
 			
 			private function systemManagerMouseMoveHandler(event:MouseEvent):void
@@ -138,17 +130,33 @@
 		    	transitionOut.invalidateDisplayList();
 		    }
 		    
+		   
+		    /**
+		    * This event fires at the end of a transition.
+		    * 
+		    * Needs to be handled by the controller as it changes the learningDesing state
+		    * 
+		    */ 
 		    private function systemManagerMouseUpHandler(event:MouseEvent):void
 		    {
 		    	stopDragging();
 		    	
-		    	var validTransition:Boolean = false;
+		    	
+		    	var transitionEvent:TransitionEvent = new TransitionEvent(TransitionEvent.TRANSITION_EVENT);
+	    		transitionEvent.sourceAcivityComponent = this;
+	    		transitionEvent.transition = transitionOut;
+	    		//transitionEvent.localX = event.localX;
+	    		//transitionEvent.localY = event.localY;
+	    		Application.application.dispatchEvent(transitionEvent);
+		    	
+		    	
+		    	/* var validTransition:Boolean = false;
 		    	for (var i:int = 0; i < parent.numChildren; i++) {
 		    		
 		    		if (parent.getChildAt(i) is ActivityComponent) {
 		    			
 		    			var activityComponent:ActivityComponent = parent.getChildAt(i) as ActivityComponent;
-		    			if (activityComponent.state == Constants.ACTIVITY_STATE_MOUSE_OVER && activityComponent.isTransitionable) {
+		    			if (activityComponent.state == Constants.ACTIVITY_STATE_MOUSE_OVER && activityComponent.canAcceptTransitions) {
 		    				activityComponent.transitionIn = transitionOut;	
 		    				validTransition = true;		
 		    			}
@@ -165,8 +173,8 @@
 		    	else {
 		    		// Return cursor state to normal
 					Application.application.changeCursorState(Constants.CURSOR_STATE_NORMAL);
-
-		    	}
+					updateTransitionPositions();
+		    	} */
 		    	
 		    }
 		    
@@ -177,7 +185,7 @@
 		    
 		    private function mouseOver(event:MouseEvent):void {
 				
-				if (Application.application.uiState == Constants.UI_STATE_DRAWING && this.state != Constants.ACTIVITY_STATE_DRAWING && isTransitionable) {
+				if (Application.application.uiState == Constants.UI_STATE_DRAWING && this.state != Constants.ACTIVITY_STATE_DRAWING && canAcceptTransitions) {
 					this.setStyle('borderStyle', 'solid');
 					this.setStyle('borderColor', '#66CCFF');
 					this.state = Constants.ACTIVITY_STATE_MOUSE_OVER;
@@ -190,6 +198,7 @@
 			}
 			
 			public function updateTransitionPositions():void {
+				this.setCenter();
 				if (transitionOut != null)
 		   		{
 		   			transitionOut.startX = centerX;
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/CombinedActivityComponent.mxml
===================================================================
diff -u -r2ceaea37dd2a14f76d28626f47274d188a4863f7 -rb18306871e780d0266af4b3135c37780f09d2b72
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/CombinedActivityComponent.mxml	(.../CombinedActivityComponent.mxml)	(revision 2ceaea37dd2a14f76d28626f47274d188a4863f7)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/CombinedActivityComponent.mxml	(.../CombinedActivityComponent.mxml)	(revision b18306871e780d0266af4b3135c37780f09d2b72)
@@ -43,7 +43,8 @@
 					toolActivityComponent1.tool = learningLibraryEntry.toolTemplates[1];
 					toolActivityComponent1.load();
 					toolActivityComponent1.isDragable = false;
-					toolActivityComponent1.isTransitionable = false;
+					toolActivityComponent1.canStartTransitions = false;
+					toolActivityComponent1.canAcceptTransitions = false;
 					toolActivityComponent1.disableTitle()
 					vbox.addChild(toolActivityComponent1);
 				}
@@ -53,7 +54,8 @@
 					toolActivityComponent2.tool = learningLibraryEntry.toolTemplates[2];
 					toolActivityComponent2.load();
 					toolActivityComponent2.isDragable = false;
-					toolActivityComponent2.isTransitionable = false;
+					toolActivityComponent2.canStartTransitions = false;
+					toolActivityComponent2.canAcceptTransitions = false;
 					toolActivityComponent2.disableTitle()
 					vbox.addChild(toolActivityComponent2);
 				}
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/OptionalActivityComponent.mxml
===================================================================
diff -u -r2ceaea37dd2a14f76d28626f47274d188a4863f7 -rb18306871e780d0266af4b3135c37780f09d2b72
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/OptionalActivityComponent.mxml	(.../OptionalActivityComponent.mxml)	(revision 2ceaea37dd2a14f76d28626f47274d188a4863f7)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/OptionalActivityComponent.mxml	(.../OptionalActivityComponent.mxml)	(revision b18306871e780d0266af4b3135c37780f09d2b72)
@@ -36,7 +36,8 @@
                 if (event.dragInitiator is ActivityComponent) {
                 	var activityComponent:ActivityComponent;
                 	activityComponent = event.dragInitiator as ActivityComponent;
-                	activityComponent.isTransitionable = false;
+                	activityComponent.canStartTransitions = false;
+                	activityComponent.canAcceptTransitions = false;
                 	activityComponent.disableTitle();
                 	//parent.removeChild(activityComponent);
                 	optionalArea.addChild(activityComponent);
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/controller/AuthorController.as
===================================================================
diff -u -raf5f3cc7b21dbdc9b69d6df126409c75f4e64633 -rb18306871e780d0266af4b3135c37780f09d2b72
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/controller/AuthorController.as	(.../AuthorController.as)	(revision af5f3cc7b21dbdc9b69d6df126409c75f4e64633)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/controller/AuthorController.as	(.../AuthorController.as)	(revision b18306871e780d0266af4b3135c37780f09d2b72)
@@ -1,12 +1,20 @@
 package org.lamsfoundation.lams.author.controller
 {
+	import flash.geom.Point;
 	import flash.utils.Dictionary;
 	
 	import mx.collections.ArrayCollection;
 	import mx.core.Application;
+	import mx.core.UIComponent;
+	import mx.events.DragEvent;
 	
+	import org.lamsfoundation.lams.author.components.CanvasBox;
+	import org.lamsfoundation.lams.author.components.LearningLibraryEntryComponent;
+	import org.lamsfoundation.lams.author.components.activity.*;
+	import org.lamsfoundation.lams.author.components.toolbar.SystemActivityComponent;
 	import org.lamsfoundation.lams.author.events.TransitionEvent;
 	import org.lamsfoundation.lams.author.model.learninglibrary.LearningLibraryEntry;
+	import org.lamsfoundation.lams.author.util.Constants;
 	
 	public class AuthorController
 	{
@@ -16,6 +24,15 @@
 		}
 		
 		
+		/**
+		 * Sets the learningLibrary object on startup.
+		 * 
+		 * Cannot use mate dependency injection here as it does after the creationComplete.
+		 * Ie the LearningLibraryComponent doesnt have a (non-user) event that would fire after
+		 * the learningLibrary data had been populated
+		 * 
+		 * @param learningLibraryIn
+		 */
 		public function setLearningLibrary(learningLibraryIn:ArrayCollection):void {
 			
 			var learningLibrary:Dictionary = new Dictionary();
@@ -34,11 +51,134 @@
 			
 		}
 		
-		public function startTransitionDraw(event:TransitionEvent):void {
-			var x:int = 0;
-			var y:int = 1;
+		/**
+		 * The drop activity function is fired when the user drops an activity directly into the canvas
+		 * ie not inside a complex activity like optional. The event is fired by the CanvasBox
+		 * 
+		 * @param event The drag event fired when the activity is dropped on the canvas
+		 */
+		public function dropActivity(event:DragEvent):void {
+			var canvasBox:CanvasBox = Application.application.canvasArea.canvasBox;
+			
+			// Get the current mouse point, and convert it to co-ordinates in CanvasBox
+			var currentMousePoint:Point = new Point(UIComponent(event.currentTarget).mouseX, UIComponent(event.currentTarget).mouseY);
+			currentMousePoint = canvasBox.globalToLocal(currentMousePoint);
+			
+			if (event.dragInitiator is ActivityComponent) {
+            	var activityComponent:ActivityComponent;
+            	activityComponent = event.dragInitiator as ActivityComponent;
+            	activityComponent.x = currentMousePoint.x;
+          		activityComponent.y = currentMousePoint.y;
+          		activityComponent.setCenter();
+          		activityComponent.updateTransitionPositions();
+            } else if (event.dragInitiator is LearningLibraryEntryComponent) {
+            	var learningLibraryComponent:LearningLibraryEntryComponent = event.dragInitiator as LearningLibraryEntryComponent;
+            	
+            	if (learningLibraryComponent.learningLibraryEntry.isCombined) {
+            		var combinedActivityComponent:CombinedActivityComponent = new CombinedActivityComponent();
+                	combinedActivityComponent.learningLibraryEntry = learningLibraryComponent.learningLibraryEntry;
+                	combinedActivityComponent.load()
+					combinedActivityComponent.x = currentMousePoint.x;
+              		combinedActivityComponent.y = currentMousePoint.y
+                	canvasBox.addChild(combinedActivityComponent);
+                	combinedActivityComponent.setCenter();
+            	} else {
+            		var toolActivityComponent:ToolActivityComponent = new ToolActivityComponent();
+                	toolActivityComponent.tool = learningLibraryComponent.learningLibraryEntry.toolTemplates[0];
+                	toolActivityComponent.load()
+					toolActivityComponent.x = currentMousePoint.x;
+              		toolActivityComponent.y = currentMousePoint.y;
+                	canvasBox.addChild(toolActivityComponent);
+                	toolActivityComponent.setCenter();
+            	}
+            } else if (event.dragInitiator is SystemActivityComponent) {
+            	var systemActivityComponent:SystemActivityComponent = event.dragInitiator as SystemActivityComponent;
+            	
+            	switch (systemActivityComponent.type) {
+            		case Constants.SYTEM_ACTIVITY_TYPE_OPTIONAL:
+            			var optionalActivityComponent:OptionalActivityComponent = new OptionalActivityComponent();
+	                	optionalActivityComponent.x = currentMousePoint.x;
+		              	optionalActivityComponent.y = currentMousePoint.y;
+		              	canvasBox.addChild(optionalActivityComponent);
+	                	optionalActivityComponent.setCenter();
+            			break;
+            	}
+            }
+                
+            // Return cursor state to normal
+			Application.application.changeCursorState(Constants.CURSOR_STATE_NORMAL);  
 		}
 		
 		
+		/**
+		 * Handles transitions.
+		 * 
+		 * This is fired when a transition is finished.. 
+		 * ie after the user's mouse button goes up when drawing an activity.
+		 * 
+		 * First - find the activity (if any) that the transition landed on.
+		 * Second - Validate the transition against the learning design
+		 * Third - If valid, update the two activities involded and the learning design.
+		 * 
+		 * @param event The transition event fired by the source activity
+		 */ 
+		public function drawTransition(event:TransitionEvent):void {
+			
+			var canvasBox:CanvasBox = Application.application.canvasArea.canvasBox;
+			var validTransition:Boolean = false;
+			for (var i:int = 0; i < canvasBox.numChildren; i++) {
+		    		
+	    		if (canvasBox.getChildAt(i) is ActivityComponent) {
+	    			
+	    			var activityComponent:ActivityComponent = canvasBox.getChildAt(i) as ActivityComponent;
+	    			if (activityComponent.state == Constants.ACTIVITY_STATE_MOUSE_OVER && activityComponent.canAcceptTransitions) {
+	    				activityComponent.transitionIn = event.transition;	
+	    				event.sourceAcivityComponent.transitionOut = event.transition;
+	    				validTransition = true;		
+	    				
+	    				// Return cursor state to normal
+						Application.application.changeCursorState(Constants.CURSOR_STATE_NORMAL);
+						activityComponent.updateTransitionPositions();
+						event.sourceAcivityComponent.updateTransitionPositions();
+	    				break;
+	    			}
+	    		}
+	    	}
+	    	
+	    	if (!validTransition) {
+	    		event.transition.graphics.clear();
+	    		canvasBox.removeChild(event.transition);
+	    		event.sourceAcivityComponent.transitionOut = null;
+	    	}
+		}
+		
+		/**
+		 * 
+		 * Validates a transition against the learning design
+		 *  
+		 * @param event The TransitionEvent fired by the source acitivity
+		 * @param destActivity The activity at the end of the transition
+		 * @return "valid" if valid, otherwise the translated error message.
+		 * 
+		 */
+		public function validateTransition(event:TransitionEvent, destActivity:ActivityComponent):String {
+			var canvasBox:CanvasBox = Application.application.canvasArea.canvasBox;
+			
+			
+			// Go through learning design and check if there is a transition circuit, or a branching error.
+			for each (var activity:UIComponent in canvasBox.getChildren()) {
+				if (activity is ActivityComponent) {
+					
+				}
+			}
+			
+			return "valid";
+		}
+		
+		
+		
+		
+		
+		
 	}
 }
\ No newline at end of file
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/events/DropActivityEvent.as
===================================================================
diff -u
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/events/DropActivityEvent.as	(revision 0)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/events/DropActivityEvent.as	(revision b18306871e780d0266af4b3135c37780f09d2b72)
@@ -0,0 +1,20 @@
+package org.lamsfoundation.lams.author.events
+{
+	import mx.events.DragEvent;
+	
+	public class DropActivityEvent extends DragEvent
+	{
+		public static const DROP_ACTIVITY_EVENT:String = "dropActivityEvent";
+		
+		public function DropActivityEvent(type:String, event:DragEvent, bubbles:Boolean=true, cancelable:Boolean=false)
+		{
+			super(type, bubbles, cancelable);
+			this.dragInitiator = event.dragInitiator;
+			this.dragSource = event.dragSource;
+			this.action = event.action;
+			this.ctrlKey = event.ctrlKey;
+			this.altKey = event.altKey;
+			this.shiftKey = event.shiftKey;
+		}
+	}
+}
\ No newline at end of file
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/events/DropEvent.as
===================================================================
diff -u -re11155f5e0c1a923e08fcd2ce2f57873bc1c6904 -rb18306871e780d0266af4b3135c37780f09d2b72
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/events/DropEvent.as	(.../DropEvent.as)	(revision e11155f5e0c1a923e08fcd2ce2f57873bc1c6904)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/events/DropEvent.as	(.../DropEvent.as)	(revision b18306871e780d0266af4b3135c37780f09d2b72)
@@ -1,12 +1,22 @@
 package org.lamsfoundation.lams.author.events
 {
+	import flash.events.Event;
+	
 	public class DropEvent extends DragEvent
 	{
 		public static const DROP_EVENT:String = "dropEvent";
 		
-		public function DropEvent(type:String, bubbles:Boolean=true, cancelable:Boolean=false)
+		
+		public function DropEvent(type:String, event:DrageEvent, bubbles:Boolean=true, cancelable:Boolean=false)
 		{
 			super(type, bubbles, cancelable);
+			
+			this.dragInitiator = event.dragInitiator;
+			this.dragSource = event.dragSource;
+			this.action = event.action;
+			this.ctrlKey = event.ctrlKey;
+			this.altKey = event.altKey;
+			this.shiftKey = event.shiftKey;
 		}
 	}
 }
\ No newline at end of file
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/events/TransitionEvent.as
===================================================================
diff -u -re11155f5e0c1a923e08fcd2ce2f57873bc1c6904 -rb18306871e780d0266af4b3135c37780f09d2b72
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/events/TransitionEvent.as	(.../TransitionEvent.as)	(revision e11155f5e0c1a923e08fcd2ce2f57873bc1c6904)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/events/TransitionEvent.as	(.../TransitionEvent.as)	(revision b18306871e780d0266af4b3135c37780f09d2b72)
@@ -1,12 +1,14 @@
 package org.lamsfoundation.lams.author.events
 {
 	import org.lamsfoundation.lams.author.components.activity.ActivityComponent;
+	import org.lamsfoundation.lams.author.components.transition.TransitionComponent;
 	
 	
 	public class TransitionEvent extends AuthorEvent
 	{
 		public static const TRANSITION_EVENT:String = "transitionEvent";
 		public var sourceAcivityComponent:ActivityComponent;
+		public var transition:TransitionComponent;
 		public var localY:int;
 		public var localX:int;
 		
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/maps/MainEventMap.mxml
===================================================================
diff -u -re11155f5e0c1a923e08fcd2ce2f57873bc1c6904 -rb18306871e780d0266af4b3135c37780f09d2b72
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/maps/MainEventMap.mxml	(.../MainEventMap.mxml)	(revision e11155f5e0c1a923e08fcd2ce2f57873bc1c6904)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/maps/MainEventMap.mxml	(.../MainEventMap.mxml)	(revision b18306871e780d0266af4b3135c37780f09d2b72)
@@ -71,12 +71,17 @@
 		
 	</EventHandlers>
 	
+	<!-- Event fires when a traniition finishes -->
 	<EventHandlers type="{TransitionEvent.TRANSITION_EVENT}">
-		<MethodInvoker generator="{AuthorController}" method="startTransitionDraw" arguments="{[event]}" />
+		<MethodInvoker generator="{AuthorController}" method="drawTransition" arguments="{[event]}" />
 	</EventHandlers>
 	
-
+	<!-- Event fires when you drop an activity directly on the canvas -->
+	<EventHandlers type="{DropActivityEvent.DROP_ACTIVITY_EVENT}">
+		<MethodInvoker generator="{AuthorController}" method="dropActivity" arguments="{[event]}" />
+	</EventHandlers>
 	
+	
 	<!-- ======================================================================================== -->
 	<!-- Services   Note: you can have an external file if you have more services -->
 	<!-- _________________________________________________________________________________________ -->