Index: lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
===================================================================
diff -u -r94167588d13325ddf56b9231f359f12a25274364 -r1697e0adcb8ca87a300e439346f416a4445a0683
--- lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision 94167588d13325ddf56b9231f359f12a25274364)
+++ lams_central/src/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(.../CanvasModel.as)	(revision 1697e0adcb8ca87a300e439346f416a4445a0683)
@@ -13,9 +13,7 @@
 	public static var OPTIONAL_TOOL:String = "OPTIONAL";
 	public static var GATE_TOOL:String = "GATE";
 	public static var GROUP_TOOL:String = "GROUP";
-	
 	private var _defaultGroupingTypeID;
-	
 	private var __width:Number;
 	private var __height:Number;
 	private var __x:Number;
@@ -56,9 +54,13 @@
 		_cv = cv;
 		_activitiesDisplayed = new Hashtable("_activitiesDisplayed");
 		_transitionsDisplayed = new Hashtable("_transitionsDisplayed");
-
+		
+		
+		
+				
+	
 		_activeTool = null;
-		_transitionActivities = new Array();
+		_transitionActivities = new Array();
 		_defaultGroupingTypeID = Grouping.RANDOM_GROUPING;
 	}
 
@@ -251,45 +253,83 @@
 		setSelectedItem(_activitiesDisplayed.get(gateAct.activityUIID));
 		
 	}
-	
+	/**
+	 * Creates a new group activity at the specified location
+	 * @usage   
+	 * @param   pos 
+	 * @return  
+	 */
+	public function createNewGroupActivity(pos){
+		Debugger.log('Running...',Debugger.GEN,'createNewGroupActivity','CanvasModel');
+		
+		//first create the grouping object
+		var newGrouping = new Grouping(_cv.ddm.newUIID());
+		newGrouping.groupingTypeID = _defaultGroupingTypeID;
+		
+		_cv.ddm.addGrouping(newGrouping);
+		
+		var groupingActivity = new GroupingActivity(_cv.ddm.newUIID());
+		groupingActivity.title = Dictionary.getValue('grouping_act_title');
+		groupingActivity.learningDesignID = _cv.ddm.learningDesignID;
+		groupingActivity.createGroupingUIID = newGrouping.groupingUIID;
+		
+		groupingActivity.yCoord = pos.y;
+		groupingActivity.xCoord = pos.x;
+		
+		
+		Debugger.log('groupingActivity.createGroupingUIID :'+groupingActivity.createGroupingUIID ,Debugger.GEN,'createNewGroupActivity','CanvasModel');
+		Debugger.log('groupingActivity.yCoord:'+groupingActivity.yCoord,Debugger.GEN,'createNewGroupActivity','CanvasModel');
+		Debugger.log('groupingActivity.xCoord:'+groupingActivity.xCoord,Debugger.GEN,'createNewGroupActivity','CanvasModel');
+
+
+		_cv.ddm.addActivity(groupingActivity);
+		
+		//tell the canvas to go refresh
+		setDirty();
+		//select the new thing
+		setSelectedItem(_activitiesDisplayed.get(groupingActivity.activityUIID));
+	}
 	/**
-	 * Creates a new group activity at the specified location
+	 * Creates a new gate activity at the specified location
 	 * @usage   
-	 * @param   pos 
+	 * @param   gateTypeID 
+	 * @param   pos        
 	 * @return  
 	 */
-	public function createNewGroupActivity(pos){
-		Debugger.log('Running...',Debugger.GEN,'createNewGroupActivity','CanvasModel');
+	public function createNewOptionalActivity(ActivityTypeID, pos:Point){
+		//Debugger.log('gateTypeID:'+gateTypeID,Debugger.GEN,'createNewGate','CanvasModel');
+		var optAct = new ComplexActivity(_cv.ddm.newUIID());
+		optAct.learningDesignID = _cv.ddm.learningDesignID;
+		optAct.activityTypeID = Activity.OPTIONAL_ACTIVITY_TYPE;
 		
-		//first create the grouping object
-		var newGrouping = new Grouping(_cv.ddm.newUIID());
-		newGrouping.groupingTypeID = _defaultGroupingTypeID;
+		optAct.yCoord = pos.y;
+		optAct.xCoord = pos.x;
 		
-		_cv.ddm.addGrouping(newGrouping);
 		
-		var groupingActivity = new GroupingActivity(_cv.ddm.newUIID());
-		groupingActivity.title = Dictionary.getValue('grouping_act_title');
-		groupingActivity.learningDesignID = _cv.ddm.learningDesignID;
-		groupingActivity.createGroupingUIID = newGrouping.groupingUIID;
-		
-		groupingActivity.yCoord = pos.y;
-		groupingActivity.xCoord = pos.x;
-		
-		
-		Debugger.log('groupingActivity.createGroupingUIID :'+groupingActivity.createGroupingUIID ,Debugger.GEN,'createNewGroupActivity','CanvasModel');
-		Debugger.log('groupingActivity.yCoord:'+groupingActivity.yCoord,Debugger.GEN,'createNewGroupActivity','CanvasModel');
-		Debugger.log('groupingActivity.xCoord:'+groupingActivity.xCoord,Debugger.GEN,'createNewGroupActivity','CanvasModel');
+		Debugger.log('Optional Activitys Y Coord is :'+optAct.yCoord,Debugger.GEN,'createNewOptionalActivity','CanvasModel');
+		//Debugger.log('gateAct.xCoord:'+gateAct.xCoord,Debugger.GEN,'createGateTransition','CanvasModel');
 
-
-		_cv.ddm.addActivity(groupingActivity);
+		_cv.ddm.addActivity(optAct);
 		
-		//tell the canvas to go refresh
 		setDirty();
 		//select the new thing
-		setSelectedItem(_activitiesDisplayed.get(groupingActivity.activityUIID));
+		setSelectedItem(_activitiesDisplayed.get(optAct.activityUIID));
+		
 	}
 	
 	/**
+	 * Creates a new gate activity at the specified location
+	 * @usage   
+	 * @param   gateTypeID 
+	 * @param   pos        
+	 * @return  
+	 */
+	public function createNewGroupActivity(pos:Point){
+		
+		
+	}
+	
+	/**
 	 * Adds another Canvas Activity to the transition.  
 	 * Only 2 may be added, adding the 2nd one triggers the creation of the transition.
 	 * @usage