Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/BranchingActivity.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/BranchingActivity.as,v
diff -u -r1.6 -r1.7
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/BranchingActivity.as	14 Aug 2007 06:04:31 -0000	1.6
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/BranchingActivity.as	5 Sep 2007 09:54:53 -0000	1.7
@@ -42,6 +42,7 @@
 	private var _endYCoord:Number;
 	
 	private var _toolActivityUIID:Number;
+	private var _defaultBranch:Branch;
 	
 	function BranchingActivity(activityUIID:Number, activityTypeID:Number){
 		super(activityUIID);
@@ -53,6 +54,7 @@
 		_endYCoord = DEFAULT_ENDY;
 		
 		_toolActivityUIID == null;
+		_defaultBranch = null;
 		
 	}
 	
@@ -85,6 +87,7 @@
 		if(_endXCoord) dto.endXCoord = _endXCoord;
 		if(_endYCoord) dto.endYCoord = _endYCoord;
 		if(_toolActivityUIID) dto.toolActivityUIID = _toolActivityUIID;
+		if(_defaultBranch) dto.defaultBranch = _defaultBranch.sequenceActivity.activityUIID;
 		
 		return dto;
 	}
@@ -137,5 +140,13 @@
 		return _toolActivityUIID;
 	}
 	
+	public function set defaultBranch(a:Branch) {
+		_defaultBranch = a;
+	}
+	
+	public function get defaultBranch():Branch {
+		return _defaultBranch;
+	}
+	
 }
 
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as,v
diff -u -r1.16 -r1.17
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	4 Sep 2007 05:08:34 -0000	1.16
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	5 Sep 2007 09:54:53 -0000	1.17
@@ -81,6 +81,7 @@
 	private var _groupings:Hashtable;
 	private var _branches:Hashtable;
 	private var _branchMappings:Hashtable;
+	private var _outputConditions:Hashtable;
 	
 	
 	private var _licenseID:Number;
@@ -105,6 +106,7 @@
 		_groupings = new Hashtable("_groupings");
 		_branches = new Hashtable("_branches");
 		_branchMappings = new Hashtable("_branchMappings");
+		_outputConditions = new Hashtable("_outputConditions");
 		
 		//set the defualts:
 		_objectType = "LearningDesign";
@@ -295,6 +297,16 @@
 		return true;
 	}
 	
+	public function addOutputCondition(condition:ToolOutputCondition):Boolean {
+		dispatchEvent({type:'ddmBeforeUpdate',target:this});
+		
+		_outputConditions.put(condition.conditionUIID, condition);
+		
+		dispatchEvent({type:'ddmUpdate',target:this});
+		
+		return true;
+	}
+	
 	/**
 	 * Removes the branch from the DDM
 	 * @usage   
@@ -350,7 +362,23 @@
 		}
 	}
 	
+	public function removeOutputCondition(conditionUIID):Object{
 	
+		//dispatch an event to show the design has changed
+		dispatchEvent({type:'ddmBeforeUpdate',target:this});
+		
+		var r:Object = _outputConditions.remove(conditionUIID);
+		if(r==null){
+			return new LFError("Removing tool output condition failed:"+conditionUIID,"removeOutputCondition",this,null);
+		}else{
+			
+			Debugger.log('Removed:'+r.conditionUIID,Debugger.GEN,'removeOutputCondition','DesignDataModel');
+			
+			dispatchEvent({type:'ddmUpdate',target:this});
+		}
+	
+	}
+	
 	/**
 	 * Sets a new design for the DDM.
 	 * note the design must be empty to call this, use clearCanvas(true)
@@ -481,9 +509,18 @@
 		
 		for(var i=0; i<design.branchMappings.length;i++){
 			var mdto = design.branchMappings[i];
+			var newMappingEntry:BranchActivityEntry;
+			if(mdto.groupUIID != null) {
+				newMappingEntry = new GroupBranchActivityEntry(mdto.entryID, mdto.entryUIID, getGroupByUIID(mdto.groupUIID), SequenceActivity(getActivityByUIID(mdto.sequenceActivityUIID)), BranchingActivity(getActivityByUIID(mdto.branchingActivityUIID)));
+			} else if(mdto.condition != null) {
+				var condition:ToolOutputCondition = new ToolOutputCondition();
+				condition.populateFromDTO(mdto.condition);
+				
+				newMappingEntry = new ToolOutputBranchActivityEntry(mdto.entryID, mdto.entryUIID, condition, SequenceActivity(getActivityByUIID(mdto.sequenceActivityUIID)), BranchingActivity(getActivityByUIID(mdto.branchingActivityUIID)));
+			}
 			
-			var newMappingEntry:GroupBranchActivityEntry = new GroupBranchActivityEntry(mdto.entryID, mdto.entryUIID, getGroupByUIID(mdto.groupUIID), SequenceActivity(getActivityByUIID(mdto.sequenceActivityUIID)), BranchingActivity(getActivityByUIID(mdto.branchingActivityUIID)));
-			_branchMappings.put(newMappingEntry.entryUIID, newMappingEntry);
+			if(newMappingEntry != null)
+				_branchMappings.put(newMappingEntry.entryUIID, newMappingEntry);
 		}
 		
 		return success;
@@ -1141,6 +1178,14 @@
 		_branchMappings = a;
 	}	
 	
+	public function set conditions(a:Hashtable):Void {
+		_outputConditions = a;
+	}
+	
+	public function get conditions():Hashtable {
+		return _outputConditions;
+	}
+	
 	/**
 	 * 
 	 * @usage   
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputCondition.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputCondition.as,v
diff -u -r1.2 -r1.3
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputCondition.as	31 Aug 2007 07:39:40 -0000	1.2
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputCondition.as	5 Sep 2007 09:54:53 -0000	1.3
@@ -34,26 +34,81 @@
 	private var _conditionUIID:Number;
 	
 	private var _orderID:Number;
-	private var _name:String;
+	private var _name:String;
+	private var _display_name:String;
 	private var _type:String;
 	private var _startValue:Object;
 	private var _endValue:Object;
 	private var _exactMatchValue:Object;
+	
+	private var _branchingActivity:Activity;
 	
-	function ToolOutputCondition(conditionID:Number, conditionUIID:Number, name:String, type:String, startValue:Object, endValue:Object, exactMatchValue:Object){
+	function ToolOutputCondition(conditionID:Number, conditionUIID:Number, name:String, type:String, startValue:Object, endValue:Object, exactMatchValue:Object, displayName:String, toolContentID:Number){
 		_conditionID = conditionID;
 		_conditionUIID = conditionUIID;
-		_orderID = 1;
+		_orderID = 1;
+		_type = type;
 		_name = name;
 		_startValue = startValue;
 		_endValue = endValue;
-		_exactMatchValue = exactMatchValue;
+		_exactMatchValue = exactMatchValue;
+		
+		_display_name = displayName;
+	}
+	
+	public static function createBoolCondition(UIID:Number, definition:ToolOutputDefinition, value:Boolean):ToolOutputCondition {
+		var condition:ToolOutputCondition = new ToolOutputCondition();
+		condition.conditionUIID = UIID;
+		
+		if(definition.type == ToolOutputDefinition.BOOL) {
+			condition.type = definition.type;
+			condition.name = definition.name;
+			condition.displayName = definition.type + " (" + String(value) + ") ";
+			condition.exactMatchValue = value;
+			
+		}
+		
+		return condition;
+	}
+	
+	public static function createLongCondition(UIID:Number, displayName:String, definition:ToolOutputDefinition, startValue:Number, endValue:Number):ToolOutputCondition {
+		var condition:ToolOutputCondition = new ToolOutputCondition();
+		condition.conditionUIID = UIID;
+		
+		if(definition.type == ToolOutputDefinition.LONG) {
+			condition.name = definition.name;
+			condition.type = definition.type;
+			condition.displayName = displayName;
+			
+			if(startValue == endValue) {
+				condition.exactMatchValue = startValue;
+			} else { 
+				condition.startValue = startValue;
+				condition.endValue = endValue;
+			}
+		}
+		
+		return condition;
 	}
+	
+	public function populateFromDTO(dto:Object):Void {
+		_conditionID = dto.conditionID;
+		_conditionUIID = dto.conditionUIID;
+		
+		_orderID = dto.orderID;
+		_name = dto.name;
+		_display_name = dto.displayName;
+		_type = dto.type;
+		_startValue = dto.startValue;
+		_endValue = dto.endValue;
+		_exactMatchValue = dto.exactMatchValue;
+	}
 	
 	public function addConditionData(dto:Object):Object {
 		
 		if(_orderID) dto.orderID = _orderID;
-		if(_name) dto.name = _name;
+		if(_name) dto.name = _name;
+		if(_display_name) dto.displayName = _display_name;
 		if(_type) dto.type = _type;
 		if(_startValue) dto.startValue = _startValue;
 		if(_endValue) dto.endValue = _endValue;
@@ -84,6 +139,14 @@
 	
 	public function get name():String {
 		return _name;
+	}
+	
+	public function set displayName(a:String) {
+		_display_name = a;
+	}
+	
+	public function get displayName():String {
+		return _display_name;
 	}
 	
 	public function set type(a:String) {
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ConditionMatchingDialog.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ConditionMatchingDialog.as,v
diff -u -r1.1 -r1.2
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ConditionMatchingDialog.as	17 Aug 2007 08:06:18 -0000	1.1
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ConditionMatchingDialog.as	5 Sep 2007 09:54:53 -0000	1.2
@@ -99,7 +99,7 @@
 		
 		conditions_lst.dataProvider = conditions;
 		conditions_lst.sortItemsBy("conditionUIID", Array.NUMERIC);
-		conditions_lst.labelField = "description";
+		conditions_lst.labelField = "displayName";
 		conditions_lst.hScrollPolicy = "on";
 		conditions_lst.maxHPosition = 200;
 		
@@ -111,11 +111,11 @@
 		var column_sequence:DataGridColumn = new DataGridColumn("sequenceName");
 		column_sequence.headerText = "Branch";
 		
-		var column_desc:DataGridColumn = new DataGridColumn("description");
-		column_desc.headerText = "Condition";
+		var column_condition:DataGridColumn = new DataGridColumn("displayName");
+		column_condition.headerText = "Condition";
 		
 		match_dgd.addColumn(column_sequence);
-		match_dgd.addColumn(column_desc);
+		match_dgd.addColumn(column_condition);
 		
 		var mappings = app.getCanvas().ddm.branchMappings.values();
 		
@@ -155,29 +155,54 @@
     private function close(){
         Debugger.log('OK Clicked',Debugger.GEN,'ok','ConditionMatchingDialog');
         
-        //close popup
-        _container.deletePopUp();
+		// check for any remaining conditions
+		if(conditions_lst.length > 0) {
+			LFMessage.showMessageAlert("All remaining conditions will be mapped to the default branch", Proxy.create(this, cleanupUnmappedConditions));
+		} else {
+			//close popup
+			_container.deletePopUp();
+		}
+		
+		
     }
 	
+	private function cleanupUnmappedConditions(){
+        for(var i=0; i < conditions_lst.length; i++) {
+			setupMatch(conditions_lst.getItemAt(i), _branchingActivity.defaultBranch);
+		}
+		
+		conditions_lst.removeAll();
+		
+		close();
+	}
+	
+	/**
+    * Event dispatched by parent container when close button clicked
+    */
+    public function click(e:Object):Void{
+        close();
+    }
+    
+	
 	private function addMatch():Void {
-		var selectedGroups:Array = new Array();
+		var selectedConditions:Array = new Array();
 		
 		// get selected items and put together in match
 		if(conditions_lst.selectedItems.length > 0) {
 		
 			for(var i=0; i<conditions_lst.selectedIndices.length; i++) {
 				if(branches_lst.selectedItem != null) {
 					setupMatch(conditions_lst.getItemAt(conditions_lst.selectedIndices[i]), branches_lst.selectedItem);
-					selectedGroups.push(conditions_lst.selectedIndices[i]);
+					selectedConditions.push(conditions_lst.selectedIndices[i]);
 				} else {
 					LFMessage.showMessageAlert("No branch selected");
 					return;
 				}
 				
 			}
 			var delCount = 0;
-			for(var i=0; i<selectedGroups.length; i++) {
-				conditions_lst.removeItemAt(selectedGroups[i]-delCount);
+			for(var i=0; i<selectedConditions.length; i++) {
+				conditions_lst.removeItemAt(selectedConditions[i]-delCount);
 				delCount++;
 			}
 			
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/GroupMatchingDialog.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/GroupMatchingDialog.as,v
diff -u -r1.5 -r1.6
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/GroupMatchingDialog.as	17 Aug 2007 08:06:17 -0000	1.5
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/GroupMatchingDialog.as	5 Sep 2007 09:54:53 -0000	1.6
@@ -46,7 +46,7 @@
 
     //References to components + clips 
     private var _branchingActivity:BranchingActivity;
-
+	
     //These are defined so that the compiler can 'see' the events that are added at runtime by EventDispatcher
     private var dispatchEvent:Function;     
     public var addEventListener:Function;
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as,v
diff -u -r1.2 -r1.3
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as	3 Sep 2007 06:23:55 -0000	1.2
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as	5 Sep 2007 09:54:53 -0000	1.3
@@ -22,7 +22,9 @@
  */
  
 import org.lamsfoundation.lams.authoring.br.*;
-import org.lamsfoundation.lams.authoring.ToolOutputDefinition;
+import org.lamsfoundation.lams.authoring.ToolOutputDefinition;
+import org.lamsfoundation.lams.authoring.ToolOutputCondition;
+import org.lamsfoundation.lams.authoring.Application;
 
 import org.lamsfoundation.lams.common.Dialog;
 import org.lamsfoundation.lams.common.style.*;
@@ -47,7 +49,7 @@
 	private var _definitions:Array;
 	private var _conditions:Array;
 	private var _selectedDefinition:ToolOutputDefinition;
-	
+	private var _toolContentID:Number;
 	
 	private var _toolOutputDefin_cmb:ComboBox;
 	private var _condition_item_dgd:DataGrid;
@@ -56,29 +58,40 @@
 	private var _end_value_stp:NumericStepper;
 	
 	private var add_btn:Button;
-	private var close_btn:Button;
+	private var close_btn:Button;
+	private var cancel_btn:Button;
+	private var remove_item_btn:Button;
+	private var clear_all_btn:Button;
 	
 	private var _output_type_lbl:Label;
 	private var _condition_range_lbl:Label;
 	
 	private var _bgpanel:MovieClip;       //The underlaying panel base
     
-    private var fm:FocusManager;            //Reference to focus manager
+    private var app:Application;
+	private var fm:FocusManager;            //Reference to focus manager
     private var themeManager:ThemeManager;  //Theme manager
 	
     //Dimensions for resizing
     private var xOkOffset:Number;
     private var yOkOffset:Number;
     private var xCancelOffset:Number;
-    private var yCancelOffset:Number;
+    private var yCancelOffset:Number;
+	
+	private var _itemCount:Number;
 
     //These are defined so that the compiler can 'see' the events that are added at runtime by EventDispatcher
     private var dispatchEvent:Function;     
     public var addEventListener:Function;
     public var removeEventListener:Function;
     
 	
-	function ToolOutputConditionsDialog(){
+	function ToolOutputConditionsDialog(){
+		_itemCount = 0;
+		this._visible = false;
+		
+		app = Application.getInstance();
+		
 		//Set up this class to use the Flash event delegation model
         EventDispatcher.initialize(this);
 		
@@ -97,11 +110,18 @@
         themeManager = ThemeManager.getInstance();
         
 		//EVENTS
-        //Add event listeners close button
-        close_btn.addEventListener('click',Delegate.create(this, close));
-        add_btn.addEventListener('click',Delegate.create(this, addCondition));
+        //Add event listeners for buttons
+        close_btn.addEventListener('click', Delegate.create(this, close));
+        cancel_btn.addEventListener('click', Delegate.create(this, cancel));
 		
+		add_btn.addEventListener('click',Delegate.create(this, addButton_onPress));
+		remove_item_btn.addEventListener('click', Delegate.create(this, removeItemButton_onPress));
+		clear_all_btn.addEventListener('click', Delegate.create(this, clearAllButton_onPress));
+		
 		_toolOutputDefin_cmb.addEventListener('change', Delegate.create(this, itemChanged));
+		
+		_condition_item_dgd.addEventListener('cellEdit', Delegate.create(this, itemEdited));
+		_condition_item_dgd.addEventListener('cellFocusIn', Delegate.create(this, itemSelected));
 		
 		//Assign Click (close button) and resize handlers
         _container.addEventListener('click',this);
@@ -140,7 +160,12 @@
 		
 		//Set the text for buttons
         close_btn.label = Dictionary.getValue('al_done');
+		cancel_btn.label = Dictionary.getValue('al_cancel');
+		
 		add_btn.label = "+ Add";
+		clear_all_btn.label = "Clear All";
+		remove_item_btn.label = "- Remove";
+		
 	}
 	
 	/**
@@ -154,7 +179,11 @@
         //Get the button style from the style manager and apply to both buttons
         styleObj = themeManager.getStyleObject('button');
         close_btn.setStyle('styleName', styleObj);
-		add_btn.setStyle('styleName', styleObj);
+		cancel_btn.setStyle('styleName', styleObj);
+		
+		add_btn.setStyle('styleName', styleObj);
+		remove_item_btn.setStyle('styleName', styleObj);
+		clear_all_btn.setStyle('styleName', styleObj);
        
 		styleObj = themeManager.getStyleObject('CanvasPanel');
 		_bgpanel.setStyle('styleName', styleObj);
@@ -170,7 +199,54 @@
 		styleObj = themeManager.getStyleObject('numericstepper');
 		_start_value_stp.setStyle('styleName', styleObj);
 		_end_value_stp.setStyle('styleName', styleObj);
-    }
+    }
+	
+	public function setupContent():Void {
+		
+		var column_name:DataGridColumn = new DataGridColumn("conditionName");
+		column_name.headerText = "Name";
+		column_name.editable = true;
+		
+		var column_value:DataGridColumn = new DataGridColumn("conditionValue");
+		column_value.headerText = "Condition";
+		column_value.editable = false;
+		
+		_condition_item_dgd.addColumn(column_name);
+		_condition_item_dgd.addColumn(column_value);
+		
+		// wait second frame for steppers to be setup
+		
+		this.onEnterFrame = initSetup;
+		
+	}
+	
+	private function initSetup():Void {
+		delete this.onEnterFrame;
+		
+		// get branch conditions by branch activity uiid from ddm
+		
+		// selected definition and add items to list that already exist in ddm for this matchup
+		
+		// else no items do normal startup
+		itemChanged();
+		
+		this._visible = true;
+	}
+	
+	private function addButton_onPress():Void {
+		addCondition(ToolOutputCondition.createLongCondition(app.getCanvas().ddm.newUIID(), "unnamed", _selectedDefinition, _start_value_stp.value, _end_value_stp.value));
+	}
+	
+	private function clearAllButton_onPress():Void {
+		_condition_item_dgd.removeAll();
+	}
+	
+	private function removeItemButton_onPress():Void {
+		var selectedItem = _condition_item_dgd.getItemAt(_condition_item_dgd.selectedIndex);
+		app.getCanvas().ddm.removeOutputCondition(selectedItem.conditionUIID);
+		
+		_condition_item_dgd.removeItemAt(_condition_item_dgd.selectedIndex);
+	}
 	
 	/**
 	 * Called by ADD button
@@ -179,51 +255,144 @@
 	 * @return  
 	 */
 	
-	private function addCondition():Void {
+	private function addCondition(condition:ToolOutputCondition):Void {
+		if(_condition_item_dgd.getItemAt(0).data == null)
+			_condition_item_dgd.removeItemAt(0);
 		
+		switch(condition.type) {
+			case ToolOutputDefinition.LONG :
+				if(condition.startValue != null && condition.endValue != null)
+					_condition_item_dgd.addItem({conditionName: condition.displayName, conditionValue: String(condition.startValue) + " TO " + String(condition.endValue), data: condition});
+				else
+					_condition_item_dgd.addItem({conditionName: condition.displayName, conditionValue: "exact(" + String(condition.exactMatchValue) + ")", data: condition});
+				
+				break;
+			case ToolOutputDefinition.BOOL: 
+				_condition_item_dgd.addItem({conditionName: condition.displayName, conditionValue: String(condition.exactMatchValue), data: condition});
+				break;
+			default: 
+				Debugger.log("No type found", Debugger.GEN, "addCondition", "ToolOutputConditionsDialog");
+		}
+		
+		app.getCanvas().ddm.addOutputCondition(condition);
+		
 	}
 	
+	private function removeCondition(conditionUIID:Number):Void {
+		app.getCanvas().ddm.removeOutputCondition(conditionUIID);
+	}
+	
+	private function removeAllItems():Void {
+		for(var i=0; i<_condition_item_dgd.length; i++) {
+			var item = _condition_item_dgd.getItemAt(i);
+			app.getCanvas().ddm.removeOutputCondition(item.conditionUIID);
+		}
+		
+		_condition_item_dgd.removeAll();
+	}
+	
 	private function itemChanged(evt:Object):Void {
-		_selectedDefinition = _toolOutputDefin_cmb.dataProvider[_toolOutputDefin_cmb.selectedIndex];
+		Debugger.log("type: " + _selectedDefinition.type, Debugger.CRITICAL, "itemChanged", "ToolOutputConditionsDialog");
 		
+		var ddm = app.getCanvas().ddm;
+		_selectedDefinition = _toolOutputDefin_cmb.dataProvider[_toolOutputDefin_cmb.selectedIndex];
 		_output_type_lbl.text = "Output Type: " + _selectedDefinition.type;
 
-		Debugger.log("type: " + _selectedDefinition.type, Debugger.CRITICAL, "itemChanged", "ToolOutputConditionsDialog");
-
-		Debugger.log("val: " + evt.target.value, Debugger.CRITICAL, "itemChanged", "ToolOutputConditionsDialog");
+		switch(_selectedDefinition.type) {
+			case ToolOutputDefinition.LONG:
+				removeAllItems();
 		
-		if(_selectedDefinition.type == "OUTPUT_LONG") {
+				_start_value_stp.visible = true;
+				_end_value_stp.visible = true;
+				
+				_start_value_stp.minimum = Number(_selectedDefinition.startValue);
+				_end_value_stp.minimum = Number(_selectedDefinition.startValue);
+				_start_value_stp.maximum = Number(_selectedDefinition.endValue);
+				_end_value_stp.maximum = Number(_selectedDefinition.endValue);
+				
+				_start_value_stp.value = Number(_selectedDefinition.startValue);
+				_end_value_stp.value = Number(_selectedDefinition.endValue);
+				
+				add_btn.visible = true;
+				clear_all_btn.enabled = true;
+				remove_item_btn.enabled = true;
+				
+				_condition_range_lbl.visible = true;
+				
+				break;
 			
-			_start_value_stp.visible = true;
-			_end_value_stp.visible = true;
-			
-			_start_value_stp.minimum = Number(_selectedDefinition.startValue);
-			_end_value_stp.minimum = Number(_selectedDefinition.startValue);
-			_start_value_stp.maximum = Number(_selectedDefinition.endValue);
-			_end_value_stp.maximum = Number(_selectedDefinition.endValue);
-			
-			_start_value_stp.value = Number(_selectedDefinition.startValue);
-			_end_value_stp.value = Number(_selectedDefinition.endValue);
-		} else {
-			_start_value_stp.visible = false;
-			_end_value_stp.visible = false;
+			case ToolOutputDefinition.BOOL:
+				removeAllItems();
+				
+				_start_value_stp.visible = false;
+				_end_value_stp.visible = false;
+				
+				add_btn.visible = false;
+				clear_all_btn.enabled = false;
+				remove_item_btn.enabled = false;
+				
+				_condition_range_lbl.visible = false;
+				
+				// add default conditions for boolean output type
+				addCondition(ToolOutputCondition.createBoolCondition(ddm.newUIID(), _selectedDefinition, true));
+				addCondition(ToolOutputCondition.createBoolCondition(ddm.newUIID(), _selectedDefinition, false));
+				
+				break;
+			default:
+				Debugger.log("type not found", Debugger.GEN, "itemChanged", "ToolOutputConditionsDialog");
 		}
 			
+	}
+	
+	private function itemEdited(evt:Object):Void {
+		var item = _condition_item_dgd.getItemAt(evt.itemIndex);
+		var condition:ToolOutputCondition = ToolOutputCondition(item.data);
+		condition.displayName = item.conditionName;
+		
+		app.getCanvas().ddm.addOutputCondition(condition);
+		
+	}
+	
+	public function itemSelected(evt:Object):Void {
+		var item = _condition_item_dgd.getItemAt(evt.itemIndex);
+		
+		Debugger.log("current selection: " + Selection.getFocus(), Debugger.CRITICAL, "itemSelected", "GroupNamingDialog");
+	}
+
+	public static function getOutputType(type:String):String {
+		switch(type) {
+			case ToolOutputDefinition.BOOL:
+				return "boolean";
+				break;
+			case ToolOutputDefinition.LONG:
+				return "long";
+				break;
+			default:
+				return "undefined";
+		}
 	}
 	
     /**
     * Called by the CLOSE button 
     */
-    private function close(){
-		
+    private function close(){
+		app.pi.openConditionMatchingDialog();
+		 
         _container.deletePopUp();
-    }
+    }
+	
+	private function cancel(){
+		// remove any entries
+		removeAllItems();
+		
+        _container.deletePopUp();
+	}
 	
     /**
     * Event dispatched by parent container when close button clicked
     */
-    public function click(e:Object):Void{
-        e.target.deletePopUp();
+    public function click(e:Object):Void{
+		close();
     }
     
     /**
@@ -251,14 +420,25 @@
 		}
 		
 		_toolOutputDefin_cmb.dataProvider = _definitions;
-		_toolOutputDefin_cmb.labelField = "name";
+		_toolOutputDefin_cmb.labelFunction = function(itemObj){
+			return (itemObj.name + " (" + ToolOutputConditionsDialog.getOutputType(itemObj.type) + ")");
+		}
 		
 		_toolOutputDefin_cmb.redraw(true);
+
 	}
 	
 	public function get definitions():Array {
 		return _definitions;
+	}
+	
+	public function get toolContentID():Number {
+		return _toolContentID;
 	}
+	
+	public function set toolContentID(a:Number):Void {
+		_toolContentID = a;
+	}
 	
 	/**
     * set the container refernce to the window holding the dialog
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as,v
diff -u -r1.20 -r1.21
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	31 Aug 2007 07:39:40 -0000	1.20
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	5 Sep 2007 09:54:53 -0000	1.21
@@ -675,6 +675,8 @@
 	private function ToolOutputConditionsDialogLoaded(evt:Object, ta:ToolActivity) {
 		evt.target.scrollContent.definitions = ta.definitions;
 		Debugger.log("def length: " + ta.definitions.length, Debugger.CRITICAL, "ToolOutputConditionsDialogLoaded", "CanvasController");
+	
+		evt.target.scrollContent.setupContent();
 	}
 	
 }
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as,v
diff -u -r1.25 -r1.26
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	17 Aug 2007 08:06:17 -0000	1.25
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	5 Sep 2007 09:54:53 -0000	1.26
@@ -593,10 +593,16 @@
 	}
 	
 	public function addNewBranch(sequence:SequenceActivity, branchingActivity:Activity):Void {
+		
 		if(sequence.firstActivityUIID != null) {
 			var b:Branch = new Branch(_cv.ddm.newUIID(), BranchConnector.DIR_FROM_START, _cv.ddm.getActivityByUIID(sequence.firstActivityUIID).activityUIID, branchingActivity.activityUIID, sequence, _cv.ddm.learningDesignID);
 			_cv.ddm.addBranch(b);
 			
+			if(BranchingActivity(branchingActivity).defaultBranch == null) {
+				BranchingActivity(branchingActivity).defaultBranch = b;
+			}
+		
+			// TODO: review
 			if(!sequence.stopAfterActivity) {
 				b = new Branch(_cv.ddm.newUIID(), BranchConnector.DIR_TO_END, _cv.ddm.getActivityByUIID(this.getLastActivityUIID(sequence.firstActivityUIID)).activityUIID, branchingActivity.activityUIID, sequence, _cv.ddm.learningDesignID);
 			
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as,v
diff -u -r1.11 -r1.12
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	17 Aug 2007 08:06:17 -0000	1.11
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	5 Sep 2007 09:54:53 -0000	1.12
@@ -114,7 +114,7 @@
 		
 		_group_match_btn.addEventListener("click", Delegate.create(this, onGroupMatchClick));
 		_group_naming_btn.addEventListener("click", Delegate.create(this, onGroupNamingClick));
-		_tool_output_match_btn.addEventListener("click", Delegate.create(this, onToolOutputMatchClick));
+		_tool_output_match_btn.addEventListener("click", Delegate.create(this, onConditionMatchClick));
 		_conditions_setup_btn.addEventListener("click", Delegate.create(this, onConditionsSetupClick));
 		
 		this.onEnterFrame = setupLabels;
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as,v
diff -u -r1.11 -r1.12
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	31 Aug 2007 07:39:40 -0000	1.11
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	5 Sep 2007 09:54:53 -0000	1.12
@@ -924,12 +924,13 @@
 	
 	private function onBranchToolInputChange(evt:Object) {
 		Debugger.log('branch input change: ' + evt.target.value, Debugger.CRITICAL, "onBranchToolInputChange", "PIC*");
+		
 		_canvasModel.selectedItem.activity.toolActivityUIID = (evt.target.value != 0) ? evt.target.value : null;
 		_canvasModel.selectedItem.refresh();
-			
-		_conditions_setup_btn.visible = (_canvasModel.selectedItem.activity.toolActivityUIID != null) ? true : false;
-		Debugger.log('button visible ' + _conditions_setup_btn.visible, Debugger.CRITICAL, "onBranchToolInputChange", "PIC*");
 		
+		var branches:Object = _canvasModel.getCanvas().ddm.getBranchesForActivityUIID(_canvasModel.selectedItem.activity.activityUIID);
+		_conditions_setup_btn.visible = ((_canvasModel.selectedItem.activity.toolActivityUIID != null) && (branches.myBranches.length > 0)) ? true : false;
+		
 		setModified();
 	}
 	
@@ -939,15 +940,15 @@
 		
 		if(!v) { _tool_output_match_btn.visible = false; _conditions_setup_btn.visible = false; return; }
 		
-		var ca = _canvasModel.selectedItem;
-		var branches:Object = _canvasModel.getCanvas().ddm.getBranchesForActivityUIID(ca.activity.activityUIID);
+		var branches:Object = _canvasModel.getCanvas().ddm.getBranchesForActivityUIID(_canvasModel.selectedItem.activity.activityUIID);
 		
-		if(branches.myBranches.length > 0)
+		if(branches.myBranches.length > 0) {
 			_tool_output_match_btn.visible = v;
+			
+			if(_canvasModel.selectedItem.activity.toolActivityUIID != null)
+				_conditions_setup_btn.visible = v;
+		}
 		
-		if(_canvasModel.selectedItem.activity.toolActivityUIID != null)
-			_conditions_setup_btn.visible = v;
-		
 		if(e != null) {
 			toolActs_cmb.enabled = e;
 			_tool_output_match_btn.enabled = e;
@@ -1018,13 +1019,16 @@
 		setModified();
 	}
 	
-	private function onToolOutputMatchClick(evt:Object){
-
-		// show tool outputs to branch mappings dialog
-		//var ta:ToolActivity = ToolActivity(_canvasModel.getCanvas().ddm.getActivityByUIID(_canvasModel.selectedItem.activity.toolActivityUIID));
-		//_canvasModel.getCanvas().getToolOutputDefinitions(ta);
+	public function openConditionMatchDialog():Void {
+		onConditionMatchClick();
+	}
+	
+	private function onConditionMatchClick(evt:Object){
+		// open group to branch matching window
+		_app.dialog = PopUpManager.createPopUp(Application.root, LFWindow, true, {title:Dictionary.getValue('condmatch_dlg_title_lbl'), closeButton:true, viewResize:false, scrollContentPath:'ConditionMatchingDialog'});
+		_app.dialog.addEventListener('contentLoaded', Delegate.create(this, ConditionMatchingDialogLoaded));
 		
-		//setModified();
+		setModified();
 	}
 	
 	private function onConditionsSetupClick(evt:Object){
@@ -1055,6 +1059,16 @@
 		evt.target.scrollContent.grouping = grouping;
 		evt.target.scrollContent.groups = grouping.getGroups(_canvasModel.getCanvas().ddm);
 		evt.target.scrollContent.setupGrid();
+	}
+	
+	private function ConditionMatchingDialogLoaded(evt:Object) {
+		var branches:Object = _canvasModel.getCanvas().ddm.getBranchesForActivityUIID(_canvasModel.selectedItem.activity.activityUIID);
+		
+		evt.target.scrollContent.branchingActivity = BranchingActivity(_canvasModel.selectedItem.activity);
+		evt.target.scrollContent.conditions = _canvasModel.getCanvas().ddm.conditions.values();
+		evt.target.scrollContent.branches = getValidBranches(branches.myBranches);
+		
+		evt.target.scrollContent.loadLists();
 	}
 	
 	private function getValidBranches(branches:Array):Array {