Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Activity.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Activity.as,v
diff -u -r1.18 -r1.19
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Activity.as	8 May 2008 06:14:15 -0000	1.18
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Activity.as	20 Jun 2008 06:15:04 -0000	1.19
@@ -31,17 +31,28 @@
 *Activity Data storage class. USed as a base class for extending to be Tool, Gate and Complex
 * <pre><code>
 * 
-* * static final variables indicating the type of activities
-* 	/******************************************************************
+/**
+	 * static final variables indicating the type of activities
+	 * available for a LearningDesign 
+	******************************************************************
 	public static var TOOL_ACTIVITY_TYPE:Number = 1;
 	public static var GROUPING_ACTIVITY_TYPE:Number = 2;
+	public static var NO_GATE_ACTIVITY_TYPE:Number = 30
 	public static var SYNCH_GATE_ACTIVITY_TYPE:Number = 3;
 	public static var SCHEDULE_GATE_ACTIVITY_TYPE:Number = 4;
 	public static var PERMISSION_GATE_ACTIVITY_TYPE:Number = 5;
 	public static var PARALLEL_ACTIVITY_TYPE:Number = 6;
 	public static var OPTIONAL_ACTIVITY_TYPE:Number = 7;
 	public static var SEQUENCE_ACTIVITY_TYPE:Number = 8;
-
+	public static var SYSTEM_GATE_ACTIVITY_TYPE:Number = 9;
+	public static var CHOSEN_BRANCHING_ACTIVITY_TYPE:Number = 10;
+	public static var GROUP_BRANCHING_ACTIVITY_TYPE:Number = 11;
+	public static var TOOL_BRANCHING_ACTIVITY_TYPE:Number = 12;
+	public static var OPTIONS_WITH_SEQUENCES_TYPE:Number = 13; 
+	
+	/******************************************************************
+	
+	/**
 	* static final variables indicating the the category of activities
     *******************************************************************
 	public static var CATEGORY_SYSTEM:Number = 1;
@@ -61,13 +72,12 @@
 	/******************************************************************
 
 * </code></pre>
+* 
 * @author      DC
-* @version     0.1  
+* @version     2.1
 */
 class org.lamsfoundation.lams.authoring.Activity {
-	
-	
-	
+		
 	/*
 	//---------------------------------------------------------------------
     // Class Level Constants
@@ -128,7 +138,7 @@
 	private var _activityUIID:Number;			//*
 
 	private var _learningLibraryID:Number;		//*
-	//TODO: This will be removed by mai this week.
+	
 	private var _learningDesignID:Number;			
 	private var _libraryActivityID:Number;		
 
@@ -153,11 +163,6 @@
 	private var _activityToolContentID:Number;
 
 	private var _runOffline:Boolean;
-	/*
-	* these have now been removed, set in the tool content instead
-	private var _offlineInstructions:String;
-	private var _onlineInstructions:String;
-	*/
 	private var _defineLater:Boolean;
 	private var _createDateTime:Date;
 
@@ -170,16 +175,12 @@
 
 	private var _branchView:CanvasBranchView;
      
-    //Constructor
-	 /**
+	/**
+	 * Constructor
+	 * 
 	 * Creates an activity with the minimum of fields. 
 	 * 
-	 * @param   learningActivityTypeId 
-	 * @param   learningLibraryId      
-	 * @param   toolId                 
-	 * @param   toolContentId          
-	 * @param   helpText               
-	 * @param   libraryActivityUIImage  
+	 * @param   activityUIID
 	 */
     function Activity(activityUIID:Number){
         Debugger.log('activityUIID:'+activityUIID,Debugger.GEN,'constructor','Activity');
@@ -198,6 +199,7 @@
 	}
 	
 	//static class level methods
+	
 	/**
 	 * Created an array of activity types to be can be used as a dataprovider
 	 * @usage   
@@ -227,7 +229,6 @@
 	
 	//helper methods
 	
-	
 	public function isGateActivity():Boolean{
 		if (_activityTypeID == SYNCH_GATE_ACTIVITY_TYPE){
 			return true;
@@ -305,7 +306,9 @@
 			_defineLater = dto.defineLater;
 			_createDateTime = dto.createDateTime;
 			_groupingSupportType = dto.groupingSupportType;
-</pre></code>
+			_readOnly = dto.readOnly;
+			_stopAfterActivity = dto.stopAfterActivity;
+		</pre></code>
 	 * 
 	 * 
 	 * @usage   
@@ -350,8 +353,8 @@
 	
 	public function toData(){
 		var dto:Object = new Object();
-		//DC - Changed mode of toData to be ommiting fields with undefined values
 		
+		//DC - Changed mode of toData to be omiting fields with undefined values
 		if(_activityTypeID){		dto.activityTypeID 		= _activityTypeID;			}
 		if(_activityID){			dto.activityID			= _activityID;				}
 		if(_activityCategoryID){	dto.activityCategoryID	= _activityCategoryID;		}
@@ -372,7 +375,7 @@
 		dto.parentUIID = (_parentUIID==null) ? Config.NUMERIC_NULL_VALUE : _parentUIID;
 		dto.parentActivityID = (_parentActivityID==null) ? Config.NUMERIC_NULL_VALUE : _parentActivityID;
 		
-		//bnools need to be included - so do as follows:
+		//bools need to be included - so do as follows:
 		dto.applyGrouping = (_applyGrouping==null) ? false : _applyGrouping;
 		dto.runOffline = (_runOffline==null) ? false : _runOffline;
 		
@@ -384,7 +387,6 @@
 		else
 			dto.defineLater = (_defineLater==null) ? false : _defineLater;
 		
-		
 		if(_createDateTime){		dto.createDateTime		= _createDateTime;			}
 		if(_groupingSupportType){	dto.groupingSupportType = _groupingSupportType;		}
 		if(_readOnly){	dto.readOnly = _readOnly;	 }
@@ -402,7 +404,8 @@
 		return n;
 	}
 	
-	//getters and setters:
+	//getters and setters
+	
 	public function set objectType(a:String):Void{
 		_objectType = a;
 	}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Application.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Application.as,v
diff -u -r1.12 -r1.13
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Application.as	8 May 2008 06:14:15 -0000	1.12
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Application.as	20 Jun 2008 06:15:04 -0000	1.13
@@ -21,19 +21,19 @@
  * ************************************************************************
  */
 
-import org.lamsfoundation.lams.authoring.*       	//Design Data model n stuffimport org.lamsfoundation.lams.authoring.*       	//Design Data model n stuff
+import org.lamsfoundation.lams.authoring.*       				//Design Data model n stuff
 import org.lamsfoundation.lams.authoring.br.CanvasBranchView 
-import org.lamsfoundation.lams.authoring.tk.*       //Toolkit
-import org.lamsfoundation.lams.authoring.tb.*       //Toolbar
-import org.lamsfoundation.lams.authoring.cv.*       //Canvas
-import org.lamsfoundation.lams.authoring.layout.*       //Authoring Layout Managers
-import org.lamsfoundation.lams.common.ws.*          //Workspace
-import org.lamsfoundation.lams.common.comms.*       //communications
-import org.lamsfoundation.lams.common.util.*        //Utils
-import org.lamsfoundation.lams.common.dict.*        //Dictionary
-import org.lamsfoundation.lams.common.ui.*          //User interface
-import org.lamsfoundation.lams.common.style.*       //Themes/Styles
-import org.lamsfoundation.lams.common.layout.*		// Layouts
+import org.lamsfoundation.lams.authoring.tk.*       			//Toolkit
+import org.lamsfoundation.lams.authoring.tb.*       			//Toolbar
+import org.lamsfoundation.lams.authoring.cv.*       			//Canvas
+import org.lamsfoundation.lams.authoring.layout.*       		//Authoring Layout Managers
+import org.lamsfoundation.lams.common.ws.*          			//Workspace
+import org.lamsfoundation.lams.common.comms.*       			//Communications
+import org.lamsfoundation.lams.common.util.*        			//Utils
+import org.lamsfoundation.lams.common.dict.*        			//Dictionary
+import org.lamsfoundation.lams.common.ui.*          			//User interface
+import org.lamsfoundation.lams.common.style.*       			//Themes/Styles
+import org.lamsfoundation.lams.common.layout.*					// Layouts
 import org.lamsfoundation.lams.common.*             
 import mx.managers.*
 import mx.utils.*
@@ -69,15 +69,15 @@
     public static var WORKSPACE_W:Number = 300;
     public static var WORKSPACE_H:Number = 200;
     
-	private static var LOADING_ROOT_DEPTH:Number = 100;	//depth of the loading movie
-    private static var APP_ROOT_DEPTH:Number = 10; //depth of the application root
-    private static var DIALOGUE_DEPTH:Number = 55;	//depth of the dialogue box
-    private static var TOOLTIP_DEPTH:Number = 60;	//depth of the tooltip
-    private static var CURSOR_DEPTH:Number = 70;   //depth of the cursors
+	private static var LOADING_ROOT_DEPTH:Number = 100;		//depth of the loading movie
+    private static var APP_ROOT_DEPTH:Number = 10; 			//depth of the application root
+    private static var DIALOGUE_DEPTH:Number = 55;				//depth of the dialogue box
+    private static var TOOLTIP_DEPTH:Number = 60;				//depth of the tooltip
+    private static var CURSOR_DEPTH:Number = 70;   			//depth of the cursors
 	private static var CCURSOR_DEPTH:Number = 101;
-    public static var MENU_DEPTH:Number = 25;   //depth of the menu
-	public static var PI_DEPTH:Number = 35;   //depth of the menu
-    public static var TOOLBAR_DEPTH:Number = 50;   //depth of the menu
+    public static var MENU_DEPTH:Number = 25;   				//depth of the menu
+	public static var PI_DEPTH:Number = 35;
+    public static var TOOLBAR_DEPTH:Number = 50;   			
     private static var UI_LOAD_CHECK_INTERVAL:Number = 50;
 	private static var UI_LOAD_CHECK_TIMEOUT_COUNT:Number = 200;
 	private static var DATA_LOAD_CHECK_INTERVAL:Number = 50;
@@ -97,7 +97,7 @@
 	
 	private static var COMMON_COMPONENT_NO = 4;
 
-	private var _uiLoadCheckCount = 0;				// instance counter for number of times we have checked to see if theme and dict are loaded
+	private var _uiLoadCheckCount = 0;					// instance counter for number of times we have checked to see if theme and dict are loaded
 	private var _dataLoadCheckCount = 0;			
 	
 	private var _ddm:DesignDataModel;
@@ -112,7 +112,7 @@
     
     private var _cursorContainer_mc:MovieClip;         //Cursor container
     private var _menu_mc:MovieClip;                    //Menu bar clip
-    private var _container_mc:MovieClip;              //Main container
+    private var _container_mc:MovieClip;              	//Main container
 	private var _pi_mc:MovieClip;
     private var _toolbarContainer_mc:MovieClip;		//Container for Toolbar
     private var _UILoadCheckIntervalID:Number;         //Interval ID for periodic check on UILoad status
@@ -131,9 +131,6 @@
 	//clipboard
 	private var _clipboardData:Object;
 	private var _clipboardPasteCount:Number;
-	
-	// set up Key Listener
-	//private var keyListener:Object;
     
 	// operation modes
 	private var _isEditMode:Boolean;
@@ -217,6 +214,7 @@
         //Now that the config class is ready setup the UI and data, call to setupData() first in 
 		//case UI element constructors use objects instantiated with setupData()
         _root.preloader.complete();
+		
 		setupData();
 		checkDataLoaded();
     }
@@ -308,7 +306,7 @@
 						var e:LFError = new LFError(msg,"Canvas.setDroppedTemplateActivity",this,'_themeEventDispatched:'+_themeEventDispatched+' _dictionaryEventDispatched:'+_dictionaryEventDispatched);
 						e.showErrorAlert();
 						
-						//todo:  give the user a message
+						//TODO:  give the user a message
 						clearInterval(_UILoadCheckIntervalID);
 					}
                 }
@@ -397,7 +395,6 @@
 		//All Buttons Tab Index
 		_menu_mc.tabIndex = 100;
 		_toolbarContainer_mc.tabIndex = 200;
-		//_toolkit.tabIndex = 3;
 		_pi_mc.tabIndex = 400;
 	}
 	
@@ -488,9 +485,6 @@
     */
     private function onKeyDown(){
 		
-		//var mouseListener:Object = new Object();
-        //Debugger.log('Key.isDown(Key.CONTROL): ' + Key.isDown(Key.CONTROL),Debugger.GEN,'onKeyDown','Application');
-        //Debugger.log('Key: ' + Key.getCode(),Debugger.GEN,'onKeyDown','Application');
 		//the debug window:
         if (Key.isDown(Key.CONTROL) && Key.isDown(Key.ALT) && Key.isDown(QUESTION_MARK_KEY)) {
             if (!_debugDialog.content){
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ComplexActivity.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ComplexActivity.as,v
diff -u -r1.10 -r1.11
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ComplexActivity.as	12 May 2008 04:50:24 -0000	1.10
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ComplexActivity.as	20 Jun 2008 06:15:04 -0000	1.11
@@ -25,6 +25,7 @@
 import org.lamsfoundation.lams.common.Config;
 import org.lamsfoundation.lams.common.util.Debugger;
 import org.lamsfoundation.lams.common.util.StringUtils;
+
 /*
 * This class represents all the complex activity types.  they are not much different, so we can handle them in one class.
 * For reference these are the activity types
@@ -37,7 +38,7 @@
 * @version     0.1
 * @see		   Activity
 */
-class ComplexActivity extends Activity{
+class ComplexActivity extends Activity {
 	
 	private var _maxOptions:Number;
 	private var _minOptions:Number;
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.52 -r1.53
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	10 Jun 2008 06:58:47 -0000	1.52
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as	20 Jun 2008 06:15:04 -0000	1.53
@@ -27,6 +27,7 @@
 import org.lamsfoundation.lams.authoring.br.BranchConnector;
 import org.lamsfoundation.lams.common.*;
 import mx.events.*
+
 /*
 *
 * DesignDataModel stores all the data relating to the design
@@ -147,14 +148,17 @@
 	*/
 	public function addActivity(activity:Activity):Object{
 		var success = false;
+		
 		//create an Activity from the template actvity.
 		Debugger.log('activity:'+activity.title+', UIID:'+activity.activityUIID,4,'addActivity','DesignDataModel');
 		
 		//validate the activity ?		
 		//validate if we can do it?
+		
 		//dispatch an event before the design has changed
 		dispatchEvent({type:'ddmBeforeUpdate',target:this});
 		_activities.put(activity.activityUIID, activity);
+		
 		//pull it out to check it
 		var tmp:Activity = _activities.get(activity.activityUIID)
 		
@@ -163,6 +167,7 @@
 		}else{
 			return new LFError("Adding activity failed","addActivity",this,'activityUIID:'+activity.activityUIID);
 		}
+		
 		//dispatch an event now the design has changed
 		dispatchEvent({type:'ddmUpdate',target:this});
 		
@@ -179,7 +184,6 @@
 	public function removeActivity(activityUIID:Number):Object{
 		//dispatch an event to show the design has changed
 		dispatchEvent({type:'ddmBeforeUpdate',target:this});
-	
 		
 		var r:Object = _activities.remove(activityUIID);
 		if(r==null){
@@ -241,6 +245,7 @@
 		dispatchEvent({type:'ddmUpdate',target:this});
 		
 		//TODO some validation would be nice
+		
 		return true;
 	}
 	
@@ -347,13 +352,7 @@
 		dispatchEvent({type:'ddmBeforeUpdate',target:this});
 		Debugger.log('groupingUIID:'+grp.groupingUIID,Debugger.GEN,'addGrouping','DesignDataModel');
 		var r = _groupings.put(grp.groupingUIID,grp);
-		/*
-		if(r){
-			return r;
-		}else{
-			return new LFError("Adding grouping to hashtable failed","addGrouping",this,'groupingUIID:'+grp.groupingUIID);
-		}
-		*/
+
 		dispatchEvent({type:'ddmUpdate',target:this});
 		
 		return true;
@@ -444,6 +443,7 @@
 	public function setDesign(design:Object):Boolean{
 		//note the design must be empty to call this
 		//note: Dont fire the update event as we dont want to store this change in an undo!
+		
 		//TODO: Validate that the design is clear
 		var success:Boolean = false;
 		
@@ -506,15 +506,13 @@
 			
 			} else if(dto.activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE || dto.activityTypeID == Activity.PARALLEL_ACTIVITY_TYPE || dto.activityTypeID == Activity.OPTIONS_WITH_SEQUENCES_TYPE){
 				
-				//TODO: Test this!
 				var cAct:ComplexActivity= new ComplexActivity(dto.activityUIID);
 				cAct.populateFromDTO(dto);				
 				
 				_activities.put(cAct.activityUIID,cAct);
 					
 			} else if(dto.activityTypeID == Activity.GROUPING_ACTIVITY_TYPE){
 				
-				//TODO: Test this code when we are able to save and then open a design with grouping
 				var newGroupActivity:GroupingActivity = new GroupingActivity(dto.activityUIID);
 				newGroupActivity.populateFromDTO(dto);
 				
@@ -553,10 +551,11 @@
 		
 		//set the groupings in the hashtable
 		for(var i=0; i<design.groupings.length;i++){
-			//TODO: Test this when the server can save and open a design with groupings.
 			Debugger.log('Adding grouping UIID:'+design.groupings[i].groupingUIID,Debugger.GEN,'setDesign','DesignDataModel');
+			
 			var gdto = design.groupings[i];
 			var newGrouping:Grouping = new Grouping(gdto.groupingUIID);
+			
 			newGrouping.populateFromDTO(gdto);
 			_groupings.put(newGrouping.groupingUIID,newGrouping);
 		
@@ -706,41 +705,13 @@
 	 */
 	public function toData():Object{
 		var design:Object = new Object();
-		//if null, use default
 		
-		//TODO: get this sorted - query string
 		Debugger.log('1 UserID:'+_userID,Debugger.GEN,'toData','DesignDataModel');
 		
-		
 		if(_copyTypeID == undefined){
 			_copyTypeID = COPY_TYPE_ID_AUTHORING;
 		}
 		
-		/*
-		* //09-11-05: converted to not including nulls in the packet
-		design.objectType = (_objectType) ? _objectType : Config.STRING_NULL_VALUE;
-		design.copyTypeID = (_copyTypeID) ? _copyTypeID : Config.NUMERIC_NULL_VALUE;
-		design.learningDesignID = (_learningDesignID) ? _learningDesignID : Config.NUMERIC_NULL_VALUE;
-		design.title = _title ? _title : Config.STRING_NULL_VALUE;
-		design.description = (_description) ? _description : Config.STRING_NULL_VALUE;
-		design.helpText = (_helpText) ? _helpText : Config.STRING_NULL_VALUE;
-		design.version = (_version) ? _version : Config.STRING_NULL_VALUE;
-		design.userID = (_userID) ? _userID : Config.NUMERIC_NULL_VALUE;
-		design.duration = (_duration) ? _duration: Config.NUMERIC_NULL_VALUE;
-		design.readOnly = (_readOnly!=null) ? _readOnly : Config.BOOLEAN_NULL_VALUE;
-		design.validDesign = (_validDesign!=null) ? _validDesign : Config.BOOLEAN_NULL_VALUE;
-		design.maxID = (_maxID) ? _maxID : Config.NUMERIC_NULL_VALUE;
-		design.firstActivityID = (_firstActivityID) ? _firstActivityID : Config.NUMERIC_NULL_VALUE;
-		design.firstActivityUIID = (_firstActivityUIID) ? _firstActivityUIID : Config.NUMERIC_NULL_VALUE;
-		design.parentLearningDesignID= (_parentLearningDesignID) ? _parentLearningDesignID: Config.NUMERIC_NULL_VALUE;
-		design.licenseID= (_licenseID) ? _licenseID: Config.NUMERIC_NULL_VALUE;
-		design.licenseText= (_licenseText) ? _licenseText: Config.STRING_NULL_VALUE;
-		design.workspaceFolderID = (_workspaceFolderID) ? _workspaceFolderID : Config.NUMERIC_NULL_VALUE;
-		design.createDateTime = (_createDateTime) ? _createDateTime : Config.DATE_NULL_VALUE;
-		design.lastModifiedDateTime= (_lastModifiedDateTime) ? _lastModifiedDateTime: Config.DATE_NULL_VALUE;
-		design.dateReadOnly = (_dateReadOnly) ? _dateReadOnly: Config.DATE_NULL_VALUE;
-		*/
-		
 		//if the value is null, it is not included in the DTO
 		if(_copyTypeID == COPY_TYPE_ID_RUN && !_editOverrideLock){
 			design.copyTypeID = COPY_TYPE_ID_AUTHORING;
@@ -755,8 +726,8 @@
 		if(_userID){			design.userID			= _userID;				}
 		if(_editOverrideUserID){	design.editOverrideUserID = _editOverrideUserID;	}
 		if(_duration){			design.duration			= _duration;			}
-		//readOnly must be in the DTO, so if its null, then give a false
 		
+		//readOnly must be in the DTO, so if its null, then give a false
 		if(_copyTypeID == COPY_TYPE_ID_RUN && !_editOverrideLock){
 			design.readOnly = false;
 		} else {
@@ -773,7 +744,6 @@
 		
 		design.saveMode =  (_saveMode!=null) ? _saveMode : Config.NUMERIC_NULL_VALUE;
 		
-		
 		if(_maxID){				design.maxID			= _maxID;				}
 		if(_firstActivityID){	design.firstActivityID	= _firstActivityID;		}
 		if(_firstActivityUIID){	design.firstActivityUIID= _firstActivityID;		}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Grouping.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Grouping.as,v
diff -u -r1.8 -r1.9
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Grouping.as	10 Aug 2007 06:43:47 -0000	1.8
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Grouping.as	20 Jun 2008 06:15:04 -0000	1.9
@@ -54,7 +54,9 @@
 		
 		Debugger.log('Created a new Grouping:'+_groupingUIID,Debugger.GEN,'Constructor','Grouping');
 	}
+	
 	//static class level methods
+	
 	/**
 	 * Created an array of grouping types to be can be used as a dataprovider
 	 * @usage   
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/GroupingActivity.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/GroupingActivity.as,v
diff -u -r1.2 -r1.3
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/GroupingActivity.as	8 May 2008 06:14:15 -0000	1.2
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/GroupingActivity.as	20 Jun 2008 06:15:04 -0000	1.3
@@ -22,6 +22,7 @@
  */
 
 import org.lamsfoundation.lams.authoring.*;
+
 /*
 *
 * @author      DC
@@ -34,7 +35,6 @@
 	private var _createGroupingID:Number;
 	private var _createGroupingUIID:Number;
 
-	
 	function GroupingActivity(activityUIID:Number){
 		super(activityUIID);
 		_activityTypeID = GROUPING_ACTIVITY_TYPE;
@@ -43,9 +43,8 @@
 	}
 	
 	
-	
 	/**
-	 * Creates from a dto... which is nice
+	 * Creates from a dto
 	 * @usage   
 	 * @param   dto 
 	 * @return  
@@ -76,7 +75,6 @@
 	 * @return  the copy
 	 */
 	public function clone():GroupingActivity{
-		// TODO: new grouping object
 		var dto:Object = toData();
 		var ga = new GroupingActivity();
 		ga.populateFromDTO(dto);
@@ -86,7 +84,6 @@
 	
 	//get and sets
 	
-	
 	/**
 	 * 
 	 * @usage   
@@ -96,6 +93,7 @@
 	public function set createGroupingID (newcreateGroupingID:Number):Void {
 		_createGroupingID = newcreateGroupingID;
 	}
+	
 	/**
 	 * 
 	 * @usage   
@@ -104,7 +102,6 @@
 	public function get createGroupingID ():Number {
 		return _createGroupingID;
 	}
-
 	
 	/**
 	 * 
@@ -123,10 +120,6 @@
 	public function get createGroupingUIID ():Number {
 		return _createGroupingUIID;
 	}
-
 	
-	
-
-	
 }
 
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolActivity.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolActivity.as,v
diff -u -r1.5 -r1.6
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolActivity.as	8 May 2008 06:14:15 -0000	1.5
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolActivity.as	20 Jun 2008 06:15:04 -0000	1.6
@@ -63,11 +63,9 @@
 		_activityTypeID = TOOL_ACTIVITY_TYPE;
 		_toolOutputDefinitions = new Hashtable("_toolOutputDefinitions");
 		
-		//assign default values:
-		
 	}
 	
-	//todo ADD A VALIDATE() FUNCTION
+	//TODO: ADD A VALIDATE() FUNCTION
 	
 	/**
 	 * Pass an object with all the fields of a ToolActivity into this function to populate:
@@ -114,37 +112,11 @@
 	 * @return  Noting
 	 */
 	public function populateFromDTO(dto:Object):Void{
-			/*
-			//activity properties:
-			_activityTypeID = dto.activityTypeID;
-			_activityID = dto.activityID;
-			_activityCategoryID = dto.activityCategoryID;
-			_activityUIID = dto.activityUIID;
-			_learningLibraryID = dto.learningLibraryID;
-			_learningDesignID = dto.learningDesignID;
-			_libraryActivityID = dto.libraryActivityID;
-			_parentActivityID = dto.parentActivityID;
-			_parentUIID = dto.parentUIID
-			_orderID = dto.orderID
-			_groupingID = dto.groupingID;
-			_groupingUIID = dto.groupingUIID
-			_title = dto.title;
-			_description = dto.description;
-			_helpText =  dto.helpText;
-			_yCoord = dto.yCoord;
-			_xCoord = dto.xCoord;
-			_libraryActivityUIImage = dto.libraryActivityUIImage;
-			_applyGrouping = dto.applyGrouping;
-			_runOffline = dto.runOffline;
-			_defineLater = dto.defineLater;
-			_createDateTime = dto.createDateTime;
-			_groupingSupportType = dto.groupingSupportType;
-			*/
 			
-			
 			//first do the super method for activity props
 			super.populateFromDTO(dto);
-			//Toolactivity class props
+			
+			//Tool Activity class props
 			if(StringUtils.isWDDXNull(dto.authoringURL)) { _authoringURL = null }
 			else { _authoringURL = dto.authoringURL; }
 			
@@ -169,25 +141,21 @@
 			_supportsOutputs = dto.supportsOutputs;
 			
 			activityToolContentID = _toolContentID;
-			
-			//maybe return isValid();
 	}
 	
 	//to data for serialising:
 	
 	public function toData():Object{
 		var dto = super.toData();
+		
 		dto.authoringURL = (_authoringURL) ?  _authoringURL : Config.STRING_NULL_VALUE;	
 		dto.helpURL = (_helpURL) ? _helpURL : Config.STRING_NULL_VALUE;
 		dto.toolDisplayName = (_toolDisplayName) ?  _toolDisplayName: Config.STRING_NULL_VALUE;	
 		dto.toolSignature = (_toolSignature) ? _toolSignature: Config.STRING_NULL_VALUE;
-		//if(isCopy) { Application.getInstance().getCanvas().getCanvasModel().setDefaultToolContentID(this); }
 		
 		dto.toolContentID = (_toolContentID) ?  _toolContentID: Config.NUMERIC_NULL_VALUE;	
-		
 		dto.toolID = (_toolID) ?  _toolID: Config.NUMERIC_NULL_VALUE;	
 		
-		
 		/* THESE are internal flags, not part of the design
 		dto.supportsContribute = (_supportsContribute!=null) ?  _supportsContribute: Config.BOOLEAN_NULL_VALUE;	
 		dto.supportsDefineLater = (_supportsDefineLater!=null) ?  _supportsDefineLater: Config.BOOLEAN_NULL_VALUE;	
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/BranchConnector.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/BranchConnector.as,v
diff -u -r1.14 -r1.15
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/BranchConnector.as	8 Feb 2008 07:18:03 -0000	1.14
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/BranchConnector.as	20 Jun 2008 06:15:04 -0000	1.15
@@ -59,8 +59,7 @@
 	}
 	
 	public function init():Void{
-		_drawnLineStyle = 0xAFCE63; //0xEA00FF;
-		//arrow_mc.setStyle("backgroundColor", "0xEA00FF");
+		_drawnLineStyle = 0xAFCE63;
 		arrow_mc.setStyle("backgroundColor", "0xAFCE63");
 		
 		if(branch.direction == DIR_SINGLE)
@@ -69,6 +68,7 @@
 			draw();
 		
 		Debugger.log("is open: " + model.activeView.isOpen, Debugger.CRITICAL, "init", "BranchConnector");
+		
 		if(branch.direction != DIR_TO_END && model.activeView.isOpen)
 			createBranchLabel();
 	}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/BranchMappingDialog.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/BranchMappingDialog.as,v
diff -u -r1.4 -r1.5
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/BranchMappingDialog.as	15 Jan 2008 05:15:00 -0000	1.4
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/BranchMappingDialog.as	20 Jun 2008 06:15:04 -0000	1.5
@@ -44,31 +44,31 @@
 class BranchMappingDialog extends MovieClip implements Dialog {
 
     //References to components + clips 
-    private var _container:MovieClip;  //The container window that holds the dialog
+    private var _container:MovieClip;  		//The container window that holds the dialog
     
 	private var _primary:Array;
 	private var _secondary:Array;
 	
-    private var close_btn:Button;         // Close button
+    private var close_btn:Button;         		// Close button
 	
 	private var add_match_btn:Button;
 	private var remove_match_btn:Button;
     
-    private var panel:MovieClip;       //The underlaying panel base
+    private var panel:MovieClip;       		//The underlaying panel base
     
     private var primary_lst:List;  
     private var secondary_lst:List;    
     
-    private var primary_lst_lbl:Label;        // Group and Branches list labels
+    private var primary_lst_lbl:Label;        	// Group and Branches list labels
     private var secondary_lst_lbl:Label;
 	private var match_dgd_lbl:Label;
 	
-	private var match_dgd:DataGrid;		// Group-Branch Matching listbox
+	private var match_dgd:DataGrid;			// Group-Branch Matching listbox
     
 	private var branches_loaded:Boolean;
 	
-    private var fm:FocusManager;            //Reference to focus manager
-    private var themeManager:ThemeManager;  //Theme manager
+    private var fm:FocusManager;            	//Reference to focus manager
+    private var themeManager:ThemeManager;  	//Theme manager
 	public var app:Application;
 	
     //Dimensions for resizing
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchingDiagram.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchingDiagram.as,v
diff -u -r1.4 -r1.5
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchingDiagram.as	4 Jun 2008 05:25:10 -0000	1.4
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchingDiagram.as	20 Jun 2008 06:15:04 -0000	1.5
@@ -38,7 +38,6 @@
  **/
 class CanvasBranchingDiagram extends MovieClip  {
 	
-	//private static var CIRCLE_SIZE:Number = 3;
 	private static var ACT_SIZE:Number = 4;
 	private static var BRANCH_LIMIT:Number = 5;
 	
@@ -222,35 +221,6 @@
 		drawActivity(container, endPoint.x, endPoint.y, ACT_SIZE);
 	}
 	
-	/**
-	private function drawCircle(mc:MovieClip, x:Number, y:Number, r:Number, indicateMore:Boolean, indicateStops:Boolean):Void {
-		  
-		  
-		  if(indicateStops) mc.lineStyle(0, stopColor);
-		  else mc.lineStyle(0, lineColor);
-		  
-		  if(indicateStops) mc.beginFill(stopColor);
-		  else mc.beginFill(fillColor);
-		  
-		  mc.moveTo(x+r, y);
-		  mc.curveTo(r+x, Math.tan(Math.PI/8)*r+y, Math.sin(Math.PI/4)*r+x, Math.sin(Math.PI/4)*r+y);
-		  mc.curveTo(Math.tan(Math.PI/8)*r+x, r+y, x, r+y);
-		  mc.curveTo(-Math.tan(Math.PI/8)*r+x, r+y, -Math.sin(Math.PI/4)*r+x, Math.sin(Math.PI/4)*r+y);
-		  mc.curveTo(-r+x, Math.tan(Math.PI/8)*r+y, -r+x, y);
-		  mc.curveTo(-r+x, -Math.tan(Math.PI/8)*r+y, -Math.sin(Math.PI/4)*r+x, -Math.sin(Math.PI/4)*r+y);
-		  mc.curveTo(-Math.tan(Math.PI/8)*r+x, -r+y, x, -r+y);
-		  mc.curveTo(Math.tan(Math.PI/8)*r+x, -r+y, Math.sin(Math.PI/4)*r+x, -Math.sin(Math.PI/4)*r+y);
-		  mc.curveTo(r+x, -Math.tan(Math.PI/8)*r+y, r+x, y);
-		  mc.endFill();
-		 
-		 if(indicateMore) {
-			 drawCircle(mc, x+(CIRCLE_SIZE*2)+1, y, CIRCLE_SIZE-1);
-			 drawCircle(mc, x+(CIRCLE_SIZE*4)+1, y, CIRCLE_SIZE-2);
-		 }
-		  
-	}
-	*/
-	
 	private function drawActivity(mc:MovieClip, x:Number, y:Number, r:Number, indicateMore:Boolean, indicateStops:Boolean, useAssocColor:Object):Void {
 		  if(indicateStops) mc.lineStyle(0.5, stopColor);
 		  else mc.lineStyle(0.5, lineColor);
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.11 -r1.12
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ConditionMatchingDialog.as	30 May 2008 02:20:04 -0000	1.11
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ConditionMatchingDialog.as	20 Jun 2008 06:15:04 -0000	1.12
@@ -166,7 +166,6 @@
     */
     public function themeChanged(event:Object):Void{
         if(event.type=='themeChanged') {
-            //Theme has changed so update objects to reflect new styles
             setStyles();
         }else {
             Debugger.log('themeChanged event broadcast with an object.type not equal to "themeChanged"',Debugger.CRITICAL,'themeChanged','ConditionMatchingDialog');
@@ -183,7 +182,6 @@
 		if(conditions_lst.length > 0) {
 			LFMessage.showMessageAlert(Dictionary.getValue("branch_mapping_auto_condition_msg"), Proxy.create(this, cleanupUnmappedConditions));
 		} else {
-			//close popup
 			_container.deletePopUp();
 		}
 		
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.34 -r1.35
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as	4 Jun 2008 05:56:26 -0000	1.34
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as	20 Jun 2008 06:15:04 -0000	1.35
@@ -58,7 +58,7 @@
 	private static var DEFINITION_DELIMITER:String = "#";
 	
 	//References to components + clips 
-    private var _container:MovieClip;  //The container window that holds the dialog
+    private var _container:MovieClip;  					//The container window that holds the dialog
     
 	private var _definitions:Array;
 	private var _conditions:Array;
@@ -90,11 +90,11 @@
 	private var _condition_from_lbl:Label;
 	private var _condition_to_lbl:Label;
 	
-	private var _bgpanel:MovieClip;       //The underlaying panel base
+	private var _bgpanel:MovieClip;       					//The underlaying panel base
     
     private var app:Application;
-	private var fm:FocusManager;            //Reference to focus manager
-    private var themeManager:ThemeManager;  //Theme manager
+	private var fm:FocusManager;           				//Reference to focus manager
+    private var themeManager:ThemeManager;  				//Theme manager
 	
     //Dimensions for resizing
     private var xOkOffset:Number;
@@ -394,7 +394,6 @@
 	 * @usage   
 	 * @return  
 	 */
-	
 	private function addCondition(condition:ToolOutputCondition):Void {
 		
 		switch(condition.type) {
@@ -762,7 +761,7 @@
     * Main resize method, called by scrollpane container/parent
     */
     public function setSize(w:Number,h:Number):Void{
-		//Size the panel
+		// Size the panel
         _bgpanel.setSize(w,h);
 
 		_condition_item_dgd.setSize(w - 2*_condition_item_dgd._x, h*0.45);
@@ -777,7 +776,7 @@
 		_toolOutputDefin_cmb.setSize(w - 2*_toolOutputDefin_cmb._x - help_btn.width - 5, 22);
 		_toolOutputLongOptions_cmb.setSize(_toolOutputDefin_cmb._width, 22);
 		
-		//Buttons
+		// Buttons
 		add_btn._x = _toolOutputLongOptions_cmb._x + _toolOutputLongOptions_cmb._width - add_btn.width;
 		remove_item_btn.move(_condition_item_dgd._x + _condition_item_dgd._width - remove_item_btn.width, _condition_item_dgd._y + _condition_item_dgd._height + 5);
 		clear_all_btn.move(remove_item_btn._x - clear_all_btn.width - 5, remove_item_btn._y);
@@ -790,8 +789,6 @@
 		
     }
     
-    //Gets+Sets
-    
 	public function set definitions(a:Array):Void {
 		_definitions = new Array();
 		
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Bin.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Bin.as,v
diff -u -r1.5 -r1.6
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Bin.as	27 May 2008 02:01:37 -0000	1.5
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Bin.as	20 Jun 2008 06:15:46 -0000	1.6
@@ -93,7 +93,6 @@
 	}
 	
 	private function setStyles():Void {
-		//var styleObj = _tm.getStyleObject("bin");
 		over_mc._alpha = 40;
 	}
 	
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as,v
diff -u -r1.39 -r1.40
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as	13 Jun 2008 06:09:46 -0000	1.39
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as	20 Jun 2008 06:16:05 -0000	1.40
@@ -193,12 +193,12 @@
 			return;
 		}
 		
-		//TODO: Set the results from wsp into design.
 		if(workspaceResultDTO != null){
 			if(workspaceResultDTO.selectedResourceID != null){
 				//must be overwriting an existing design as we have a new resourceID
 				_ddm.learningDesignID = workspaceResultDTO.selectedResourceID;
 			}
+			
 			_ddm.workspaceFolderID = workspaceResultDTO.targetWorkspaceFolderID;
 			_ddm.title = workspaceResultDTO.resourceName;
 			_ddm.description = workspaceResultDTO.resourceDescription;
@@ -356,23 +356,19 @@
 			case(Activity.TOOL_ACTIVITY_TYPE):
 				actType = "Tool"
 				 actToAdd = ToolActivity(actToCopy.clone());
-				//give it a new UIID:
 				actToAdd.activityUIID = _ddm.newUIID();
 			break;
 			case(Activity.OPTIONAL_ACTIVITY_TYPE):
 				actToAdd = Activity(actToCopy.clone());
-				//give it a new UIID:
 				actToAdd.activityUIID = _ddm.newUIID();
 			
 			case(Activity.PARALLEL_ACTIVITY_TYPE):
 				actType = "Parallel"
 				actToAdd = Activity(actToCopy.clone());
-				
-				//give it a new UIID:
 				actToAdd.activityUIID = _ddm.newUIID();
 				
-				
 			Debugger.log('parallel activity given new UIID of:'+actToAdd.activityUIID ,Debugger.GEN,'setDroppedTemplateActivity','Canvas');			
+			
 			//now get this acts children and add them to the design (WHINEY VOICE:"will somebody pleeeease think of the children.....")
 			for(var i=0;i<ta.childActivities.length;i++){
 					
@@ -381,15 +377,19 @@
 					
 					var child:Activity = ToolActivity(ta.childActivities[i].clone());
 					child.activityUIID = _ddm.newUIID();
+					
 					//tell it who's the daddy (set its parent UIID)
 					child.parentUIID = actToAdd.activityUIID;
 					Debugger.log('child.parentUIID:'+child.parentUIID,Debugger.GEN,'setDroppedTemplateActivity','Canvas');			
 					child.learningDesignID = _ddm.learningDesignID;
+					
 					//does not need mouse co-ords as in in container act.
 					
 					_ddm.addActivity(child);
+					
 					var callback:Function = Proxy.create(this,setNewChildContentID, child);
 					var passChildToolID = ta.childActivities[i].toolID;
+					
 					Application.getInstance().getComms().getRequest('authoring/author.do?method=getToolContentID&toolID='+passChildToolID,callback, false);
 			}				 
 			break;
@@ -402,7 +402,6 @@
 		
 		//Set up the main activity for the canvas:
 		
-		
 		//assign it the LearningDesignID
 		actToAdd.learningDesignID = _ddm.learningDesignID;
 		
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as,v
diff -u -r1.47 -r1.48
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as	3 Jun 2008 06:34:55 -0000	1.47
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as	20 Jun 2008 06:15:46 -0000	1.48
@@ -30,6 +30,7 @@
 import org.lamsfoundation.lams.monitoring.mv.*;
 import org.lamsfoundation.lams.monitoring.mv.tabviews.LearnerTabView;
 import org.lamsfoundation.lams.common.style.*
+
 import mx.controls.*
 import com.polymercode.Draw;
 import mx.managers.*
@@ -406,19 +407,7 @@
 		}
 	}
 	
-	
 	/**
-	 * Add + icon to indicate that more users are currently at the Activity. 
-	 * We are unable to display all the users across the Activity's panel.
-	 * 
-	 * @usage   
-	 * @param   target  The target reference, this class OR a parent
-	 * @param   x_pos  	The X position of the icon
-	 * @return  
-	 */
-
-	
-	/**
 	 * Does the work of laying out the screen assets.
 	 * Depending on type of Activity different bits will be shown
 	 * @usage   
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasComplexView.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasComplexView.as,v
diff -u -r1.10 -r1.11
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasComplexView.as	4 Apr 2008 02:27:33 -0000	1.10
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasComplexView.as	20 Jun 2008 06:15:46 -0000	1.11
@@ -40,7 +40,7 @@
 import mx.utils.*;
 
 /**
-*Authoring view for the canvas
+* Authoring view for the canvas
 * Relects changes in the CanvasModel
 */
 
@@ -60,8 +60,6 @@
 	private var _parentActivity:Object;
 	private var _prevActiveView;
 	
-	//private var canvas_scp:ScrollPane;
-	
 	private var lastScreenWidth:Number = 500;
 	private var lastScreenHeight:Number = 300;
 	
@@ -75,7 +73,6 @@
 		_canvasComplexView = this;
 		_tm = ThemeManager.getInstance();
 		_branchingToClear = new Array();
-		//activitiesDisplayed = new Hashtable("activitiesDisplayed");
 		
         //Init for event delegation
         mx.events.EventDispatcher.initialize(this);
@@ -246,7 +243,6 @@
 		
 		//take action depending on act type
 		if(a.activityTypeID==Activity.PARALLEL_ACTIVITY_TYPE){
-			//get the children
 			var children:Array = ddm.getComplexActivityChildren(a.activityUIID);
 			
 			var newActivity_mc =  (_module != "monitoring") ? activityLayer.createChildAtDepth("CanvasParallelActivity",DepthManager.kTop,{_x: 0, _y: 0, _activity:a,_children:children,_canvasController:cvc,_canvasComplexView:ccv, _locked:a.isReadOnly()}) 
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as,v
diff -u -r1.40 -r1.41
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as	23 May 2008 07:24:53 -0000	1.40
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as	20 Jun 2008 06:15:46 -0000	1.41
@@ -78,7 +78,7 @@
 	private static var AUTOSAVE_CONFIG:String = "autosave";
 	private static var AUTOSAVE_TAG:String = "cv.ddm.autosave.user.";
    
-   private var _bin:MovieClip;	//bin
+   private var _bin:MovieClip;
 	
 	private var _target_mc:MovieClip;
 	
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as,v
diff -u -r1.16 -r1.17
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as	3 Jun 2008 06:34:55 -0000	1.16
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as	20 Jun 2008 06:15:46 -0000	1.17
@@ -42,8 +42,8 @@
 class org.lamsfoundation.lams.authoring.cv.CanvasParallelActivity extends MovieClip implements ICanvasActivity{  
 	
 	private var CHILD_OFFSET_X:Number = 8;
-	private var CHILD1_OFFSET_Y:Number = 45 //67.5;
-	private var CHILD2_OFFSET_Y:Number = 108 //130.5;
+	private var CHILD1_OFFSET_Y:Number = 45;
+	private var CHILD2_OFFSET_Y:Number = 108;
 	
 	private var newContainerXCoord:Number; 
 	private var newContainerYCoord:Number;
@@ -132,10 +132,10 @@
 		newContainerXCoord = container_pnl._width/2;
 		newContainerYCoord = container_pnl._height/2;
 			
-		child1.xCoord = CHILD_OFFSET_X //+ (newContainerXCoord-CHILD_OFFSET_X);
+		child1.xCoord = CHILD_OFFSET_X;
 		child1.yCoord = CHILD1_OFFSET_Y;
-		child2.xCoord = CHILD_OFFSET_X //+ (newContainerXCoord-CHILD_OFFSET_X);
-		child2.yCoord = CHILD2_OFFSET_Y //+ newContainerYCoord;
+		child2.xCoord = CHILD_OFFSET_X;
+		child2.yCoord = CHILD2_OFFSET_Y;
 		
 		//so now it is placed on in the IDE and we just call init
 		Debugger.log("fromModuleTab: " + fromModuleTab, Debugger.CRITICAL, "init", "CanvasParallelActivity");
@@ -152,9 +152,6 @@
 			Debugger.log("initialising for monitor: " + child1.activityUIID + " " + child2.activityUIID, Debugger.CRITICAL, "init", "CanvasParallelActivity");
 			Debugger.log("controller for monitor: " + _monitorController, Debugger.CRITICAL, "init", "CanvasParallelActivity");
 			
-			//child1_mc = childActivities_mc.createChildAtDepth("CanvasActivity",DepthManager.kTop,{_activity:child1 ,_monitorController:_monitorController, _monitorView:_monitorTabView, _module:"monitoring", learnerContainer:learnerContainer});
-			//child2_mc = childActivities_mc.createChildAtDepth("CanvasActivity",DepthManager.kTop,{_activity:child2 ,_monitorController:_monitorController, _monitorView:_monitorTabView, _module:"monitoring", learnerContainer:learnerContainer});
-			
 			if(_canvasBranchView != null) {
 				CanvasActivity(child1_mc).init({activity:child1, _monitorController:_monitorController, _monitorView:_canvasBranchView, _module:"monitoring", learnerContainer:learnerContainer});
 				CanvasActivity(child2_mc).init({activity:child2, _monitorController:_monitorController, _monitorView:_canvasBranchView, _module:"monitoring", learnerContainer:learnerContainer});
@@ -306,7 +303,6 @@
 		container_pnl.setStyle('styleName',styleObj);
 		styleObj = _tm.getStyleObject ('parallelHeadPanel');
 		header_pnl.setStyle('styleName',styleObj);
-		//container_pnl.setStyle("backgroundColor",0x4289FF);
 	}
 	
 	private function setLocking():Void{
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSequenceActivity.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSequenceActivity.as,v
diff -u -r1.28 -r1.29
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSequenceActivity.as	4 Apr 2008 02:27:33 -0000	1.28
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSequenceActivity.as	20 Jun 2008 06:15:46 -0000	1.29
@@ -39,7 +39,7 @@
 import mx.utils.*;
 
 /**  
-* CanvasActivity - 
+* CanvasSequenceActivity
 */  
 class org.lamsfoundation.lams.authoring.cv.CanvasSequenceActivity extends MovieClip implements ICanvasActivity{
   
@@ -294,17 +294,6 @@
 	}
 	
 	/**
-	 * Add + icon to indicate that more users are currently at the Activity. 
-	 * We are unable to display all the users across the Activity's panel.
-	 * 
-	 * @usage   
-	 * @param   target  The target reference, this class OR a parent
-	 * @param   x_pos  	The X position of the icon
-	 * @return  
-	 */
-
-	
-	/**
 	 * Does the work of laying out the screen assets.
 	 * Depending on type of Activity different bits will be shown
 	 * @usage   
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as,v
diff -u -r1.28 -r1.29
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as	8 May 2008 06:14:16 -0000	1.28
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as	20 Jun 2008 06:15:46 -0000	1.29
@@ -310,7 +310,6 @@
 			var children:Array = cm.getCanvas().ddm.getComplexActivityChildren(a.activityUIID);
 			var newActivity_mc = activityComplexLayer.createChildAtDepth("CanvasOptionalActivity",DepthManager.kTop,{_activity:a,_children:children,_canvasController:cvc,_canvasView:cvv,_locked:a.isReadOnly()});
 			
-			//cm.addToBranchingQueue(newActivity_mc);
 			cm.activitiesDisplayed.put(a.activityUIID,newActivity_mc);
 			
 			Debugger.log('Optional activity Type a.title:'+a.title+','+a.activityUIID+' added to the cm.activitiesDisplayed hashtable :'+newActivity_mc,4,'drawActivity','CanvasView');
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/ICanvasActivity.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/ICanvasActivity.as,v
diff -u -r1.2 -r1.3
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/ICanvasActivity.as	5 Jun 2007 05:09:56 -0000	1.2
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/ICanvasActivity.as	20 Jun 2008 06:15:46 -0000	1.3
@@ -31,27 +31,23 @@
  */
 interface org.lamsfoundation.lams.authoring.cv.ICanvasActivity {
    
-  
-  /**
-   * Sets the activity for this Canvas Element. If its a complex activity it will get the mainActivity.
-   */
-  public function getActivity():Activity;
+	/**
+	* Sets the activity for this Canvas Element. If its a complex activity it will get the mainActivity.
+	*/
+	public function getActivity():Activity;
 
-  /**
-   * Sets the activity for this Canvas Element.  If its a complex activity it will set the mainActivity.
-   */
- public function setActivity(newActivity:Activity);
+	/**
+	* Sets the activity for this Canvas Element.  If its a complex activity it will set the mainActivity.
+	*/
+	public function setActivity(newActivity:Activity);
  
-  /**
-   * Retrieves the visible width and height of the canvas element, usefull for the transition class
-   */
- public function getVisibleWidth():Number;
+	/**
+	* Retrieves the visible width and height of the canvas element, usefull for the transition class
+	*/
+	public function getVisibleWidth():Number;
  
- public function getVisibleHeight():Number;
+	public function getVisibleHeight():Number;
  
- public function setSelected(isSelected);
- 
- 
+	public function setSelected(isSelected);
 
-
 }
\ No newline at end of file
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.39 -r1.40
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	6 Jun 2008 06:07:28 -0000	1.39
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as	20 Jun 2008 06:15:46 -0000	1.40
@@ -680,8 +680,6 @@
 				mins_stp.value = 0;
 			}
 		}
-		
-		//TODO: set the stepper values too!
 	
 	}
 	
@@ -691,7 +689,6 @@
 		//loop through combo to find SI of our branching activity type
 		for (var i=0; i<branchType_cmb.dataProvider.length;i++){
 			if(_canvasModel.selectedItem.activity.activityTypeID == branchType_cmb.dataProvider[i].data){
-				
 				branchType_cmb.selectedIndex=i;
 			}
 		}
@@ -702,10 +699,7 @@
 		
 		if(_canvasModel.selectedItem.activity.activityTypeID == Activity.GROUP_BRANCHING_ACTIVITY_TYPE) {
 			showAppliedGroupingControls(true, !ba.readOnly);
-			showGroupBasedBranchingControls(true, !ba.readOnly);
-			
-			Debugger.log("defineLater: " + ba.defineLater, Debugger.CRITICAL, "showBranchingActivityProperties", "PropertyInspector");
-			//_define_monitor_cb.selected = (ba.defineLater != null) ? ba.defineLater : false;
+			showGroupBasedBranchingControls(true, !ba.readOnly);
 		} else if(_canvasModel.selectedItem.activity.activityTypeID == Activity.TOOL_BRANCHING_ACTIVITY_TYPE) {
 			if(toolActs_cmb.selectedIndex == 0) {
 				_canvasModel.selectedItem.activity.toolActivityUIID = null;
@@ -715,10 +709,7 @@
 	
 	}
 	
-	private function showTransitionProperties(t:Transition){
-		//TODO: show from act and to act
-		
-	}
+	private function showTransitionProperties(t:Transition){}
 	
 	private function showBranchControls(v:Boolean):Void {
 		_pi_defaultBranch_cb.visible = v;
@@ -743,7 +734,8 @@
 	 * Shows which grouping activity is applied to this activity, 
 	 * if you click the edit button, the the activity is selected, 
 	 * and therefore the Grouping obeject properties 
-	 * are shown in the PropertyInspector.
+	 * are shown in the PropertyInspector.
+	 * 
 	 * @usage   
 	 * @param   a The selected Activity
 	 * @return  
@@ -759,6 +751,7 @@
 		var dp = appliedGroupingActivity_cmb.dataProvider;
 		Debugger.log('dp:'+dp.toString(),Debugger.GEN,'showAppliedGroupingProperties','PropertyInspector');
 		appliedGroupingActivity_cmb.selectedIndex = 0;
+		
 		for(var i=0; i<dp.length;i++){
 			
 			Debugger.log('dp[i].data.createGroupingID:'+dp[i].data.createGroupingID,Debugger.GEN,'showAppliedGroupingProperties','PropertyInspector');
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.50 -r1.51
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	4 Jun 2008 05:05:42 -0000	1.50
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	20 Jun 2008 06:15:46 -0000	1.51
@@ -145,11 +145,9 @@
     public var addEventListener:Function;
     public var removeEventListener:Function;
 	
-	
 	/**
 	 * Constructor
 	 */
- 
 	public function PropertyInspectorControls(){
 		//register to recive updates form the model
 		Debugger.log('Constructor',Debugger.GEN,'PropertyInspector','PropertyInspector');
@@ -517,7 +515,7 @@
 			numLearners_rdo.visible = false;
 			numGroups_rdo.visible = false;
 			
-			_group_naming_btn.visible = true; //(numGroups_stp.value > 0) ? true : false;
+			_group_naming_btn.visible = true;
 			
 			if(e != null) {
 				numGroups_lbl.enabled = e;
@@ -615,7 +613,7 @@
 			numLearners_stp.enabled = false;
 			
 			_group_naming_btn.enabled = (e != null) ? e : true;
-			_group_naming_btn.visible = true; // (numRandomGroups_stp.value > 0) ? true : false;
+			_group_naming_btn.visible = true;
 		
 		}
 		
@@ -678,12 +676,7 @@
 		if(!_canvasController.isBusy() && evt.type == 'focusOut') {
 			var g:Grouping = _canvasModel.getCanvas().ddm.getGroupingByUIID(_canvasModel.selectedItem.activity.createGroupingUIID);
 		
-			//if(_canvasModel.getCanvas().ddm.hasBranchMappingsForGroupingUIID(g.groupingUIID)) {
-			//	_canvasController.setBusy();
-			//	LFMessage.showMessageConfirm("Warning: Existing Group-to-Branch mappings may be effected by your change. Do you wish to continue?", Proxy.create(this, doUpdateGroupingMethodData, g), Proxy.create(this, retainOldGroupingMethodData), "Yes", "No",  "Warning");
-			//} else {
-				doUpdateGroupingMethodData(g);
-			//}
+			doUpdateGroupingMethodData(g);
 		}
 	}
 	
@@ -1058,12 +1051,7 @@
 			return; 
 		}		
 		
-		//if(_canvasModel.selectedItem.activity.defineLater != null)
-		//	_define_monitor_cb.selected = _canvasModel.selectedItem.activity.defineLater;
-
 		var ca = _canvasModel.selectedItem;
-		
-		//var branches:Object = _canvasModel.getCanvas().ddm.getBranchesForActivityUIID(ca.activity.activityUIID);
 		var sequences:Array = _canvasModel.getCanvas().ddm.getComplexActivityChildren(ca.activity.activityUIID);
 		
 		if(hasConnectedSequences(sequences) && ca.activity.groupingUIID != null) {
@@ -1182,7 +1170,13 @@
 		evt.target.scrollContent.loadLists();
 	}
 	
-	/**
+	/**
+	 * @depricated
+	 * 
+	 * @usage   
+	 * @param   branches 
+	 * @return  
+	 *
 	private function getValidBranches(branches:Array):Array {
 		Debugger.log("validating br len: " + branches.length, Debugger.CRITICAL, "getvalidbranches", "PIC*");
 		
@@ -1201,12 +1195,9 @@
 	*/
 	
 	private function getValidSequences(seqs:Array):Array {
-		Debugger.log("validating seqs len: " + seqs.length, Debugger.CRITICAL, "getvalidsequences", "PIC*");
-		
 		for(var i=0; i < seqs.length; i++) {
 			var sequence:SequenceActivity = SequenceActivity(seqs[i]);
-			Debugger.log("validating seq: " +sequence.title, Debugger.CRITICAL, "getvalidsequences", "PIC*");
-			Debugger.log("validating seq default + empty: " + (sequence.isDefault && sequence.empty), Debugger.CRITICAL, "getvalidsequences", "PIC*");
+			
 			if(sequence.isDefault && sequence.empty) {
 				seqs.splice(i, 1);
 				i=i-1;
@@ -1274,7 +1265,7 @@
 	public function focusOut(e):Void{
 		var tgt:String = new String(e.target);
 		if(tgt.indexOf("title_txt") != -1){
-			//todo check if this is the right place to set edited content, should it be ddm?
+			//TODO: check if this is the right place to set edited content, should it be ddm?
 			_canvasModel.selectedItem.activity.title = title_txt.text;
 		} else if(tgt.indexOf("desc_txt") != -1){
 			_canvasModel.selectedItem.activity.description = desc_txt.text;
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/SaveConfirmDialog.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/SaveConfirmDialog.as,v
diff -u -r1.2 -r1.3
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/SaveConfirmDialog.as	25 Jun 2007 10:35:46 -0000	1.2
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/SaveConfirmDialog.as	20 Jun 2008 06:15:46 -0000	1.3
@@ -61,10 +61,8 @@
 	
 	private var msgBox:TextArea;
 	
-	
     private var fm:FocusManager;
     private var _tm:ThemeManager;
-
    
 	//Defined so compiler can 'see' events added at runtime by EventDispatcher
     private var dispatchEvent:Function;     
@@ -110,9 +108,9 @@
 		stpButtons();
 		okBtn.setFocus();
 		
-		//_container._parent.setSize(150, 120);
 		_container._parent.hScrollPolicy = "no";
 		_container.resize = false;
+		
 		setSize(this._width, this._height);
 
 		//fire event to say we have loaded
@@ -154,10 +152,7 @@
 	  okBtn._x = (w/2) - (wid/2);
 	  okBtn._y =  h - okBtn._height - MARGIN;
 	  retBtn._x = (w/2) - (wid/2) + okBtn._width + (2*MARGIN);
-	  retBtn._y =  h - retBtn._height - MARGIN;
-	  
-	  
-	  
+	  retBtn._y =  h - retBtn._height - MARGIN;
     }
 	
 	/**
@@ -172,7 +167,6 @@
 		okBtn.setStyle('styleName',styleObj);
 		retBtn.setStyle('styleName',styleObj);
 		msgBox.setStyle('borderStyle', 'none');
-		
     }
     
     /**
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/TransitionPropertiesDialog.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/TransitionPropertiesDialog.as,v
diff -u -r1.1 -r1.2
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/TransitionPropertiesDialog.as	5 Jun 2007 02:58:11 -0000	1.1
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/TransitionPropertiesDialog.as	20 Jun 2008 06:15:46 -0000	1.2
@@ -46,8 +46,6 @@
 	private var gateType_lbl:Label;
 	private var section_lbl:Label;
 	
-	
-        
     private var fm:FocusManager;            //Reference to focus manager
     private var themeManager:ThemeManager;  //Theme manager
     
@@ -69,7 +67,6 @@
     * constructor
     */
     function TransitionPropertiesDialog(){
-        //trace('WorkSpaceDialog.constructor');
         //Set up this class to use the Flash event delegation model
         EventDispatcher.initialize(this);
         
@@ -95,21 +92,16 @@
 		//populate the synch type combo:
 		gateType_cmb.dataProvider = Activity.getGateActivityTypes();
 		
-        /*
-		//get focus manager + set focus to OK button, focus manager is available to all components through getFocusManager
-        fm = _container.getFocusManager();
-        fm.enabled = true;
-        ok_btn.setFocus();
-        */
-        
         Debugger.log('ok_btn.tabIndex: '+ok_btn.tabIndex,Debugger.GEN,'init','org.lamsfoundation.lams.WorkspaceDialog');
         
         //Add event listeners for ok, cancel and close buttons
         ok_btn.addEventListener('click',Delegate.create(this, ok));
         cancel_btn.addEventListener('click',Delegate.create(this, cancel));
-        //Tie parent click event (generated on clicking close button) to this instance
+        
+		//Tie parent click event (generated on clicking close button) to this instance
         _container.addEventListener('click',this);
-        //Register for LFWindow size events
+        
+		//Register for LFWindow size events
         _container.addEventListener('size',this);
         
         Debugger.log('setting offsets',Debugger.GEN,'init','org.lamsfoundation.lams.common.ws.WorkspaceDialog');
@@ -152,38 +144,31 @@
         //LFWindow, goes first to prevent being overwritten with inherited styles.
         var styleObj = themeManager.getStyleObject('LFWindow');
         _container.setStyle('styleName',styleObj);
-
-     
     }
 
     /**
     * Called by the cancel button 
     */
     private function cancel(){
-        trace('Cancel');
-        //close parent window
         _container.deletePopUp();
     }
     
     /**
     * Called by the OK button 
     */
     private function ok(){
-        trace('OK');
        //If validation successful commit + close parent window
 	   if (getSelectedGateType() == Activity.NO_GATE_ACTIVITY_TYPE){
 		   cancel()
 		   
 	   }else {
 		   //Fire callback with selectedId
 		   dispatchEvent({type:'okClicked',target:this,gate:getSelectedGateType()});
-       _container.deletePopUp();
+		   _container.deletePopUp();
 	   }
        
        
     }
-	
-	
     
     /**
     * Event dispatched by parent container when close button clicked
@@ -192,13 +177,10 @@
         e.target.deletePopUp();
     }
     
-   
-    
     /**
     * Main resize method, called by scrollpane container/parent
     */
     public function setSize(w:Number,h:Number){
-        //Debugger.log('setSize',Debugger.GEN,'setSize','org.lamsfoundation.lams.common.ws.WorkspaceDialog');
         //Size the bkg_pnl
         bkg_pnl.setSize(w,h);
 
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/ValidationIssue.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/ValidationIssue.as,v
diff -u -r1.2 -r1.3
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/ValidationIssue.as	8 Aug 2007 09:09:34 -0000	1.2
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/ValidationIssue.as	20 Jun 2008 06:15:46 -0000	1.3
@@ -1,4 +1,27 @@
-class org.lamsfoundation.lams.authoring.cv.ValidationIssue {
+/***************************************************************************
+ * Copyright (C) 2008 LAMS Foundation (http://lamsfoundation.org)
+ * =============================================================
+ * License Information: http://lamsfoundation.org/licensing/lams/2.0/
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2.0 
+ * as published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
+ * USA
+ * 
+ * http://www.gnu.org/licenses/gpl.txt
+ * ************************************************************************
+ */
+ 
+ class org.lamsfoundation.lams.authoring.cv.ValidationIssue {
 	
 	private var _code:String;
 	private var _message:String;
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/ValidationIssuesDialog.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/ValidationIssuesDialog.as,v
diff -u -r1.2 -r1.3
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/ValidationIssuesDialog.as	16 Jan 2008 22:40:53 -0000	1.2
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/ValidationIssuesDialog.as	20 Jun 2008 06:15:46 -0000	1.3
@@ -64,7 +64,6 @@
     public var addEventListener:Function;
     public var removeEventListener:Function;
 	
-	
 	/**
 	 * Constructor
 	 */
@@ -142,7 +141,7 @@
 		_container.contentLoaded();
 					
 		this.onEnterFrame = initSetup;
-		//validationIssues_dgd.setSize(validationIssues_dgd.)
+		
 		setSize(_width, _height);
 	}
 	
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/layout/DefaultLayoutManager.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/layout/DefaultLayoutManager.as,v
diff -u -r1.2 -r1.3
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/layout/DefaultLayoutManager.as	25 Jun 2007 10:35:47 -0000	1.2
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/layout/DefaultLayoutManager.as	20 Jun 2008 06:15:05 -0000	1.3
@@ -99,14 +99,17 @@
         //Canvas
         app.toolkit.setSize(app.toolkit.width, h-Application.TOOLKIT_Y);
 		app.canvas.setSize(w-app.toolkit.width, h-(Application.CANVAS_Y + app.canvas.model.getPIHeight()));
-       //Toolbar
+        
+		//Toolbar
         app.toolbar.setSize(w, Application.TOOLBAR_HEIGHT);
+		
 		//Property Inspector
 		app.pi.setSize(w-app.toolkit.width, app.pi._height)
 		app.pi._y = h - app.canvas.model.getPIHeight();
 		
 		var piHeight:Number = app.canvas.model.getPIHeight();
 		app.pi.showExpand(false)
+		
 		if (piHeight != app.pi.piFullHeight()){
 			app.pi.showExpand(true);
 		}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/layout/EditOnFlyLayoutManager.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/layout/EditOnFlyLayoutManager.as,v
diff -u -r1.2 -r1.3
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/layout/EditOnFlyLayoutManager.as	25 Jun 2007 10:35:47 -0000	1.2
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/layout/EditOnFlyLayoutManager.as	20 Jun 2008 06:15:05 -0000	1.3
@@ -117,14 +117,17 @@
 		//Canvas
         app.toolkit.setSize(app.toolkit.width, h-Application.TOOLKIT_Y);
 		app.canvas.setSize(w-app.toolkit.width, h-(Application.CANVAS_Y + app.canvas.model.getPIHeight()));
-       //Toolbar
+        
+		//Toolbar
         app.toolbar.setSize(w, Application.TOOLBAR_HEIGHT);
+		
 		//Property Inspector
 		app.pi.setSize(w-app.toolkit.width, app.pi._height)
 		app.pi._y = h - app.canvas.model.getPIHeight();
 		
 		var piHeight:Number = app.canvas.model.getPIHeight();
 		app.pi.showExpand(false)
+		
 		if (piHeight != app.pi.piFullHeight()){
 			app.pi.showExpand(true);
 		}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/Toolbar.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/Toolbar.as,v
diff -u -r1.5 -r1.6
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/Toolbar.as	30 Apr 2008 03:15:16 -0000	1.5
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/Toolbar.as	20 Jun 2008 06:15:04 -0000	1.6
@@ -30,8 +30,10 @@
 * The canvas is the main screen area of the LAMS application where activies are added and sequenced
 */
 class Toolbar {
+	
 	// Model
 	private var toolbarModel:ToolbarModel;
+	
 	// View
 	private var toolbarView:ToolbarView;
 	private var toolbarView_mc:MovieClip;
@@ -73,13 +75,11 @@
 		
 	}
     
-    
 	/**
 	* Used by application to set the size
 	* @param width The desired width
 	* @param height the desired height
 	*/
-	
 	public function setSize(width:Number, height:Number):Void{
 		toolbarModel.setSize(width, height);
 	}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarController.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarController.as,v
diff -u -r1.4 -r1.5
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarController.as	7 May 2008 06:23:48 -0000	1.4
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarController.as	20 Jun 2008 06:15:04 -0000	1.5
@@ -32,6 +32,7 @@
 * Makes changes to the Canvas Authoring model's data based on user input.
 */
 class org.lamsfoundation.lams.authoring.tb.ToolbarController extends AbstractController {
+	
 	/**
 	* Constructor
 	*
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarModel.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarModel.as,v
diff -u -r1.4 -r1.5
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarModel.as	30 Apr 2008 03:15:16 -0000	1.4
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarModel.as	20 Jun 2008 06:15:04 -0000	1.5
@@ -23,7 +23,6 @@
 
 import org.lamsfoundation.lams.authoring.tb.*;
 import org.lamsfoundation.lams.common.util.*;
-
 
 /*
 * Model for the Toolbar
@@ -57,6 +56,7 @@
 		__width = width;
 		__height = height;
 		setChanged();
+		
 		//send an update
 		infoObj = {};
 		infoObj.updateType = "SIZE";
@@ -109,10 +109,10 @@
 		notifyObservers(infoObj);
 		
 	}
+	
 	/**
 	* set the button state to enabled/disabled and set a changed flag and notify view and controller.
     */
-	
 	public function setDefaultState(){
 		Debugger.log('setDefaultState is called: ',Debugger.GEN,'setDefaultState','Toolbar');
 		setButtonState("preview_btn", false);
@@ -154,7 +154,6 @@
 	* Used by View to get the button state enabled/disabled
 	* @returns Object containing true or false .  obj.newbtnstate
 	*/
-	
 	public function getState():Object{
 		var s:Object = {};
 		s.newbtnstate = _btnState;
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarView.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarView.as,v
diff -u -r1.8 -r1.9
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarView.as	7 May 2008 06:23:48 -0000	1.8
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarView.as	20 Jun 2008 06:15:04 -0000	1.9
@@ -29,7 +29,8 @@
 import org.lamsfoundation.lams.common.style.*
 import org.lamsfoundation.lams.common.dict.*
 import mx.managers.*
-import mx.controls.*
+import mx.controls.*
+
 /*
 * Authoring view for the toolbar
 */
@@ -118,8 +119,6 @@
 	}
 	
 	public function showHideFlowAssets(v:Boolean){
-		//showHideOptAssets(false);
-		
 		gate_btn.visible = v;
 		branch_btn.visible = v;
 		flow_bkg_pnl.visible = v;
@@ -129,8 +128,6 @@
 	}
 	
 	public function showHideOptAssets(v:Boolean){
-		//showHideFlowAssets(false);
-		
 		optional_act_btn.visible = v;
 		optional_seq_btn.visible = v;
 		optional_bkg_pnl.visible = v;
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tk/TemplateActivity.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tk/TemplateActivity.as,v
diff -u -r1.4 -r1.5
--- lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tk/TemplateActivity.as	11 Jan 2008 07:32:13 -0000	1.4
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tk/TemplateActivity.as	20 Jun 2008 06:15:04 -0000	1.5
@@ -252,26 +252,20 @@
 	private function setStyles():Void{
 		Debugger.log('Running....',Debugger.GEN,'setStyles','TemplateActivity');
 		var styleObj;
-		_taPanelStyle = _tm.getStyleObject('TAPanel');  //getAssociatedStyle()
+		_taPanelStyle = _tm.getStyleObject('TAPanel'); 
 		bkg_pnl.setStyle('styleName',_taPanelStyle);
 		styleObj = _tm.getStyleObject('label');
 		title_lbl.setStyle('styleName',styleObj);
-		
 	}
 	
-	/**  
+	/** 
+	* @depricated 
+	* 
 	* Gets this TemplateActivity's data
 	*/
 	public function get toolActivity():Object{
-		/*
-		//if we only have one element then return that cos it must be a single toolActiivity
-		if(_activities.length ==1){
-			return _mainActivity;
-		}else{
-			return new LFError("There is more than one item in the activities array, may be a complex activity - cant return a ToolActitiy","get toolActivity",this);
-		}
-		*/
 		Debugger.log('This function is deprecated, use mainActivity instead',Debugger.MED,'getToolActivity','TemplateActivity');
+		
 		return _mainActivity;
 		
 	}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Application.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Application.as,v
diff -u -r1.6 -r1.7
--- lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Application.as	17 Apr 2008 05:30:58 -0000	1.6
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Application.as	20 Jun 2008 06:15:04 -0000	1.7
@@ -31,14 +31,14 @@
 import org.lamsfoundation.lams.learner.ls.*;
 import mx.managers.*
 import mx.utils.*
+
 /**
 * Application - LAMS Learner Application
 * @author   Mitchell Seaton
 */
 class Application extends ApplicationParent {
 	
 	// private constants
-	//private var _comms:Communication;
 	private var _lesson:Lesson;
 	private var _header_mc:MovieClip;
 	private var _scratchpad_mc:MovieClip;
@@ -149,7 +149,6 @@
         
 		setupData();
 		checkDataLoaded();
-		
 	}
 	
 	/**
@@ -174,7 +173,7 @@
 		
     }
 	
-		/**
+	/**
 	* Periodically checks if data has been loaded
 	*/
 	private function checkDataLoaded() {
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Header.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Header.as,v
diff -u -r1.3 -r1.4
--- lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Header.as	11 Jan 2008 07:31:54 -0000	1.3
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Header.as	20 Jun 2008 06:15:04 -0000	1.4
@@ -101,7 +101,6 @@
 		setLabels();
 		resize(Stage.width);
 		
-		
 		//Add event listeners for resume and exit buttons
 		
 		resume_btn.onRelease = function(){
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Scratchpad.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Scratchpad.as,v
diff -u -r1.2 -r1.3
--- lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Scratchpad.as	11 Jan 2008 07:31:54 -0000	1.2
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Scratchpad.as	20 Jun 2008 06:15:04 -0000	1.3
@@ -75,7 +75,6 @@
     public var addEventListener:Function;
     public var removeEventListener:Function;
    
-	
 	/** 
 	* constructor
 	*/
@@ -97,8 +96,6 @@
     * Called a frame after movie attached to allow components to initialise
     */
     public function init(){
-		trace('initialing header..');
-		
         //Delete the enterframe dispatcher
         delete this.onEnterFrame;
 		_lessonModel = _lessonModel;
@@ -115,13 +112,10 @@
 		//Add event listeners for resume and exit buttons
 		
 		view_btn.onRelease = function(){
-			trace('on releasing view all button..');
 			Application.getInstance().getScratchpad().viewNotebookEntries();
 		}
 		
 		save_btn.onRelease = function(){
-			trace('on releasing save button..');
-			
 			Application.getInstance().getScratchpad().saveEntry();
 		}
 		
@@ -130,23 +124,23 @@
 		
 		save_btn.onRollOver = Proxy.create(this,this['showToolTip'], save_btn, "sp_save_tooltip");
 		save_btn.onRollOut = Proxy.create(this,this['hideToolTip']);
+		
 		clickTarget_mc.onRelease = Proxy.create (this, localOnRelease);
 		clickTarget_mc.onReleaseOutside = Proxy.create (this, localOnReleaseOutside);
+		
 		this.onEnterFrame = setLabels;
 		
 	}
 	
 	public function localOnRelease():Void{
 		
 		if (_spadIsExpended){
-			trace("P Pressed in 'localOnRelease' and _spadIsExpended is: "+_spadIsExpended)
 			_spadIsExpended = false
 			minIcon._visible = true;
 			maxIcon._visible = false;
 			_lessonModel.setSpadHeight(spadHeightHide);
 			
 		}else {
-			trace("P Pressed in 'localOnRelease' and _spadIsExpended is: "+_spadIsExpended)
 			_spadIsExpended = true
 			minIcon._visible = false;
 			maxIcon._visible = true;
@@ -166,17 +160,15 @@
 	
 	public function localOnReleaseOutside():Void{
 		Debugger.log('Release outside so no event has been fired, current state is: ' + _spadIsExpended,Debugger.GEN,'localOnReleaseOutside','Scratch Pad');
-		
 	}
+	
 	public function showToolTip(btnObj, btnTT:String):Void{
-		
 		var Xpos = Application.HEADER_X+ 5;
 		var Ypos = Application.HEADER_Y+( btnObj._y+btnObj._height)+2;
 		var ttHolder = ApplicationParent.tooltip;
 		var ttMessage = Dictionary.getValue(btnTT);
 		var ttWidth = 150
 		_tip.DisplayToolTip(ttHolder, ttMessage, Xpos, Ypos, undefined, ttWidth);
-		
 	}
 	
 	public function hideToolTip():Void{
@@ -217,13 +209,11 @@
 	
 	public function saveEntry(){
 		// TODO: validate entry fields
-		
 		var dto:Object = getDataForSaving();
 		
 		var callback:Function = Proxy.create(this,onStoreEntryResponse);
 		
 		Application.getInstance().getComms().sendAndReceive(dto,"servlet/notebook/storeNotebookEntry",callback,false);
-		
 	}
 	
 	public function getDataForSaving():Object {
@@ -250,11 +240,9 @@
 	
 	public function viewNotebookEntries(){
 		// TODO: Pop-up for Notebook Entries
-		
 		var notebook_url:String = _root.serverURL + 'learning/notebook.do?method=viewAll&lessonID=' + _root.lessonID;
 		
 		JsPopup.getInstance().launchPopupWindow(notebook_url, 'Notebook', 570, 796, true, true, false, false, false);
-	
 	}
 	
 	public function resize(width:Number){
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/Lesson.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/Lesson.as,v
diff -u -r1.4 -r1.5
--- lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/Lesson.as	26 Oct 2007 09:35:25 -0000	1.4
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/Lesson.as	20 Jun 2008 06:15:03 -0000	1.5
@@ -30,7 +30,8 @@
 import org.lamsfoundation.lams.common.dict.Dictionary;
 import org.lamsfoundation.lams.authoring.DesignDataModel;
 
-import mx.managers.*;
+import mx.managers.*;
+
 /**
 * Lesson - LAMS Application
 * @author   Mitchell Seaton
@@ -286,11 +287,6 @@
 	}
 	
 	private function closeLesson(pkt:Object){
-		// set lesson as inactive
-		//lessonModel.setInactive();
-		
-		// deactivate Progress movie
-		
 		// load exit jsp
 		getURL(_root.serverURL + 'learning'+String(pkt), 'contentFrame');
 	}
@@ -372,7 +368,8 @@
 	
 	public function get view():LessonView{
 		return lessonView;
-	}
+	}
+	
 	/**
 	* Used by application to set the size
 	* @param width The desired width
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonModel.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonModel.as,v
diff -u -r1.13 -r1.14
--- lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonModel.as	3 Jun 2008 01:53:19 -0000	1.13
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonModel.as	20 Jun 2008 06:15:03 -0000	1.14
@@ -369,25 +369,6 @@
 				if(!orderDesign(firstActivitySeq, order, backtrack)) return false;
 				if(children[i].stopAfterActivity && !backtrack) return false;
 				
-			} else {
-				/**
-				Debugger.log("progress: " + _progressStr + " for id: " + firstActivitySeq.activityID, Debugger.CRITICAL, "orderDesign", "LessonModel");
-
-				if(_progressStr == "current_mc") {
-					for(var j=i; j>0; j--) {
-						if(!orderDesignChildren(children, j-1, order, true)) return false;
-					}
-					
-					_activeSeq[children[i].parentUIID] = Activity(children[i]);
-					
-					if(!orderDesign(firstActivitySeq, order, backtrack)) return false;
-					
-					broadcastViewUpdate("REMOVE_ACTIVITY_ALL");
-				} else if(_activeSeq[children[i].parentUIID] == Activity(children[i])) {
-					if(!orderDesign(firstActivitySeq, order, backtrack)) return false;
-					if(children[i].stopAfterActivity && !backtrack) return false;
-				}
-				*/
 			}
 			
 		}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/Application.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/Application.as,v
diff -u -r1.11 -r1.12
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/Application.as	21 May 2008 06:29:20 -0000	1.11
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/Application.as	20 Jun 2008 06:15:04 -0000	1.12
@@ -20,21 +20,21 @@
  * http://www.gnu.org/licenses/gpl.txt
  * ************************************************************************
  */
-
-//import org.lamsfoundation.lams.monitoring.*
-import org.lamsfoundation.lams.monitoring.ls.*      //Lessons
-import org.lamsfoundation.lams.authoring.cv.CanvasActivity    //Canvas Activity Used in Monitor Tab View 
+
+import org.lamsfoundation.lams.monitoring.ls.*      						//Lessons
+import org.lamsfoundation.lams.authoring.cv.CanvasActivity    				//Canvas Activity Used in Monitor Tab View 
 import org.lamsfoundation.lams.authoring.DesignDataModel
-import org.lamsfoundation.lams.monitoring.mv.* 	 //Monitor 
-import org.lamsfoundation.lams.monitoring.layout.DefaultLayoutManager 	 //Monitor Layouts
-import org.lamsfoundation.lams.common.ws.*          //Workspace
-import org.lamsfoundation.lams.common.comms.*       //communications
-import org.lamsfoundation.lams.common.util.*        //Utils
-import org.lamsfoundation.lams.common.dict.*        //Dictionary
-import org.lamsfoundation.lams.common.ui.*          //User interface
-import org.lamsfoundation.lams.common.style.*       //Themes/Styles
-import org.lamsfoundation.lams.common.layout.*		// Layouts
-import org.lamsfoundation.lams.common.*             
+import org.lamsfoundation.lams.monitoring.mv.* 	 							//Monitor 
+import org.lamsfoundation.lams.monitoring.layout.DefaultLayoutManager 	 	//Monitor Layouts
+import org.lamsfoundation.lams.common.ws.*          						//Workspace
+import org.lamsfoundation.lams.common.comms.*       						//Communications
+import org.lamsfoundation.lams.common.util.*        						//Utils
+import org.lamsfoundation.lams.common.dict.*        						//Dictionary
+import org.lamsfoundation.lams.common.ui.*          						//User interface
+import org.lamsfoundation.lams.common.style.*       						//Themes/Styles
+import org.lamsfoundation.lams.common.layout.*								// Layouts
+import org.lamsfoundation.lams.common.* 
+
 import mx.managers.*
 import mx.utils.*
 
@@ -43,7 +43,6 @@
 * @author   DI
 */
 class org.lamsfoundation.lams.monitoring.Application extends ApplicationParent {
-	
 		
 	private static var SHOW_DEBUGGER:Boolean = false;
 	private static var MODULE:String = "monitoring";
@@ -61,11 +60,11 @@
     public static var WORKSPACE_W:Number = 300;
     public static var WORKSPACE_H:Number = 200;
     
-    public static var APP_ROOT_DEPTH:Number = 10; //depth of the application root
+    public static var APP_ROOT_DEPTH:Number = 10; 	//depth of the application root
     public static var DIALOGUE_DEPTH:Number = 55;	//depth of the cursors
     public static var TOOLTIP_DEPTH:Number = 60;	//depth of the cursors
-    public static var CURSOR_DEPTH:Number = 40;   //depth of the cursors
-    public static var MENU_DEPTH:Number = 25;   //depth of the menu
+    public static var CURSOR_DEPTH:Number = 40;   	//depth of the cursors
+    public static var MENU_DEPTH:Number = 25;   	//depth of the menu
     public static var CCURSOR_DEPTH:Number = 101;
 
     public static var UI_LOAD_CHECK_INTERVAL:Number = 50;
@@ -111,7 +110,7 @@
 	private var _DataLoadCheckIntervalID:Number;
 	
     // Data Elements
-    private var _sequenceLoaded:Boolean;             //Sequence(+Design) loaded flag
+    private var _sequenceLoaded:Boolean;             	//Sequence(+Design) loaded flag
 	
     //UI Elements
     private var _monitorLoaded:Boolean;
@@ -198,7 +197,6 @@
         _root.preloader.complete();
 		setupData();
 		checkDataLoaded();
-		
     }
     
     /**
@@ -211,9 +209,7 @@
         _dictionary = Dictionary.getInstance();
         _dictionary.addEventListener('load',Delegate.create(this,onDictionaryLoad));
 		_dictionary.load(language);
-        
 		
-		
         //Set reference to StyleManager and load Themes and setup load handler.
         var theme:String = String(_config.getItem('theme'));
         _themeManager = ThemeManager.getInstance();
@@ -323,15 +319,12 @@
 			_uiLoadCheckCount++;
             //If all events dispatched clear interval and call start()
             if(_UILoaded && _dictionaryEventDispatched && _themeEventDispatched){
-				//Debugger.log('Clearing Interval and calling start :',Debugger.CRITICAL,'checkUILoaded','Application');	
-                clearInterval(_UILoadCheckIntervalID);
+				clearInterval(_UILoadCheckIntervalID);
 				start();
             }else {
                 //If UI loaded check which events can be broadcast
                 if(_UILoaded){
-					//Debugger.log('ALL UI LOADED, waiting for all true to dispatch init events: _dictionaryLoaded:'+_dictionaryLoaded+'_themeLoaded:'+_themeLoaded ,Debugger.GEN,'checkUILoaded','Application');
-
-                    //If dictionary is loaded and event hasn't been dispatched - dispatch it
+					//If dictionary is loaded and event hasn't been dispatched - dispatch it
                     if(_dictionaryLoaded && !_dictionaryEventDispatched){
 						_dictionaryEventDispatched = true;
                         _dictionary.broadcastInit();
@@ -371,11 +364,9 @@
     * @param UIElementID:String - Identifier for the Element that was loaded
     */
     public function UIElementLoaded(evt:Object) {
-        //Debugger.log('UIElementLoaded: ' + evt.target.className,Debugger.GEN,'UIElementLoaded','Application');
         if(evt.type=='load'){
 
 			_layout.manager.addLayoutItem(new LFLayoutItem(evt.target.className, evt.target));
-			
 			_root.preloader.complete();
             
             //If all of them are loaded set UILoad accordingly
@@ -452,8 +443,6 @@
     * Receives events from the Stage resizing
     */
     public function onResize(){
-        //Debugger.log('onResize',Debugger.GEN,'main','org.lamsfoundation.lams.Application');
-
         //Get the stage width and height and call onResize for stage based objects
         var w:Number = Stage.width;
         var h:Number = Stage.height;
@@ -507,15 +496,12 @@
 	
 	
 	public function cut():Void{
-		 //setClipboardData(_canvas.model.selectedItem);
 	}
 	
 	public function copy():Void{
-		 //setClipboardData(_canvas.model.selectedItem);
 	}
 	
 	public function paste():Void{
-		//_canvas.setPastedItem(getClipboardData());
 	}
 
     /**
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/ContributeActivity.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/ContributeActivity.as,v
diff -u -r1.2 -r1.3
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/ContributeActivity.as	3 Jul 2007 06:15:24 -0000	1.2
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/ContributeActivity.as	20 Jun 2008 06:15:04 -0000	1.3
@@ -69,8 +69,7 @@
 	}
 	
 	
-	public function populateFromDTO(dto:Object, id:String){
-		trace('populating from dto...');
+	public function populateFromDTO(dto:Object, id:String){
 		_activityID = dto.activityID;
 		_parentActivityID = dto.parentActivityID;
 		_activityTypeID = dto.activityTypeID;
@@ -91,7 +90,8 @@
 				ca.populateFromDTO(dto.contributeEntries[i], id);
 				_contributeEntries.push(ca);
 			}
-		}
+		}
+		
 		_title = dto.title;
 		_description = dto.description;
 		_taskURL = dto.URL + '&contentFolderID=' + id;
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/CreateLessonDialog.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/CreateLessonDialog.as,v
diff -u -r1.1 -r1.2
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/CreateLessonDialog.as	5 Jun 2007 02:58:06 -0000	1.1
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/CreateLessonDialog.as	20 Jun 2008 06:15:04 -0000	1.2
@@ -32,14 +32,12 @@
 import org.lamsfoundation.lams.common.style.*
 import org.lamsfoundation.lams.common.ui.*
 import it.sephiroth.TreeDnd;
+
 /**
 * @author      DI & DC
 */
 class CreateLessonDialog extends MovieClip{
  
-    //private static var OK_OFFSET:Number = 50;
-    //private static var CANCEL_OFFSET:Number = 50;
-
     //References to components + clips 
     private var _container:MovieClip;       //The container window that holds the dialog
     private var ok_btn:Button;              //OK+Cancel buttons
@@ -61,8 +59,8 @@
 	
     private var resourceDesc_txa:TextArea;
     
-    private var fm:FocusManager;            //Reference to focus manager
-    private var themeManager:ThemeManager;  //Theme manager
+    private var fm:FocusManager;            	//Reference to focus manager
+    private var themeManager:ThemeManager;  	//Theme manager
 	
 	private var _workspaceView:WorkspaceView;
 	private var _workspaceModel:WorkspaceModel;
@@ -90,7 +88,6 @@
     * constructor
     */
     function CreateLessonDialog(){
-        //trace('WorkSpaceDialog.constructor');
         //Set up this class to use the Flash event delegation model
         EventDispatcher.initialize(this);
         _resultDTO = new Object();
@@ -113,7 +110,7 @@
         //Set the container reference
         Debugger.log('container=' + _container,Debugger.GEN,'init','org.lamsfoundation.lams.WorkspaceDialog');
 
-	//Set the text on the labels
+		//Set the text on the labels
         
         //Set the text for buttons
 		currentPath_lbl.text = "<b>"+Dictionary.getValue('ws_dlg_location_button')+"</b>:"
@@ -129,21 +126,17 @@
         fm = _container.getFocusManager();
         fm.enabled = true;
         ok_btn.setFocus();
-        //fm.defaultPushButton = ok_btn;
         
         Debugger.log('ok_btn.tabIndex: '+ok_btn.tabIndex,Debugger.GEN,'init','org.lamsfoundation.lams.WorkspaceDialog');
         
        
         //Tie parent click event (generated on clicking close button) to this instance
         _container.addEventListener('click',this);
-        //Register for LFWindow size events
+        
+		//Register for LFWindow size events
         _container.addEventListener('size',this);
 		
-		//panel.setStyle('backgroundColor',0xFFFFFF);
-        
-        //Debugger.log('setting offsets',Debugger.GEN,'init','org.lamsfoundation.lams.common.ws.WorkspaceDialog');
-
-        //work out offsets from bottom RHS of panel
+		//work out offsets from bottom RHS of panel
         xOkOffset = panel._width - ok_btn._x;
         yOkOffset = panel._height - ok_btn._y;
         xCancelOffset = panel._width - cancel_btn._x;
@@ -153,8 +146,8 @@
         themeManager.addEventListener('themeChanged',this);
 		location_dnd.dragRules = TreeDnd.DENYALL;
         treeview = location_dnd.getTree();
+		
 		//Fire contentLoaded event, this is required by all dialogs so that creator of LFWindow can know content loaded
-        
 		_container.contentLoaded();
     }
 	
@@ -171,13 +164,13 @@
 		Debugger.log('_workspaceView:'+_workspaceView,Debugger.GEN,'setUpContent','org.lamsfoundation.lams.common.ws.WorkspaceDialog');
 		//get a ref to the controller and kkep it here to listen for events:
 		_workspaceController = _workspaceView.getController();
+		
 		Debugger.log('_workspaceController:'+_workspaceController,Debugger.GEN,'setUpContent','org.lamsfoundation.lams.common.ws.WorkspaceDialog');
 		
-		
 		 //Add event listeners for ok, cancel and close buttons
         ok_btn.addEventListener('click',Delegate.create(this, ok));
         cancel_btn.addEventListener('click',Delegate.create(this, cancel));
-		//think this is failing....
+		
 		//Set up the treeview
         setUpTreeview();
 		
@@ -191,15 +184,17 @@
 	 */
 	public function viewUpdate(event:Object):Void{
 		Debugger.log('Recived an Event dispather UPDATE!, updateType:'+event.updateType+', target'+event.target,4,'viewUpdate','org.lamsfoundation.lams.ws.WorkspaceDialog');
-		 //Update view from info object
+		
+		//Update view from info object
         //Debugger.log('Recived an UPDATE!, updateType:'+infoObj.updateType,4,'update','CanvasView');
-       var wm:WorkspaceModel = event.target;
+		var wm:WorkspaceModel = event.target;
+	   
 	   //set a permenent ref to the model for ease (sorry mvc guru)
 	   _workspaceModel = wm;
 	  
-	   switch (event.updateType){
+	    switch (event.updateType){
 			case 'POPULATE_LICENSE_DETAILS' :
-				//populateAvailableLicenses(event.data, wm);
+				break;
 			case 'REFRESH_TREE' :
                 refreshTree(wm);
                 break;
@@ -241,11 +236,12 @@
 	 * @return  
 	 */
 	private function updateChildFolderBranches(changedNode:XMLNode,wm:WorkspaceModel){
-		 Debugger.log('updateChildFolder....:' ,Debugger.GEN,'updateChildFolder','org.lamsfoundation.lams.ws.WorkspaceDialog');
-		 //we have to set the new nodes to be branches, if they are branches
+		Debugger.log('updateChildFolder....:' ,Debugger.GEN,'updateChildFolder','org.lamsfoundation.lams.ws.WorkspaceDialog');
+		
+		//we have to set the new nodes to be branches, if they are branches
 		if(changedNode.attributes.isBranch){
 			treeview.setIsBranch(changedNode,true);
-			//do its kids
+			
 			for(var i=0; i<changedNode.childNodes.length; i++){
 				var cNode:XMLNode = changedNode.getTreeNodeAt(i);
 				if(cNode.attributes.isBranch){
@@ -259,17 +255,7 @@
 	
 	private function refreshTree(){
 		 Debugger.log('Refreshing tree....:' ,Debugger.GEN,'refreshTree','org.lamsfoundation.lams.ws.WorkspaceDialog');
-		
-		
-		 treeview.refresh();// this is USELESS
-
-		//var oBackupDP = treeview.dataProvider;
-		//treeview.dataProvider = null; // clear
-		//treeview.dataProvider = oBackupDP;
-		
-		//treeview.setIsOpen(treeview.getNodeDisplayedAt(0),false);
-		//treeview.setIsOpen(treeview.getNodeDisplayedAt(0),true);
-
+		 treeview.refresh();
 	}
 	
 	/**
@@ -284,7 +270,6 @@
 		//open the node
 		treeview.setIsOpen(nodeToOpen,true);
 		refreshTree();
-	
 	}
 	
 	/**
@@ -315,8 +300,10 @@
 	 */
 	private function refreshFolder(nodeToOpen:XMLNode, wm:WorkspaceModel){
 		Debugger.log('refreshFolder:'+nodeToOpen ,Debugger.GEN,'refreshFolder','org.lamsfoundation.lams.ws.WorkspaceDialog');
+		
 		//close the node
 		treeview.setIsOpen(nodeToOpen,false);		
+		
 		//we are gonna need to fire the event manually for some stupid reason the tree is not firing it.
 		//dispatchEvent({type:'nodeOpen',target:treeview,node:nodeToOpen});
 		_workspaceController = _workspaceView.getController();
@@ -326,8 +313,7 @@
 	
 	private function itemSelected(newSelectedNode:XMLNode,wm:WorkspaceModel){
 		//update the UI with the new info:
-		//_global.breakpoint();
-		//Only update the details if the node if its a resource:a
+		//Only update the details if the node if its a resource:
 		var nodeData = newSelectedNode.attributes.data;
 		if(nodeData.resourceType == _workspaceModel.RT_FOLDER){
 			resourceTitle_txi.text = "";
@@ -336,14 +322,8 @@
 		}else{
 			resourceTitle_txi.text = nodeData.name;
 			resourceDesc_txa.text = nodeData.description;
-			Debugger.log('nodeData.licenseID:'+nodeData.licenseID,Debugger.GEN,'itemSelected','org.lamsfoundation.lams.ws.WorkspaceDialog');
-					
-			//TODO These Items must also be in the FolderContentsDTO
-			/*
-			license_txa.text = ;
-			licenseID_cmb.value = ;
-			*/
-		
+			
+			Debugger.log('nodeData.licenseID:'+nodeData.licenseID,Debugger.GEN,'itemSelected','org.lamsfoundation.lams.ws.WorkspaceDialog');		
 		}
 		
 	}
@@ -367,22 +347,19 @@
 	 * @return  
 	 */
 	private function showData(wm:WorkspaceModel){
-		//Debugger.log('tabToSelect:'+tabToSelect,Debugger.GEN,'showTab','org.lamsfoundation.lams.ws.WorkspaceDialog');
-		//if(tabToSelect == "LOCATION"){
-			setLocationContentVisible(true);
+		setLocationContentVisible(true);
 			
-		//set the right label on the 'doit' button
+		// set the right label on the 'doit' button
 			if(wm.currentMode=="OPEN"){
 				ok_btn.label = Dictionary.getValue('ws_dlg_open_btn');
 			}else if(wm.currentMode=="SAVE" || wm.currentMode=="SAVEAS"){
 				ok_btn.label = Dictionary.getValue('ws_dlg_save_btn');
 			}else if(wm.currentMode=="READONLY"){
-				ok_btn.label = "Create"		//Dictionary.getValue('ws_dlg_create_btn');
+				ok_btn.label = "Create"		//TODO: Dictionary.getValue('ws_dlg_create_btn');
 			}else{
 				Debugger.log('Dont know what mode the Workspace is in!',Debugger.CRITICAL,'showTab','org.lamsfoundation.lams.ws.WorkspaceDialog');
 				ok_btn.label = Dictionary.getValue('ws_dlg_ok_btn');
 			}
-		//}
 	}
 	
 	
@@ -404,43 +381,15 @@
     * Called on initialisation and themeChanged event handler
     */
     private function setStyles(){
-        //LFWindow, goes first to prevent being overwritten with inherited styles.
-        //var styleObj = themeManager.getStyleObject('LFWindow');
-        //_container.setStyle('styleName',styleObj);
-
-        //Get the button style from the style manager
-       // styleObj = themeManager.getStyleObject('button');
-        
-        //apply to both buttons
-       // Debugger.log('styleObject : ' + styleObj,Debugger.GEN,'setStyles','org.lamsfoundation.lams.WorkspaceDialog');
-       // ok_btn.setStyle('styleName',styleObj);
-        //cancel_btn.setStyle('styleName',styleObj);
-        
         //Get label style and apply to label
-       var styleObj = themeManager.getStyleObject('label');
+        var styleObj = themeManager.getStyleObject('label');
         name_lbl.setStyle('styleName',styleObj);
-
-        //Apply treeview style 
-       // styleObj = themeManager.getStyleObject('treeview');
-        //treeview.setStyle('styleName',styleObj);
-
-        //Apply datagrid style 
-      //  styleObj = themeManager.getStyleObject('datagrid');
-        //datagrid.setStyle('styleName',styleObj);
-
-/*
-        //Apply combo style 
-        styleObj = themeManager.getStyleObject('combo');
-        combo.setStyle('styleName',styleObj);
-  */
   }
 
     /**
     * Called by the cancel button 
     */
     private function cancel(){
-        trace('Cancel');
-        //close parent window
         _container.deletePopUp();
     }
     
@@ -456,8 +405,7 @@
     *</code>
 	*/
     private function ok(){
-        trace('OK');
-		_global.breakpoint();
+        _global.breakpoint();
 		
 		//TODO: Rmeove this code as its been here only for deflopment
 		//set the selectedDesignId
@@ -468,6 +416,7 @@
 			input_txt.text = snode.attributes.data.resourceID;
 			
 		}
+		
 		_selectedDesignId = Number(input_txt.text);
 		
 		
@@ -524,10 +473,7 @@
 		
 		_resultDTO.resourceName = resourceTitle_txi.text;
 		_resultDTO.resourceDescription = resourceDesc_txa.text;
-		//_resultDTO.resourceLicenseText = license_txa.text;
-		//_resultDTO.resourceLicenseID = licenseID_cmb.value.licenseID;
 		
-
         dispatchEvent({type:'okClicked',target:this});
 	   
         closeThisDialogue();
@@ -543,7 +489,6 @@
     * Event dispatched by parent container when close button clicked
     */
     private function click(e:Object){
-        trace('WorkspaceDialog.click');
         e.target.deletePopUp();
     }
 	
@@ -561,13 +506,6 @@
 			for (var i = 0; i<node.childNodes.length; i++) {
 				var cNode = node.getTreeNodeAt(i);
 				setBranches(cNode);
-				/*
-				if(cNode.hasChildNodes()){
-					treeview.setIsBranch(cNode, true);
-					setBranches(cNode);
-				}
-				*/
-				
 			}
 		}
 	}
@@ -580,6 +518,7 @@
 	 */
 	private function setUpBranchesInit(){
 		Debugger.log('Running...',Debugger.GEN,'setUpBranchesInit','org.lamsfoundation.lams.common.ws.WorkspaceDialog');
+		
 		//get the 1st child
 		treeview.dataProvider = WorkspaceModel(_workspaceView.getModel()).treeDP;
 		var fNode = treeview.dataProvider.firstChild;
@@ -595,50 +534,20 @@
 	 * @return  
 	 */
 	private function setUpTreeview(){
-			
-		//Debugger.log('_workspaceView:'+_workspaceView,Debugger.GEN,'setUpTreeview','org.lamsfoundation.lams.common.ws.WorkspaceDialog');
-		
 		setUpBranchesInit();
 		Debugger.log('WorkspaceModel(_workspaceView.getModel()).treeDP:'+WorkspaceModel(_workspaceView.getModel()).treeDP.toString(),Debugger.GEN,'setUpTreeview','org.lamsfoundation.lams.common.ws.WorkspaceDialog');
 		
-		//Debugger.log('_workspaceController.onTreeNodeOpen:'+_workspaceController.onTreeNodeOpen,Debugger.GEN,'setUpTreeview','org.lamsfoundation.lams.common.ws.WorkspaceDialog');
-		
-		
-		
 		treeview.addEventListener("nodeOpen", Delegate.create(_workspaceController, _workspaceController.onTreeNodeOpen));
 		treeview.addEventListener("nodeClose", Delegate.create(_workspaceController, _workspaceController.onTreeNodeClose));
 		treeview.addEventListener("change", Delegate.create(_workspaceController, _workspaceController.onTreeNodeChange));
-
-		//location_dnd.addEventListener('double_click', dndList);
-		//location_dnd.addEventListener('drag_start', dndList);
-		//location_dnd.addEventListener('drag_fail', dndList);
-		
-		//location_dnd.addEventListener('drag_target', dndList);
 		location_dnd.addEventListener("drag_complete", Delegate.create(_workspaceController, _workspaceController.onDragComplete));
-		//location_dnd.addEventListener('drag_complete', dndList);
-		//use the above event, on comlete the drop, send the request to do the move to the server (evt.targetNode);
-		//then immediatly invlaidate the cache.  then server may return error if therrte is a problem, else new details willbe shown
-		
-		
-		
-		
     }
     
     /**
     * XML onLoad handler for treeview data
- */
+	*/
     private function tvXMLLoaded (ok:Boolean,rootXML:XML){
         if(ok){
-            /*
-			//Set the XML as the data provider for the tree
-            treeview.dataProvider = rootXML.firstChild;
-            treeview.addEventListener("change", Delegate.create(this, onTvChange));
-            
-            //Add this function to prevent displaying [type function],[type function] when label attribute missing from XML
-            treeview.labelFunction = function(node) {
-                    return node.nodeType == 1 ? node.nodeName : node.nodeValue;
-            };
-            */
         }
     }
     
@@ -647,7 +556,6 @@
     * Main resize method, called by scrollpane container/parent
     */
     public function setSize(w:Number,h:Number){
-        //Debugger.log('setSize',Debugger.GEN,'setSize','org.lamsfoundation.lams.common.ws.WorkspaceDialog');
         //Size the panel
         panel.setSize(w,h);
 
@@ -682,13 +590,11 @@
 	public function get workspaceView ():WorkspaceView {
 		return _workspaceView;
 	}
-	
     
     function get selectedDesignId():Number { 
         return _selectedDesignId;
     }
 	
-	
 	/**
 	 * 
 	 * @usage   
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/LearnersDialog.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/LearnersDialog.as,v
diff -u -r1.2 -r1.3
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/LearnersDialog.as	26 Mar 2008 01:15:18 -0000	1.2
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/LearnersDialog.as	20 Jun 2008 06:15:04 -0000	1.3
@@ -41,7 +41,6 @@
 */
 class LearnersDialog extends MovieClip implements Dialog{
 	
-	
 	public var RT_ORG:String = "Organisation";
 	public static var USERS_X:Number = -5;
 	public static var USER_OFFSET:Number = 20;
@@ -79,8 +78,7 @@
     * constructor
     */
     function LearnersDialog(){
-		trace('initialising Lesson Manager Dialog');
-        //Set up this class to use the Flash event delegation model
+		//Set up this class to use the Flash event delegation model
         EventDispatcher.initialize(this);
         
         //Create a clip that will wait a frame before dispatching init to give components time to setup
@@ -91,8 +89,6 @@
     * Called a frame after movie attached to allow components to initialise
     */
     private function init():Void{
-        
-        trace('now initialising ...');
         //set the reference to the StyleManager
         themeManager = ThemeManager.getInstance();
         
@@ -107,7 +103,8 @@
         //EVENTS
         //Add event listeners for ok, cancel and close buttons
         close_btn.addEventListener('click',Delegate.create(this, close));
-        //Assign Click (close button) and resize handlers
+        
+		//Assign Click (close button) and resize handlers
         _container.addEventListener('click',this);
         _container.addEventListener('size',this);
         
@@ -119,16 +116,12 @@
 		_container.contentLoaded();
     }
 	
-		/**
+	/**
 	 * Called by the worspaceView after the content has loaded
 	 * @usage   
 	 * @return  
 	 */
 	public function setUpContent():Void{
-		
-		//register to recive updates form the model
-		//MonitorModel(_monitorView.getModel()).addEventListener('viewUpdate',this);
-		
 		Debugger.log('_monitorView:'+_monitorView,Debugger.GEN,'setUpContent','org.lamsfoundation.lams.LearnersDialog');
 		
 		//get a ref to the controller and kkep it here to listen for events:
@@ -142,7 +135,6 @@
 		
 		var callback:Function = Proxy.create(this,loadLearners);
 		Application.getInstance().getComms().getRequest('monitoring/monitoring.do?method=getLessonLearners&lessonID='+_root.lessonID,callback, false);
-		
 	}
 	
     /**
@@ -188,9 +180,7 @@
     * Called by the close button 
     */
     private function close(){
-        trace('Close');
-        //close parent window
-        _container.deletePopUp();
+		_container.deletePopUp();
     }
 	
     /**
@@ -225,7 +215,6 @@
     * Event dispatched by parent container when close button clicked
     */
     public function click(e:Object):Void{
-        trace('LessonManagerDialog.click');
         e.target.deletePopUp();
     }
 
@@ -260,6 +249,7 @@
 			var user:User = new User(users[i]);
 			usersArr.push(user);
 		}
+		
 		usersArr.sortOn(["_firstName", "_lastName"], Array.CASEINSENSITIVE);
 		
 		for(var i=0; i<usersArr.length; i++){
@@ -276,7 +266,6 @@
     * Main resize method, called by scrollpane container/parent
     */
     public function setSize(w:Number,h:Number):Void{
-        //Debugger.log('setSize',Debugger.GEN,'setSize','org.lamsfoundation.lams.common.ws.WorkspaceDialog');
         //Size the panel
         panel.setSize(w,h);
 
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/LessonManagerDialog.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/LessonManagerDialog.as,v
diff -u -r1.3 -r1.4
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/LessonManagerDialog.as	26 Mar 2008 01:15:18 -0000	1.3
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/LessonManagerDialog.as	20 Jun 2008 06:15:04 -0000	1.4
@@ -276,7 +276,6 @@
     * If an alert was spawned by this dialog this method is called when it's closed
     */
     private function alertClosed(evt:Object){
-        //_container.deletePopUp();
     }
     
 	/**
@@ -386,7 +385,7 @@
             }else {
 				if(_usersLoadCheckCount >= USERS_LOAD_CHECK_TIMEOUT_COUNT){
 					//if we havent loaded the dict or theme by the timeout count then give up
-					Debugger.log('raeached time out waiting to load dict and themes, giving up.',Debugger.CRITICAL,'checkUILoaded','Application');
+					Debugger.log('reached time out waiting to load dict and themes, giving up.',Debugger.CRITICAL,'checkUILoaded','Application');
 					clearInterval(_UsersLoadCheckIntervalID);
 				}
             }
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/Organisation.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/Organisation.as,v
diff -u -r1.2 -r1.3
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/Organisation.as	25 Mar 2008 23:45:42 -0000	1.2
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/Organisation.as	20 Jun 2008 06:15:04 -0000	1.3
@@ -170,14 +170,15 @@
 	private function getUsersByRole(roleName:String):Array{
 		var usrs:Array = new Array();
 		var keys:Array = _users.keys();
+		
 		Debugger.log("Getting users by role...", Debugger.GEN, "getUsersByRole", "Organisation");
 		for(var i=0; i<keys.length;i++){
 			var user:User = User(_users.get(keys[i]));
-			//var u:User = user.classInstanceRefs;
 			if(user.hasRole(roleName)){
 				usrs.push(user);
 			}
 		}
+		
 		usrs.sortOn(["_firstName", "_lastName"], Array.CASEINSENSITIVE);
 		return usrs;
 	}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/User.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/User.as,v
diff -u -r1.1 -r1.2
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/User.as	5 Jun 2007 02:58:06 -0000	1.1
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/User.as	20 Jun 2008 06:15:04 -0000	1.2
@@ -23,6 +23,7 @@
 
 import org.lamsfoundation.lams.monitoring.*;
 import org.lamsfoundation.lams.common.*;
+
 /*
 * User - singleton class representing a user (teacher, staff, learner)
 */
@@ -64,8 +65,7 @@
 		_userId = userDTO.userID;
 		_firstName = userDTO.firstName;
 		_lastName = userDTO.lastName;
-		_userName = userDTO.login;
-		//setRoles(userDTO.roles);
+		_userName = userDTO.login;
 	}
 	
 	public function getDTO():Object{
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/ViewBranchConditionMappingsDialog.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/ViewBranchConditionMappingsDialog.as,v
diff -u -r1.2 -r1.3
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/ViewBranchConditionMappingsDialog.as	24 Apr 2008 07:27:08 -0000	1.2
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/ViewBranchConditionMappingsDialog.as	20 Jun 2008 06:15:04 -0000	1.3
@@ -21,7 +21,6 @@
  * ************************************************************************
  */
 
-
 import org.lamsfoundation.lams.common.*
 import org.lamsfoundation.lams.common.ws.*
 import org.lamsfoundation.lams.common.ui.*
@@ -159,7 +158,6 @@
     * Called by the OK button 
     */
     private function close(){
-		//close popup
 		_container.deletePopUp();
     }
 	
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/layout/DefaultLayoutManager.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/layout/DefaultLayoutManager.as,v
diff -u -r1.1 -r1.2
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/layout/DefaultLayoutManager.as	5 Jun 2007 02:58:19 -0000	1.1
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/layout/DefaultLayoutManager.as	20 Jun 2008 06:15:05 -0000	1.2
@@ -24,6 +24,7 @@
 import mx.containers.*
 import mx.managers.*
 import mx.utils.*
+
 import org.lamsfoundation.lams.authoring.DesignDataModel
 import org.lamsfoundation.lams.monitoring.Application
 import org.lamsfoundation.lams.monitoring.mv.Monitor
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/ls/Lesson.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/ls/Lesson.as,v
diff -u -r1.1 -r1.2
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/ls/Lesson.as	5 Jun 2007 02:58:17 -0000	1.1
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/ls/Lesson.as	20 Jun 2008 06:15:04 -0000	1.2
@@ -23,10 +23,10 @@
 
 import org.lamsfoundation.lams.monitoring.Application;
 import org.lamsfoundation.lams.monitoring.ls.*;
-//import org.lamsfoundation.lams.monitoring.ls.Lesson;
 import org.lamsfoundation.lams.common.util.*; 
 import org.lamsfoundation.lams.common.Sequence;
-import mx.managers.*;
+import mx.managers.*;
+
 /**
 * Monitoring - LAMS Application
 * @author   Pradeep Sharma
@@ -35,6 +35,7 @@
 	
 	// Model
 	private var lessonModel:LessonModel;
+	
 	// View
 	private var lessonView:LessonView;
 	private var lessonView_mc:MovieClip;
@@ -115,13 +116,9 @@
 		// go through list of DTO's and make Lesson objects to add to hash map
 		for(var i=0; i< lessons.length; i++){
 			var ln:Object = lessons[i];
-			
-			
-			//var lesson:Lesson = new Lesson(sp_mc.content, LESSON_X, LESSON_Y+(LESSON_H*i), libraryView);
 			var seq:Sequence = new Sequence();
 			seq.populateFromDTO(ln);
 			
-			//trace('pushing lesson with id: ' + lessonModel.getLessonID());
 			lns.push(seq);
 		}
 			
@@ -139,10 +136,6 @@
 	
 	}
 	
-	//public function populateFromDTO(dto:Object){
-	//	lessonModel.populateFromDTO(dto);
-	//}
-	
 	/**
 	* Used by application to set the size
 	* @param width The desired width
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/ls/LessonController.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/ls/LessonController.as,v
diff -u -r1.1 -r1.2
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/ls/LessonController.as	5 Jun 2007 02:58:17 -0000	1.1
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/ls/LessonController.as	20 Jun 2008 06:15:04 -0000	1.2
@@ -42,45 +42,18 @@
 	public function LessonController (cm:Observable) {
 		super (cm);
 		_lessonModel = LessonModel(model);
-	}
-	
-	// control methods
+	}
 	
 	/**
 	 * Recieves the click events from the Lesson buttons.  Based on the label
 	 * the relevent method is called to action the user request
 	 * @param   evt 
 	 */
 	public function cellPress(evt):Void{
-		trace(String(evt.target));
-		trace("Item index: " + evt.target.getItemAt(evt.itemIndex).data);
-		trace('onClick event: joining lesson...');
 		var seqID:Number = evt.target.getItemAt(evt.itemIndex).data;
-		trace("Lesson Name: "+seqID);	
+		
 		var seq:Sequence = Sequence(_lessonModel.getLessonSequence(seqID));
 		Application.getInstance().getMonitor().getMM().setSequence(seq);
-		
-		//_lessonModel.getLesson().joinLesson();
-		
-		/*
-		Debugger.log('click evt.target.label:'+evt.target.label,Debugger.GEN,'click','LessonController');
-		var tgt:String = new String(evt.target);
-		if(tgt.indexOf("join") != -1){
-			_lessonModel.getLesson().joinLesson();
-		}*/
+
 	}
-	/**
-	*Called by Lesson when one in clicked
-	* @param lesson - the lesson that was clicked
-	
-	public function selectLesson(lesson:Lesson):Void{
-		_lessonModel = LessonModel(model);
-		//_lessonModel.setSelectedLesson(lesson);
-	}
-	
-	public function getAllLessons():Void {
-		_lessonModel = LessonModel(model);
-		//_lessonModel.getLessons().getAllLessons();
-	}
-	*/
 }
\ No newline at end of file
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/ls/LessonModel.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/ls/LessonModel.as,v
diff -u -r1.1 -r1.2
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/ls/LessonModel.as	5 Jun 2007 02:58:17 -0000	1.1
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/ls/LessonModel.as	20 Jun 2008 06:15:04 -0000	1.2
@@ -77,10 +77,7 @@
 		//clear the old lot
 		_lessonSequences.clear();
 		
-		trace('adding learning seq for length' + lsc.length);
 		for(var i=0; i<lsc.length;i++){
-			trace('adding learning seq with ID: ' + lsc[i].getSequenceID());
-			
 			_lessonSequences.put(lsc[i].getSequenceID(),lsc[i]);
 		}
 		
@@ -146,87 +143,7 @@
 		return _currentlySelectedSequence;
 	}
 	
-	
-	/**
-	public function getNewSequences():Array{
-		if(_learningSequences==null){
-			return null;
-		}
-		
-		return getSequencesByState(NEW_STATE_ID);
-	}
-	
-	public function getStartedSequences():Array{
-		if(_learningSequences==null){
-			return null;
-		}
-		
-		return getSequencesByState(STARTED_STATE_ID);
-	}
-	
-	public function getFinishedSequences():Array{
-		if(_learningSequences==null){
-			return null;
-		}
-		
-		return getSequencesByState(FINISHED_STATE_ID);
-	}
-	*/
-	/**
-	 * Retrieve the Learning Sequences for a specific state
-	 * 
-	 * @param   stateID The state of the sequences to return
-	 * @return  sequences
-	 
-	
-	private function getSequencesByState(stateID:Number):Array{
-		var seqs:Array = new Array();
-		var keys:Array = _learningSequences.keys();
-		
-		for(var i=0; i<keys.length;i++){
-			var seq:Object = _learningSequences.get(keys[i]);
-			var l:Lesson = seq.classInstanceRefs;
-			if(l.checkState(stateID)){
-				seqs.push(l);
-			}
-		}
-		
-		return seqs;
-	}
-	*/
 	/**
-	* Gets last selected Lesson
-	
-	public function getLastSelectedLesson():Lesson{
-		return _lastSelectedLesson;
-	}
-	
-	
-	public function addLessonToLibrary(LessonDTO:Object):Boolean {
-		
-		return true;
-	}
-	
-	private function createLessonFromDTO(LessonDTO:Object):Lesson {
-		// convert to DTO to Lesson object
-		return null;
-	}
-	
-	public function addLesson(lesson:Lesson):Boolean {
-		_learningSequences.put(lesson.getLessonID(), lesson);
-		return true;
-	}
-	
-	public function removeLesson(lesson:Lesson):Boolean {
-		_learningSequences.remove(lesson);
-		return true;
-	}
-	
-	public function getLesson(lessonID:Number):Lesson {
-		return Lesson(_learningSequences.get(lessonID));
-	}
-	*/
-	/**
     * set the size on the model, this in turn will set a changed flag and notify observers (views)
     * @param width - Tookit width
     * @param height - Toolkit height
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/ls/LessonView.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/ls/LessonView.as,v
diff -u -r1.1 -r1.2
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/ls/LessonView.as	5 Jun 2007 02:58:17 -0000	1.1
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/ls/LessonView.as	20 Jun 2008 06:15:04 -0000	1.2
@@ -20,13 +20,12 @@
  * http://www.gnu.org/licenses/gpl.txt
  * ************************************************************************
  */
+
+import org.lamsfoundation.lams.monitoring.*;
+import org.lamsfoundation.lams.monitoring.ls.*;
 
 import org.lamsfoundation.lams.common.*;
 import org.lamsfoundation.lams.common.mvc.*;
-import org.lamsfoundation.lams.monitoring.*;
-import org.lamsfoundation.lams.monitoring.ls.*;
-//import org.lamsfoundation.lams.learner.ls.*;
-import org.lamsfoundation.lams.common.mvc.*;
 import org.lamsfoundation.lams.common.ui.*
 import org.lamsfoundation.lams.common.util.*;
 
@@ -52,6 +51,7 @@
 	private var lsns_Archive:MovieClip;
 	private var lsns_Disabled:MovieClip;
 	private var lsViewExist:Boolean 
+	
 	//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;
@@ -73,7 +73,6 @@
 		//Invoke superconstructor, which sets up MVC relationships.
 		super (m, c);
 		lsViewExist = false;
-		trace('Initiating lesson view...');
 		this.onEnterFrame = createLessons;
 	}
 	
@@ -152,17 +151,17 @@
 			lsns_Active.addEventListener("cellPress",lvc);
 			lsViewExist = true;
 		}
+		
 		lsns_Active.removeAll(); 
 		lsns_Archive.removeAll();
 		lsns_Disabled.removeAll();
+		
 		//loop through the sequences
 		var keys:Array = mySeqs.keys();
-		trace("Length of Keys: "+keys.length)
+		
 		for(var i=0; i<keys.length; i++){
 			
-			//trace('attaching lesson movie for id: ' + keys[i]);
 			var learningSeq:Object = mySeqs.get(keys[i]);
-			
 			var anObject= {Lesson:learningSeq.getSequenceName(), Started:learningSeq.getStartDateTime(), data:learningSeq.getSequenceID()};
 			
 			// Organize Sequences based on their StateID "7" for DISABLED, "6" for ARCHIVED and all the rest of them for ACTIVE.
@@ -178,47 +177,28 @@
 					lsns_Active.removeColumnAt(2);
             }
 			
-		}
-		
-		
-		//lsns_Active.onRelease = Proxy.create(this,this['select']);
-		 //Now that view is setup dispatch loaded event
-       //dispatchEvent({type:'load',target:this});
-		
+		}
 	}
 	
-	
 	/**
 	*The currently selected Lesson
 	* 
 	* @param   o   		The model object that is broadcasting an update.
 	*/
 	private function updateSelectedLesson(o:Observable):Void{
-
 		//get the model
 		var lm = LessonModel(o);
-		
-		//set the states of Lessons
-		//var l = lm.getLastSelectedLesson();
-		//l.setInactive();
-		//var c = lm.getSelectedLesson();
-		//c.setActive();
-		
-		
 	}
 	
-	 /**
+	/**
     * Sets the size of the Toolbar on stage, called from update
     */
 	private function setSize(lm:LessonModel):Void{
 		
         var s:Object = lm.getSize();
 		var p:Object = lm.getPosition();
-		//Size panel
-		trace('lesson view  setting width to '+s.w);
-		//bkg_pnl.setSize(s.w,bkg_pnl._width);
 		
-		       //Panel
+		//Panel
         bkg_pnl.setSize(bkg_pnl._width,s.h);
         
         //Calculate Accordion size
@@ -254,7 +234,8 @@
 	public function getController():LessonController{
 		var l:Controller = super.getController();
 		return LessonController(l);
-	}
+	}
+	
     /**
     * Returns the default controller for this view (LessonController).
 	* Overrides AbstractView.defaultController()
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/IndexButton.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/IndexButton.as,v
diff -u -r1.12 -r1.13
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/IndexButton.as	10 Jan 2008 05:17:05 -0000	1.12
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/IndexButton.as	20 Jun 2008 06:15:04 -0000	1.13
@@ -35,7 +35,11 @@
 import mx.events.*;
 import mx.utils.*;
 import mx.controls.*;
-
+
+/**
+ * 	IndexButton
+ *  @author Daniel Carlier
+ */
 class org.lamsfoundation.lams.monitoring.mv.IndexButton extends MovieClip {
 	
 	public static var _tabID:Number = 2;
@@ -80,6 +84,7 @@
 	public function indexClicked(): Void {
 		Selection.setFocus(mm.getMonitor().getMV().getMonitorLearnerScp()); // take focus off idx textfield as it interferes << and >> button clicks
 		var buttonText:String = String(label.text)
+		
 		if (buttonText == "<<") {
 			Debugger.log("<< clicked", Debugger.GEN, "indexClicked", "IndexButton");
 			mm.drawIndexButtons = false;
@@ -90,6 +95,7 @@
 			mm.updateIndexButtons(">>");
 		} else if (_btnType == "Go") { // 'Go' button
 			mm.learnerIndexView.textFieldContents = String(mm.learnerIndexView.getIdxTextField().text); // backup the string incase need to remove textfield
+			
 			if(!isNaN(mm.learnerIndexView.getIdxTextField().text)) { // if the text field contains a number
 				var idx:Number = Number(mm.learnerIndexView.getIdxTextField().text);
 				if (idx >= 1 && idx <= mm.numIndexButtons) { // if the selected index exists
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/LearnerIcon.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/LearnerIcon.as,v
diff -u -r1.6 -r1.7
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/LearnerIcon.as	4 Mar 2008 04:48:06 -0000	1.6
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/LearnerIcon.as	20 Jun 2008 06:15:04 -0000	1.7
@@ -36,7 +36,7 @@
 import mx.utils.*
 
 /**  
-* CanvasActivity - 
+* LearnerIcon
 */  
 class org.lamsfoundation.lams.monitoring.mv.LearnerIcon extends MovieClip {
   
@@ -74,7 +74,6 @@
 	
 	
 	function LearnerIcon(){
-		//Debugger.log("_activity:"+_activity.title,4,'Constructor','CanvasActivity');
 		_tm = ThemeManager.getInstance();
 		toolTip = new ToolTip();
 		
@@ -88,8 +87,6 @@
 		if(_activity != undefined){
 			init();
 		}
-		
-		
 	}
 	
 	public function init(initObj):Void{
@@ -142,7 +139,6 @@
 	}
 	
 	private function showAssets(isVisible:Boolean){
-		//toolTip._visible = isVisible;
 		if(isVisible) showToolTip();
 		else hideToolTip();
 	}
@@ -154,13 +150,9 @@
 	 * @return  
 	 */
 	private function draw(){
-		
-		//Code for Drawing learner on the activty. 
-				
 		Debugger.log('Learner is in Activity: '+_activity.title,4,'draw','LearnerIcon');
 		setStyles();
-		//toolTip.text = learner.getFullName();
-
+		
 		Debugger.log('hasPlus: '+ _hasPlus,Debugger.CRITICAL,'draw','CanvasActivity');
 		smallCross._visible = _hasPlus;
 		
@@ -198,12 +190,10 @@
 	}
 	
 	private function localOnRollOver():Void{
-		//toolTip._visible = true;
 		showAssets(true);
 	}
 	
 	private function localOnRollOut():Void{
-		//toolTip._visible = false;
 		showAssets(false);
 	}
 	
@@ -218,7 +208,6 @@
 	
 	private function localOnReleaseOutside():Void{
 		Debugger.log('ReleasingOutside:'+this,Debugger.GEN,'onReleaseOutside','CanvasActivity');
-		//toolTip._visible = false;
 		showAssets(false);
 		_monitorController.activityRelease(_clone_mc, "LearnerIcon");
 		_clone_mc.removeMovieClip();
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as,v
diff -u -r1.23 -r1.24
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as	24 Apr 2008 07:27:09 -0000	1.23
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as	20 Jun 2008 06:15:04 -0000	1.24
@@ -20,6 +20,7 @@
  * http://www.gnu.org/licenses/gpl.txt
  * ************************************************************************
  */
+ 
 import org.lamsfoundation.lams.monitoring.Application;
 import org.lamsfoundation.lams.monitoring.Organisation;
 import org.lamsfoundation.lams.monitoring.User;
@@ -286,22 +287,17 @@
 	}
 	
 	private function onStartLesson(b:Boolean){
-		trace('receive back after lesson started..');
 		if(b){
-			trace('lesson started');
 			loadLessonToMonitor(_root.lessonID);
-			
 		} else {
 			// error occured
-			trace('error occurred starting lesson');
 		}
 	}
 	
 	/**
 	 * Create LessonClass using wizard data and CreateLessonClass servlet
 	 * 
 	 */
-	
 	public function createLessonClass():Void{
 		var dto:Object = monitorModel.getLessonClassData();
 		var callback:Function = Proxy.create(this,onCreateLessonClass);
@@ -336,7 +332,6 @@
 
 	public function requestUsers(role:String, orgID:Number, callback:Function){
 		Application.getInstance().getComms().getRequest('workspace.do?method=getUsersFromOrganisationByRole&organisationID='+orgID+'&role='+role,callback, false);
-	
 	}
 
 	/**
@@ -347,7 +342,6 @@
 	 * @return  		Void
 	 */
 	public function openLearningDesign(seq:Sequence){
-		trace('opening learning design...'+ seq.learningDesignID);
 		var designID:Number  = seq.learningDesignID;
         var callback:Function = Proxy.create(this,saveDataDesignModel);
            
@@ -356,8 +350,6 @@
 	}
 	
 	private function saveDataDesignModel(learningDesignDTO:Object){
-		trace('returning learning design...');
-		trace('saving model data...');
 		var seq:Sequence = Sequence(monitorModel.getSequence());
 		_ddm = new DesignDataModel();
 		
@@ -374,8 +366,7 @@
 	}
 
 	public function getContributeActivities(seqID:Number):Void{
-		trace('getting all contribute activities for sequence: ' + seqID);
-        var callback:Function = Proxy.create(monitorModel,monitorModel.setToDos);
+		var callback:Function = Proxy.create(monitorModel,monitorModel.setToDos);
            
 		Application.getInstance().getComms().getRequest('monitoring/monitoring.do?method=getAllContributeActivities&lessonID='+seqID,callback, false);
 		
@@ -388,18 +379,25 @@
 		Application.getInstance().getComms().getRequest('monitoring/monitoring.do?method=getAllLearnersProgress&lessonID=' + seqId, callback, false);
 	}
 	
-	public function getInitialLearnersProgress(seq:Object) { // Not used atm but leaving here in case we ever want to implement batch loading
+	/**
+	 * @deprecated
+	 * Not used atm but leaving here in case we ever want to implement batch loading
+	 */
+	public function getInitialLearnersProgress(seq:Object) {
 		var seqId:Number = seq.getSequenceID();
 		Debugger.log('getting initial progress data for Sequence: '+seqId, Debugger.CRITICAL, "getInitialLearnersProgress", "Monitor");
 		var callback:Function = Proxy.create(this, saveProgressData);	
 		Application.getInstance().getComms().getRequest('monitoring/monitoring.do?method=getInitialLearnersProgress&lessonID=' + seqId,callback, false);
 	}
 	
-	public function getAdditionalLearnersProgress(seq:Object) { // Not used atm but leaving here in case we ever want to implement batch loading
+	/**
+	 * @deprecated
+	 * Not used atm but leaving here in case we ever want to implement batch loading
+	 */
+	public function getAdditionalLearnersProgress(seq:Object) { 
 		var seqId:Number = seq.getSequenceID();
 		Debugger.log('getting additional progress data for Sequence: '+seqId, Debugger.CRITICAL, "getInitialLearnersProgress", "Monitor");
 		var callback:Function = Proxy.create(this, saveProgressData);
-		//Application.getInstance().getComms().getRequest('monitoring/monitoring.do?method=getAdditionalLearnersProgress&lessonID='+seqId+'&lastUserID='+learnerProgressList[learnersProgressList.length-1].userName,callback,false);
 	}
 	
 	private function saveProgressData(progressDTO:Object){
@@ -427,34 +425,34 @@
 		
 		switch(String(taskType)){
 			case '1' :
-				seqStat = Dictionary.getValue("ls_seq_status_moderation"); // "Moderation"
+				seqStat = Dictionary.getValue("ls_seq_status_moderation"); 			// "Moderation"
 				break;
 			case '2' :
-				seqStat = Dictionary.getValue("ls_seq_status_define_later"); // "Define Later"
+				seqStat = Dictionary.getValue("ls_seq_status_define_later"); 		// "Define Later"
 				break;
 			case '3' :
-				seqStat = Dictionary.getValue("ls_seq_status_perm_gate"); // "Permission Gate"
+				seqStat = Dictionary.getValue("ls_seq_status_perm_gate"); 			// "Permission Gate"
 				break;
 			case '4' :
-				seqStat = Dictionary.getValue("ls_seq_status_synch_gate"); // "Syncronise Gate"
+				seqStat = Dictionary.getValue("ls_seq_status_synch_gate"); 			// "Syncronise Gate"
 				break;
 			case '5' :
-				seqStat = Dictionary.getValue("ls_seq_status_sched_gate"); // "Schedule Gate"
+				seqStat = Dictionary.getValue("ls_seq_status_sched_gate"); 			// "Schedule Gate"
 				break;
 			case '6' :
-				seqStat = Dictionary.getValue("ls_seq_status_choose_grouping"); // "Choose Grouping"
+				seqStat = Dictionary.getValue("ls_seq_status_choose_grouping"); 	// "Choose Grouping"
 				break;
 			case '7' :
-				seqStat = Dictionary.getValue("ls_seq_status_contribution"); // "Contribution"
+				seqStat = Dictionary.getValue("ls_seq_status_contribution"); 		// "Contribution"
 				break;
 			case '8' :
-				seqStat = Dictionary.getValue("ls_seq_status_system_gate"); // "System Gate"
+				seqStat = Dictionary.getValue("ls_seq_status_system_gate"); 		// "System Gate"
 				break;
 			case '9' :
-				seqStat = Dictionary.getValue("ls_seq_status_teacher_branching"); // "Teacher Chosen Branching"
+				seqStat = Dictionary.getValue("ls_seq_status_teacher_branching"); 	// "Teacher Chosen Branching"
 				break;
 			default:
-				seqStat = Dictionary.getValue("ls_seq_status_not_set"); // "Not yet set"
+				seqStat = Dictionary.getValue("ls_seq_status_not_set"); 			// "Not yet set"
 		}
 		
 		return seqStat;
@@ -469,20 +467,18 @@
 	public function clearCanvas(noWarn:Boolean):Boolean{
 		var s = false;
 		var ref = this;
+		
 		Debugger.log('noWarn:'+noWarn,4,'clearCanvas','Monitor');
+		
 		if(noWarn){
 			
 			_ddm = new DesignDataModel();
-			//as its a new instance of the ddm,need to add the listener again
-			//_ddm.addEventListener('ddmUpdate',Proxy.create(this,onDDMUpdated));
 			
 			Debugger.log('noWarn2:'+noWarn,4,'clearCanvas','Monitor');//_ddm.addEventListener('ddmBeforeUpdate',Proxy.create(this,onDDMBeforeUpdate));
 			
 			monitorModel.setDirty();
 			return true;
 		}else{
-			//var fn:Function = Proxy.create(ref,confirmedClearDesign, ref);
-			//LFMessage.showMessageConfirm(Dictionary.getValue('new_confirm_msg'), fn,null);
 			Debugger.log('Set design failed as old design could not be cleared',Debugger.CRITICAL,"setDesign",'Canvas');		
 		}
 	}
@@ -642,11 +638,6 @@
 		
 		Debugger.log("Check OK. Proceed with opening design.",Debugger.GEN,'setupEditOnFly','Monitor');
 		
-		//var loader_url = Config.getInstance().serverUrl + "lams_preloader.swf?loadFile=lams_authoring.swf&loadLibrary=lams_authoring_library.swf&serverURL=" + Config.getInstance().serverUrl + "&userID=" + _root.userID  + "&build=" + _root.build + "&lang=" + _root.lang + "&country=" + _root.country + "&langDate=" + _root.langDate + "&theme=" + _root.theme + "&uniqueID=undefined" + "&layout=" + ApplicationParent.EDIT_MODE + "&learningDesignID=" + monitorModel.getSequence().learningDesignID;
-		//Debugger.log("url: " + loader_url, Debugger.CRITICAL, 'openEditOnFly', 'MonitorView');
-		
-		//JsPopup.getInstance().launchPopupWindow(loader_url , 'AuthoringWindow', 570, 796, true, true, false, false, false);
-		
 		var designID:Number = monitorModel.getSequence().learningDesignID;
 		if(designID != null)
 			ApplicationParent.extCall("openAuthorForEditOnFly", String(designID));
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as,v
diff -u -r1.27 -r1.28
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as	30 Apr 2008 04:47:48 -0000	1.27
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as	20 Jun 2008 06:15:04 -0000	1.28
@@ -439,6 +439,7 @@
 					if(ca.activity.parentUIID != null &&  (ca.activity.activityTypeID == Activity.PARALLEL_ACTIVITY_TYPE || 
 						ca.activity.activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE ||
 						ca.activity.activityTypeID == Activity.OPTIONS_WITH_SEQUENCES_TYPE)) {
+						
 						// open complex inside complex view
 						Debugger.log("open complex viewer: " + ca.activity.activityUIID, Debugger.CRITICAL, "activityDoubleClick", "MonitorController")
 						_monitorModel.getMonitor().openComplexView(ca);
@@ -539,7 +540,7 @@
 			LessonTabView(getView()).dialog = evt.target.scrollContent;
 			
 			//set up UI
-			//note this function registeres the dialog to recieve view updates
+			//note this function registeres the dialog to receive view updates
 			evt.target.scrollContent.setUpContent();		
 			
         } else {
@@ -555,7 +556,6 @@
         Debugger.log('!okClicked:'+evt.type+', now follows the resultDTO:',Debugger.GEN,'okClicked','org.lamsfoundation.lams.MonitorController');
         //Check type is correct
 		if(evt.type == 'okClicked'){
-			
             //Call the callback, passing in the design selected designId
 
 			//invalidate the cache of folders
@@ -574,11 +574,9 @@
     public function onTreeNodeOpen (evt:Object){
 		var treeview = evt.target;
 		var nodeToOpen:XMLNode = evt.node;
+		
 		Debugger.log('nodeToOpen organisationID:'+nodeToOpen.attributes.data.organisationID,Debugger.GEN,'onTreeNodeOpen','org.lamsfoundation.lams.MonitorController');
 		Debugger.log('nodeToOpen org name:'+nodeToOpen.attributes.data.name,Debugger.GEN,'onTreeNodeOpen','org.lamsfoundation.lams.MonitorController');
-		//if this ndoe has children then the 
-		//data has already been got, nothing to do
-		
     }
 	
 	/**
@@ -595,10 +593,8 @@
 	 * @param   lessonID 
 	 * @return  
 	 */
-	
 	public function editLessonClass(resultDTO:Object){
 		_monitorModel.resultDTO = resultDTO;
-		trace('editing lesson class');
 		_monitorModel.getMonitor().createLessonClass();
 	}
 
@@ -624,7 +620,7 @@
 					
 					break;
 				case LessonTabView.NULL_CBI :
-					// error msg
+					// TODO: error msg
 					break;
 				case LessonTabView.ACTIVE_CBI :
 					_monitorModel.activateSequence();
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorLearnerActivity.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorLearnerActivity.as,v
diff -u -r1.1 -r1.2
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorLearnerActivity.as	5 Jun 2007 02:58:15 -0000	1.1
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorLearnerActivity.as	20 Jun 2008 06:15:04 -0000	1.2
@@ -37,24 +37,28 @@
 import mx.utils.*
 
 /**  
-* CanvasActivity - 
+* MonitorLearnerActivity 
 */  
-class org.lamsfoundation.lams.monitoring.mv.MonitorLearnerActivity extends MovieClip {  
-//class org.lamsfoundation.lams.authoring.cv.CanvasActivity extends MovieClip{  
+class org.lamsfoundation.lams.monitoring.mv.MonitorLearnerActivity extends MovieClip {
+	
 	public static var GATE_ACTIVITY_HEIGHT:Number =50;
 	public static var GATE_ACTIVITY_WIDTH:Number = 50;
 	public static var TOOL_ACTIVITY_WIDTH:Number = 123.1;
 	public static var TOOL_ACTIVITY_HEIGHT:Number = 50.5;
+	
 	private var xPos:Number;
-	private var yPos:Number;
+	private var yPos:Number;
+	
 	//this is set by the init object
 	private var _monitorController:MonitorController;
 	private var _monitorView;
 	private var _tm:ThemeManager;
+	
 	//TODO:This should be ToolActivity
 	private var _activity:Activity;
 	private var _isSelected:Boolean;
 	private var app:Application;
+	
 	//locals
 	private var actStatus:String;
 	private var learner:Object = new Object();
@@ -75,14 +79,13 @@
 	private var _visibleHeight:Number;
 	private var _base_mc:MovieClip;
 	private var _selected_mc:MovieClip;
-	
-	
-	
+
 	function MonitorLearnerActivity(){
-		//Debugger.log("_activity:"+_activity.title,4,'Constructor','CanvasActivity');
 		_tm = ThemeManager.getInstance();
+		
 		//Get reference to application and design data model
 		app = Application.getInstance();
+		
 		//let it wait one frame to set up the components.
 		//this has to be set b4 the do later :)
 		if(_activity.isGateActivity()){
@@ -92,6 +95,7 @@
 			_visibleHeight = MonitorLearnerActivity.TOOL_ACTIVITY_HEIGHT;
 			_visibleWidth = MonitorLearnerActivity.TOOL_ACTIVITY_WIDTH;
 		}
+		
 		//_base_mc = this;
 		//call init if we have passed in the _activity as an initObj in the attach movie,
 		//otherwise wait as the class outside will call it
@@ -110,15 +114,11 @@
 		}
 		
 		showAssets(false);
-		
-		
 
-		
 		if(!_activity.isGateActivity() && !_activity.isGroupActivity()){
-			//loadIcon();
 		}
+		
 		setStyles();
-		trace("Data for sentFrom: "+sentFrom)
 		MovieClipUtils.doLater(Proxy.create(this,draw));
 
 	}
@@ -140,7 +140,6 @@
 	 */
 	public function refresh():Void{
 		draw();
-		//setSelected(_isSelected);
 	}
 	
 	/**
@@ -153,17 +152,15 @@
 		clickTarget_mc.onPress = Proxy.create (this, localOnPress);
 		clickTarget_mc.onRelease = Proxy.create (this, localOnRelease);
 		clickTarget_mc.onReleaseOutside = Proxy.create (this, localOnReleaseOutside);
+		
 		Debugger.log(_activity.title+',_activity.isGateActivity():'+_activity.isGateActivity(),4,'draw','CanvasActivity');
-		trace("Status returned for the learner "+learner.getUserName()+" activityID "+this.activity.activityID+ " is "+actStatus)
+		
 		if (actStatus == undefined){
 			actStatus = Progress.compareProgressData(learner, _activity.activityID);
 		}
-		trace("Status returned for the learner "+learner.getUserName()+" activityID "+this.activity.activityID+ " is "+actStatus)
 		
 		title_lbl._visible = true;
 		
-		//clickTarget_mc._visible = true;
-		
 		switch (actStatus){
 		    case 'completed_mc' :
 				completed_mc._visible = true;
@@ -179,28 +176,21 @@
                 break;
 			default :
 				todo_mc._visible = true;
-                //Debugger.log('unknown update type :' + infoObj.updateType,Debugger.CRITICAL,'update','org.lamsfoundation.lams.MonitorView');
 		}
 			
 		//write text
 		title_lbl.text = _activity.title;
-									//Debugger.log('canvasActivity_mc._visible'+canvasActivity_mc._visible,4,'draw','CanvasActivity');
-		//_visible = true;
 	}
 	
 		
 	private function localOnPress():Void{
-		
-			
 			// check double-click
 			var now:Number = new Date().getTime();
 			
 			if((now - _dcStartTime) <= Config.DOUBLE_CLICK_DELAY){
 				if (app.controlKeyPressed != "transition"){
 					_doubleClicking = true;
-					
 						_monitorController.activityDoubleClick(this);
-					
 				}
 			}else{
 				Debugger.log('SingleClicking:+'+this,Debugger.GEN,'onPress','MonitorLearnerActivity');
@@ -214,7 +204,6 @@
 	private function localOnRelease():Void{
 		if(!_doubleClicking){
 			Debugger.log('Releasing:'+this,Debugger.GEN,'onRelease','MonitorLearnerActivity');
-				trace("Activity ID is: "+this.activity.activityID)	
 				_monitorController.activityRelease(this);
 		}
 		
@@ -224,10 +213,7 @@
 		Debugger.log('ReleasingOutside:'+this,Debugger.GEN,'onReleaseOutside','MonitorLearnerActivity');
 		_monitorController.activityReleaseOutside(this);
 	}
-	
 	
-	
-	
 	/**
 	 * 
 	 * @usage   
@@ -236,7 +222,6 @@
 	public function getVisibleWidth ():Number {
 		return _visibleWidth;
 	}
-
 	
 	/**
 	 * 
@@ -279,10 +264,6 @@
 		
 		title_lbl.setStyle('styleName',styleObj);
 		title_lbl.setStyle('textAlign', 'center');
-		
-		//styleObj = _tm.getStyleObject('ACTPanel')
-		//act_pnl.setStyle('styleName',styleObj);
-			
     }
     
 
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorLockView.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorLockView.as,v
diff -u -r1.1 -r1.2
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorLockView.as	5 Jun 2007 02:58:15 -0000	1.1
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorLockView.as	20 Jun 2008 06:15:04 -0000	1.2
@@ -102,12 +102,9 @@
 	/**
 	* Called to initialise Canvas  . CAlled by the Canvas container
 	*/
-	public function init(m:Observable,c:Controller,x:Number,y:Number,w:Number,h:Number, enabled:Boolean){
-
+	public function init(m:Observable,c:Controller,x:Number,y:Number,w:Number,h:Number, enabled:Boolean) {
 		super (m, c);
-		
-		MovieClipUtils.doLater(Proxy.create(this,draw,enabled)); 
-		
+		MovieClipUtils.doLater(Proxy.create(this,draw,enabled));
     }    
 	
 	/**
@@ -150,9 +147,6 @@
 		_enabled = enabled;
 		action_btn.addEventListener("click",mcontroller);
 		
-		// display continue button?
-		//action_btn._visible = (enabled) ? true : false;
-		
 		setLabels(enabled);
 		setStyles();
 		
@@ -234,6 +228,7 @@
 		var obj:Object = app.layout.manager.checkAvailability(mm.getSequence());
 		
 		Debugger.log("isLocked: " + obj.locked + " isEditingUser: " + obj.isEditingUser, Debugger.CRITICAL, "checkAvailability", "MonitorLockView");
+		
 		if(!obj.locked) {
 			// reload monitor
 			Debugger.log("Now unlocked, Reloading UI" + obj.isEditingUser, Debugger.CRITICAL, "checkAvailability", "MonitorLockView");
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as,v
diff -u -r1.37 -r1.38
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as	31 Mar 2008 05:19:13 -0000	1.37
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorModel.as	20 Jun 2008 06:15:04 -0000	1.38
@@ -114,12 +114,11 @@
 	private var ddmTransition_keys:Array;
 	private var _orgs:Array;
 	private var _resultDTO:Object;
-	//private var _selectedTreeNode:XMLNode;
 	
 	private static var USER_LOAD_CHECK_INTERVAL:Number = 50;
 	private static var USER_LOAD_CHECK_TIMEOUT_COUNT:Number = 200;
-	private var _UserLoadCheckIntervalID:Number;         //Interval ID for periodic check on User Load status
-	private var _userLoadCheckCount = 0;				// instance counter for number of times we have checked to see if users are loaded	
+	private var _UserLoadCheckIntervalID:Number;         	//Interval ID for periodic check on User Load status
+	private var _userLoadCheckCount = 0;					// instance counter for number of times we have checked to see if users are loaded	
 	
 	private var _currentLearnerIndex:Number;
 	private var _oldIndex:Number;
@@ -145,8 +144,6 @@
 	private var dispatchEvent:Function;       
     public var addEventListener:Function;  
     public var removeEventListener:Function;
-	
-	//private var _config:Config;
 	
 	/**
 	* Constructor.
@@ -971,7 +968,6 @@
 			if(_staffLoaded && _learnersLoaded) {
 				clearInterval(_UserLoadCheckIntervalID);
 				
-				trace('ALL USERS LOADED -CONTINUE');
 				// populate learner/staff scrollpanes
 				broadcastViewUpdate("USERS_LOADED", null, null);
 				
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorTransition.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorTransition.as,v
diff -u -r1.2 -r1.3
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorTransition.as	23 Oct 2007 08:44:01 -0000	1.2
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorTransition.as	20 Jun 2008 06:15:04 -0000	1.3
@@ -34,10 +34,7 @@
 /**  
 * -+ - 
 */  
-class org.lamsfoundation.lams.monitoring.mv.MonitorTransition extends MovieClip{  
-	//set by passing initObj to mc.createClass()
-	//private var _MonitorController:CanvasController;
-	//private var _monitorTabView:MonitorTabView;
+class org.lamsfoundation.lams.monitoring.mv.MonitorTransition extends MovieClip {
 	
 	private var _transition:Transition;
 	
@@ -47,18 +44,13 @@
 	private var stopArrow_mc:MovieClip;
 	private var stopSign_mc:MovieClip;
 	
-	
 	private var _startPoint:Point;
 	private var _midPoint:Point;
 	private var _endPoint:Point;
 	
-	
-	
 	private var _dcStartTime:Number = 0;
 	private var _doubleClicking:Boolean;
 	
-	
-	
 	function MonitorTransition(){
 		
 		arrow_mc._visible = false;
@@ -87,8 +79,6 @@
 		return _midPoint;
 	}
 	
-	
-	
 	/**
 	 * Renders the transition to stage
 	 * @usage   
@@ -118,7 +108,6 @@
 		this.lineStyle(2, _drawnLineStyle);
 		this.moveTo(_startPoint.x, _startPoint.y);
 		
-		//this.dashTo(startX, startY, endX, endY, 8, 4);
 		this.lineTo(_endPoint.x, _endPoint.y);
 		
 		// calculate the position and angle for the arrow_mc
@@ -131,9 +120,7 @@
 		var angle:Number = Math.atan2((_endPoint.y- _startPoint.y),(_endPoint.x- _startPoint.x));
 		var degs:Number = Math.round(angle*180/Math.PI);
 		arrow_mc._rotation = degs;
-		arrow_mc._visible = true;
-		
+		arrow_mc._visible = true;		
 	}
-	
 
 }
\ No newline at end of file
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorView.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorView.as,v
diff -u -r1.12 -r1.13
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorView.as	30 Jan 2008 03:39:49 -0000	1.12
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorView.as	20 Jun 2008 06:15:04 -0000	1.13
@@ -41,10 +41,9 @@
 
 
 /**
-*Monitoring view for the Monitor
+* Monitoring view for the Monitor
 * Relects changes in the MonitorModel
 */
-
 class org.lamsfoundation.lams.monitoring.mv.MonitorView extends AbstractView{
 	
 	private var _className = "MonitorView";
@@ -94,18 +93,23 @@
 	//LessonTabView
 	private var lessonTabView:LessonTabView;
 	private var lessonTabView_mc:MovieClip;
+	
 	//MonitorTabView
 	private var monitorTabView:MonitorTabView;
 	private var monitorTabView_mc:MovieClip;
+	
 	//MonitorGateView
 	private var monitorGateView:MonitorGateView;
 	private var monitorGateView_mc:MovieClip;
+	
 	//TodoTabView
 	private var todoTabView:TodoTabView;
 	private var todoTabView_mc:MovieClip;
+	
 	//LearnerTabView
 	private var learnerTabView:LearnerTabView;
 	private var learnerTabView_mc:MovieClip;
+	
 	//LearnerIndexView
 	private var learnerIndexView:LearnerIndexView;
 	private var learnerIndexView_mc:MovieClip;
@@ -123,7 +127,6 @@
     public var addEventListener:Function;
     public var removeEventListener:Function;
 	
-	
 	/**
 	* Constructor
 	*/
@@ -146,12 +149,12 @@
 	* Called to initialise Canvas  . Called by the Canvas container
 	*/
 	public function init(m:Observable,c:Controller,x:Number,y:Number,w:Number,h:Number){
-
 		super (m, c);
+		
         //Set up parameters for the grid
 		H_GAP = 10;
 		V_GAP = 10;
-		//_monitorModel = getModel();
+		
 		bkg_pnl._visible = false;
 		
 		MovieClipUtils.doLater(Proxy.create(this,draw)); 
@@ -283,8 +286,8 @@
 		setLabels();
 		setStyles();
 		setupTabInit();
-	    dispatchEvent({type:'load',target:this});
 		
+	    dispatchEvent({type:'load',target:this});
 	}
 	
 	private function setupTabInit(){
@@ -334,16 +337,6 @@
 		var btnLabel = btnObj.label;
 		var xpos:Number = btnObj._x;
 		
-		/**
-		if (btnLabel == "Help"){
-			xpos = bkgHeader_pnl.width - 165 //btnObj._x - 105
-		}else if (btnLabel == "Refresh"){
-			xpos = bkgHeader_pnl.width - 165 //btnObj._x - 40
-		}else{
-			xpos = btnObj._x
-		}
-		*/
-		
 		var Xpos = Application.MONITOR_X + xpos;
 		var Ypos = (Application.MONITOR_Y + btnObj._y + btnObj.height) + 5;
 		var ttHolder = ApplicationParent.tooltip;
@@ -398,11 +391,12 @@
 		
 		bkgHeader_pnl.setSize(s.w, bkgHeader_pnl._height);
 
-		//monitorLesson_scp.setSize(s.w-monitorLesson_scp._x, s.h-monitorLesson_scp._y);
 		monitorLesson_scp.setSize(s.w-monitorLesson_scp._x, s.h);
-		monitorSequence_scp.setSize(s.w-monitorSequence_scp._x, s.h-40.7); // endGate height = 40.7
+		monitorSequence_scp.setSize(s.w-monitorSequence_scp._x, s.h-40.7); 				// endGate height = 40.7
 		monitorGateView.setSize(mm);
+		
 		Debugger.log("MonitorViews.w: "+s.w, Debugger.CRITICAL, "setSize", "MonitorView");
+		
 		learnerIndexView.setSize(mm);
 		(mm.numIndexButtons > 1 || mm.inSearchView) ? monitorLearner_scp.setSize(s.w-monitorLearner_scp._x, s.h-20) : monitorLearner_scp.setSize(s.w-monitorLearner_scp._x, s.h);
 				
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerIndexView.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerIndexView.as,v
diff -u -r1.17 -r1.18
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerIndexView.as	10 Jan 2008 05:17:05 -0000	1.17
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerIndexView.as	20 Jun 2008 06:15:04 -0000	1.18
@@ -42,7 +42,11 @@
 import mx.events.*;
 import mx.utils.*;
 import mx.controls.*;
-
+
+/**
+ * Page index panel when LearnerTabView is active
+ * @author Daniel Carlier
+ */
 class org.lamsfoundation.lams.monitoring.mv.tabviews.LearnerIndexView extends AbstractView {
 	
 	public static var _tabID:Number = 2;
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerTabView.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerTabView.as,v
diff -u -r1.15 -r1.16
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerTabView.as	21 Feb 2008 07:37:25 -0000	1.15
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerTabView.as	20 Jun 2008 06:15:04 -0000	1.16
@@ -44,10 +44,9 @@
 
 
 /**
-*Monitoring Tab view for the Monitor
-* Reflects changes in the MonitorModel
+* Learner Tab View for the Monitor
+* Reflects progress data of the learner class.
 */
-
 class org.lamsfoundation.lams.monitoring.mv.tabviews.LearnerTabView extends AbstractView {
 	
 	public static var _tabID:Number = 2;
@@ -250,9 +249,9 @@
 			update(mm, evtArr[drawCount])
 			setSize(mm);
 		} else {
-			//setSize(mm);
 			activitiesDrawn = 0;
 			drawNextLearner();
+			
 			return;
 		}
 		
@@ -263,8 +262,7 @@
     * layout visual elements on the MonitorTabView on initialisation
     */
 	private function draw(){
-		//set up the Movie Clips to load relevant  
-		
+		//set up the Movie Clips to load relevant  
 		this._nameLayer_mc = this.createEmptyMovieClip("_nameLayer_mc", this.getNextHighestDepth(),{_y:learnerMenuBar._height});
 		this._activityLayer_mc = this.createEmptyMovieClip("_activityLayer_mc", this.getNextHighestDepth(),{_y:learnerMenuBar._height});
 		
@@ -331,7 +329,6 @@
 		if (mm.numIndexButtons > 1 && !panelLowered) {
 			if (hAdjustment) {
 				_scroll.setSize(s.w-_scroll._x, s.h - 20);
-				//_scroll.setSize(s.w-_scroll._x, s.h);
 				hAdjustment = false;
 			}
 			
@@ -526,7 +523,6 @@
 			ACT_X = newActivity_mc._x + newActivity_mc._width;
 			
 		} else if(a.activityTypeID==Activity.PARALLEL_ACTIVITY_TYPE || a.activityTypeID==Activity.OPTIONAL_ACTIVITY_TYPE || a.activityTypeID==Activity.OPTIONS_WITH_SEQUENCES_TYPE || a.isBranchingActivity()){
-			//get the children
 			var children:Array = mm.getMonitor().ddm.getComplexActivityChildren(a.activityUIID);
 			newActivity_mc = _activityLayer_mc.createChildAtDepth("LearnerComplexActivity", _activityLayer_mc.getNextHighestDepth(),{_activity:a,_children:children,_controller:mc,_view:ltv, _x:ACT_X, _y:ACT_Y+40, learner:learner});
 			
@@ -612,8 +608,6 @@
     * Sets the size of the canvas on stage, called from update
     */
 	private function setSize(mm:MonitorModel):Void{
-		//var s:Object = mm.getSize(); // when taken from monitor model wasn't setting size properly with 1 learner
-		
 		if (mostRowActivities < activitiesDrawn)
 			mostRowActivities = activitiesDrawn;
 			
@@ -626,7 +620,7 @@
 		}
 
 		bkg_pnl._visible = false;
-		bkg_pnl.setSize(_activityLayer_mc._width + 6, 0); // fixes scroll display issue though 0 height is questionable
+		bkg_pnl.setSize(_activityLayer_mc._width + 6, 0); 		// fixes scroll display issue though 0 height is questionable
 		
 		mm.getMonitor().getMV().getMonitorLearnerScp().redraw(true);
 }
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as,v
diff -u -r1.8 -r1.9
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as	11 Mar 2008 02:16:17 -0000	1.8
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as	20 Jun 2008 06:15:04 -0000	1.9
@@ -33,18 +33,17 @@
 import org.lamsfoundation.lams.authoring.Activity;
 import org.lamsfoundation.lams.common.dict.*
 import org.lamsfoundation.lams.common.mvc.*
-import org.lamsfoundation.lams.common.ToolTip;
+import org.lamsfoundation.lams.common.ToolTip;
+
 import mx.controls.*;
 import mx.managers.*;
 import mx.containers.*;
 import mx.events.*;
 import mx.utils.*;
 
 /**
-*Monitoring view for the Monitor
-* Relects changes in the MonitorModel
+* Lesson view for the Monitor
 */
-
 class org.lamsfoundation.lams.monitoring.mv.tabviews.LessonTabView extends AbstractView{
 	public static var _tabID:Number = 0;
 	
@@ -139,7 +138,6 @@
     public var addEventListener:Function;
     public var removeEventListener:Function;
 
-	
 	/**
 	* Constructor
 	*/
@@ -151,8 +149,7 @@
 		_tip = new ToolTip();
 		
 		//Init for event delegation
-        mx.events.EventDispatcher.initialize(this);
-		
+        mx.events.EventDispatcher.initialize(this);
 	}
 	
 	/**
@@ -168,11 +165,11 @@
 	}    
 	
 	/**
- * Recieved update events from the CanvasModel. Dispatches to relevent handler depending on update.Type
- * @usage   
- * @param   event
- */
-public function update (o:Observable,infoObj:Object):Void{
+	* Recieved update events from the CanvasModel. Dispatches to relevent handler depending on update.Type
+	* @usage   
+	* @param   event
+	*/
+	public function update (o:Observable,infoObj:Object):Void{
 		
        mm = MonitorModel(o);
 	   
@@ -194,7 +191,6 @@
 					mm.broadcastViewUpdate("JOURNALSSHOWHIDE", false);
 					
 					if(mm.getIsProgressChangedLesson()){
-						trace("I am calling reloadProgress now")
 						reloadProgress(false);
 					}
 					
@@ -218,7 +214,6 @@
 				break;
 			case 'RELOADPROGRESS' :	
 					if (infoObj.tabID == _tabID && !mm.locked){
-						trace("called Reload progress")
 						reloadProgress(true);
 					}
 					break;
@@ -305,14 +300,15 @@
 	 */
 	private function reloadProgress(isChanged:Boolean){
 		
-			if (isChanged == false){
-				mm.setIsProgressChangedLesson(false);
-				
-			}else {
-				mm.setIsProgressChangedLearner(true);
-				mm.setIsProgressChangedSequence(true)
-			}
-			mm.getMonitor().reloadLessonToMonitor();
+		if (isChanged == false){
+			mm.setIsProgressChangedLesson(false);
+			
+		}else {
+			mm.setIsProgressChangedLearner(true);
+			mm.setIsProgressChangedSequence(true)
+		}
+		
+		mm.getMonitor().reloadLessonToMonitor();
 	}
 	
 	/**
@@ -321,6 +317,7 @@
 	private function draw(){
 		Debugger.log('Lesson Launch set in sysadmin :'+_root.lessonLaunch, Debugger.CRITICAL,'Draw','org.lamsfoundation.lams.LessonTabView');
 		listCount = 0; 
+		
 		this.onEnterFrame = setupLabels;
 		
 		_monitorReqTask_mc = reqTasks_scp.content;
@@ -390,12 +387,11 @@
 		reqTasks_scp._y = reqTasks_scp._y - 30
 		learner_expp_cb._y = learner_expp_cb._y - 30
 		learner_expp_cb_lbl._y = learner_expp_cb_lbl._y - 30
-		
-		
-	}
+	}
+	
 	/**
 	 * Populate the lesson details from HashTable Sequence in MOnitorModel
-	*/
+	 */
 	private function populateLessonDetails():Void{
 		
 		var s:Object = mm.getSequence();
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as,v
diff -u -r1.34 -r1.35
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as	28 Mar 2008 02:32:52 -0000	1.34
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as	20 Jun 2008 06:15:04 -0000	1.35
@@ -156,8 +156,8 @@
 					}
 					else {
 						mm.getMonitor().getMV().getMonitorSequenceScp()._visible = false;
-						//this._visible = false;
-					}
+					}
+					
 					break;
 				case 'PROGRESS' :
 					if (infoObj.tabID == _tabID){
@@ -215,7 +215,8 @@
 						drawDesignCalled = "called";
 						
 						mm.drawDesign(infoObj.tabID);
-					}
+					}
+					
 					break;
 				case 'DRAW_ALL' :
 					if (infoObj.tabID == _tabID && !mm.locked){
@@ -238,12 +239,8 @@
 		content = this;
 		
 		bkg_pnl = this.attachMovie("Panel", "bkg_pnl", this.getNextHighestDepth());
-
 		gridLayer = this.createEmptyMovieClip("_gridLayer_mc", this.getNextHighestDepth());
-		
 		transitionLayer = this.createEmptyMovieClip("_transitionLayer_mc", this.getNextHighestDepth());
-		//branchLayer = this.createEmptyMovieClip("_branchLayer_mc", this.getNextHighestDepth());
-		
 		activityLayer = this.createEmptyMovieClip("_activityLayer_mc", this.getNextHighestDepth(),{_y:learnerMenuBar._height});
 		
 		// creates learner icon on initial draw
@@ -275,11 +272,10 @@
 		
 		showAssets(true);
 		
-		//mm.openBranchingActivity = mm.currentBranchingActivity.activity.activityUIID;
 		mm.activeView = this;
 		mm.currentBranchingActivity = null;
-		//Remove all the movies drawn on the transition and activity movieclip holder
 		
+		//Remove all the movies drawn on the transition and activity movieclip holder
 		this._learnerContainer_mc.removeMovieClip();
 		this.transitionLayer.removeMovieClip();
 		this.activityLayer.removeMovieClip();
@@ -290,9 +286,7 @@
 	
 		//Recreate both Transition holder and Activity holder Movieclips
 		transitionLayer = this.createEmptyMovieClip("_transitionLayer_mc", this.getNextHighestDepth());
-		
 		activityLayer = this.createEmptyMovieClip("_activityLayer_mc", this.getNextHighestDepth(),{_y:learnerMenuBar._height});
-		
 		_learnerContainer_mc = this.createEmptyMovieClip("_learnerContainer_mc", this.getNextHighestDepth());
 		
 		transparentCover = this.attachMovie("Panel", "_transparentCover_mc", this.getNextHighestDepth(), {_visible: false, enabled: true, _alpha: 50});
@@ -565,10 +559,8 @@
     */
 	private function setPosition(mm:MonitorModel):Void{
         var p:Object = mm.getPosition();
-		trace("X pos set in Model is: "+p.x+" and Y pos set in Model is "+p.y)
         this._x = p.x;
         this._y = p.y;
-		
 	}
 	
 	public function getLearnerIcon():MovieClip {
@@ -579,12 +571,6 @@
 		return mm.getMonitor().ddm;
 	}
 	
-	/**
-	public function get model():MonitorModel {
-		return mm;
-	}
-	*/
-	
 	/**
 	 * Overrides method in abstract view to ensure cortect type of controller is returned
 	 * @usage   
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/TodoTabView.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/TodoTabView.as,v
diff -u -r1.1 -r1.2
--- lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/TodoTabView.as	5 Jun 2007 02:58:10 -0000	1.1
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/TodoTabView.as	20 Jun 2008 06:15:04 -0000	1.2
@@ -37,13 +37,14 @@
 import mx.utils.*;
 
 /**
-*Monitoring view for the Monitor
+* Monitoring ToDo tab view for the Monitor
 * Relects changes in the MonitorModel
 */
 
 class org.lamsfoundation.lams.monitoring.mv.tabviews.TodoTabView extends AbstractView{
 	public static var _tabID:Number = 3;
 	private var _className = "TodoTabView";
+	
 	//constants:
 	private var _tm:ThemeManager;
 	private var mm:MonitorModel;
@@ -56,7 +57,7 @@
 	private var _monitorTodoTask_mc:MovieClip;
 	private var goContribute:Button;	
 	private var btnLabel:String;
-	// Background
+	
 	private var bkg_pnl:MovieClip;
 		
 	//Text Items
@@ -69,18 +70,19 @@
     private var dispatchEvent:Function;     
     public var addEventListener:Function;
     public var removeEventListener:Function;
-	//public var menu:ContextMenu;
-
 	
 	/**
 	* Constructor
 	*/
 	function TodoTabView(){
 		_todoTabView = this;
 		_monitorTodoTask_mc = this;
+		
 		this._visible = false;
+		
 		_tm = ThemeManager.getInstance();
-        //Init for event delegation
+        
+		//Init for event delegation
 		_dictionary = Dictionary.getInstance();
         mx.events.EventDispatcher.initialize(this);
 	}
@@ -94,11 +96,11 @@
 	}    
 	
 	/**
- * Recieved update events from the CanvasModel. Dispatches to relevent handler depending on update.Type
- * @usage   
- * @param   event
- */
-public function update (o:Observable,infoObj:Object):Void{
+	* Recieved update events from the CanvasModel. Dispatches to relevent handler depending on update.Type
+	* @usage   
+	* @param   event
+	*/
+	public function update (o:Observable,infoObj:Object):Void{
 		
        mm = MonitorModel(o);
 	   
@@ -132,7 +134,6 @@
 	}
 	
 	private function hideMainExp(mm:MonitorModel):Void{
-		//var mcontroller = getController();
 		mm.broadcastViewUpdate("EXPORTSHOWHIDE", false)
 	}
 	
@@ -141,16 +142,10 @@
     */
 	private function draw(){
 		listCount = 0; 
-		//this.onEnterFrame = setupLabels;
-		//get the content path for the sp
-		//_monitorTodoTask_mc = reqTasks_scp.content;
 		_monitorController = getController();
-		//Debugger.log('_canvas_mc'+_canvas_mc,Debugger.GEN,'draw','CanvasView');
-		trace("Loaded TodoTabView Data"+ this)
+		
 		populateLessonDetails();
 		
-		trace('seq id: ' + mm.getSequence().getSequenceID());
-		trace('last seq id: ' + mm.getLastSelectedSequence().getSequenceID());
 		if (mm.getSequence().getSequenceID() == mm.getLastSelectedSequence().getSequenceID()){
 			if(mm.getToDos() == null){
 				mm.getMonitor().getContributeActivities(mm.getSequence().getSequenceID());
@@ -168,14 +163,11 @@
 	
 	/**
 	 * Populate the lesson details from HashTable Sequence in MOnitorModel
-	*/
-	private function populateLessonDetails():Void{
-		
+	 */
+	private function populateLessonDetails():Void{
 		var s:Object = mm.getSequence();
 		var desc:String = "<b>" + Dictionary.getValue('td_desc_heading') + "</b>" + Dictionary.getValue('td_desc_text');
-		genralInfo_txt.htmlText = desc;
-		
-		  
+		genralInfo_txt.htmlText = desc; 
 	}
 
 	private function populateContributeActivities():Void{
@@ -197,30 +189,23 @@
 	 * @param   ca ContributeActivity
 	 * @return  Array of isRequired entries
 	 */
-	
 	private function getEntries(ca:Object):Array{
 		var array:Array = new Array();
+		
 		for (var i=0; i<ca.childActivities.length; i++){
-			trace(ca.title+"'s Child Activity "+i+" is: "+ca.childActivities[i].title)
 			var tmp:Array = getEntries(ca.childActivities[i]);
 			if(tmp.length > 0){
 				var obj:Object = {}
 				obj.entries = tmp;
 				obj.child= ca.childActivities[i];
 				array.push(obj);
 			}
-			
-			//var tmp:Array = getEntries(ca.childActivities[i]);
-			//drawIsRequiredChildTasks(ca, ca.childActivities[i], tmp);
-			//return null;
 		}
-		for (var j=0; j<ca.contributeEntries.length; j++){ 
-			trace("Contribute Entry for "+ca.title+" is: "+ca.contributeEntries[j].contributionType)
-			//if(ca.contributeEntries[j].isRequired){
-				// show isRequired entry
-				array.push(ca.contributeEntries[j]);
-			//}
+		
+		for (var j=0; j<ca.contributeEntries.length; j++){
+			array.push(ca.contributeEntries[j]);
 		}
+		
 		return array;
 	}
 	
@@ -233,8 +218,6 @@
 	 */
 	
 	private function drawTodoTasks(ca:Object, array:Array, x:Number):Void{
-		//var o:Object;
-		
 		if(array.length > 0){
 			// write ca title / details to screen with x position
 			todoTaskList[listCount] = _monitorTodoTask_mc.attachMovie("contributeActivityRow", "contributeActivityRow"+listCount, _monitorTodoTask_mc.getNextHighestDepth(), {_x:x, _y:YPOS+(19*listCount)})
@@ -257,24 +240,19 @@
 			
 			if(o instanceof ContributeActivity){
 				// normal CA entries
-				trace('write out entry with GO link'+o.taskURL);
-				trace('button label is: '+btnLabel);
 				todoTaskList[listCount] =_monitorTodoTask_mc.attachMovie("contributeEntryRow", "contributeEntryRow"+listCount, this._monitorTodoTask_mc.getNextHighestDepth(), {_x:x, _y:YPOS+(19*listCount), buttonLabel:btnLabel})
 				todoTaskList[listCount].contributeEntry.text = "\t\t"+mm.getMonitor().getCELiteral(o._contributionType);
 				todoTaskList[listCount].goContribute._x = this._width-50;
-				//todoTaskList[listCount].goContribute.label = 
+				
 				todoTaskList[listCount].goContribute.onRelease = function (){
-					trace("Contrybute Type is: "+o.taskURL);
 					JsPopup.getInstance().launchPopupWindow(o.taskURL, 'ContributeActivity', 398, 570, true, true, false, false, false);
-					//getURL(String(o.taskURL), "_blank");
 				}
+				
 				todoTaskList[listCount].goContribute.setStyle("fontSize", "9"); 
 				listCount++
 			}else{
 				// child CA
-				trace('child entries length:' + o.entries.length)
 				if(o.entries.length > 0){
-					trace('now drawing child');
 					// write child ca title (indented - x + 10 position)
 					drawTodoTasks(o.child, o.entries, x);
 				}
@@ -310,7 +288,6 @@
     */
 	private function setPosition(mm:MonitorModel):Void{
         var p:Object = mm.getPosition();
-		trace("X pos set in Model is: "+p.x+" and Y pos set in Model is "+p.y)
 		for (var i=0; i<todoTaskList.length; i++){
 			todoTaskList[i].goContribute._x = _monitorTodoTask_mc._width-50;
 		}
@@ -326,7 +303,7 @@
 		return MonitorController(c);
 	}
 	
-	 /*
+	/**
     * Returns the default controller for this view.
     */
     public function defaultController (model:Observable):Controller {
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/Application.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/Application.as,v
diff -u -r1.5 -r1.6
--- lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/Application.as	17 Apr 2008 05:30:58 -0000	1.5
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/Application.as	20 Jun 2008 06:15:04 -0000	1.6
@@ -52,10 +52,10 @@
     private static var WIZARD_H:Number = 550;
     
 	private static var LOADING_ROOT_DEPTH:Number = 100;	//depth of the loading movie
-    private static var APP_ROOT_DEPTH:Number = 10; //depth of the application root
-    private static var DIALOGUE_DEPTH:Number = 20;	//depth of the cursors
-    private static var TOOLTIP_DEPTH:Number = 30;	//depth of the cursors
-    private static var CURSOR_DEPTH:Number = 40;   //depth of the cursors
+    private static var APP_ROOT_DEPTH:Number = 10; 		//depth of the application root
+    private static var DIALOGUE_DEPTH:Number = 20;			//depth of the dialog
+    private static var TOOLTIP_DEPTH:Number = 30;			//depth of the tooltips
+    private static var CURSOR_DEPTH:Number = 40;   		//depth of the cursors
     private static var CCURSOR_DEPTH:Number = 101;
 	 
     private static var UI_LOAD_CHECK_INTERVAL:Number = 50;
@@ -111,7 +111,6 @@
     private function Application(){
 		super(this);
 		_module = Application.MODULE;
-		// loaded flag
     }
     
     /**
@@ -162,7 +161,6 @@
 		_root.preloader.complete();
 		setupData();
 		checkDataLoaded();
-		
     }
     
     /**
@@ -222,14 +220,11 @@
 			_uiLoadCheckCount++;
             //If all events dispatched clear interval and call start()
             if(_dictionaryEventDispatched && _themeEventDispatched){
-				//Debugger.log('Clearing Interval and calling start :',Debugger.CRITICAL,'checkUILoaded','Application');	
-                clearInterval(_UILoadCheckIntervalID);
+				clearInterval(_UILoadCheckIntervalID);
 				start();
             }else {
                 //If UI loaded check which events can be broadcast
                 if(_UILoaded){
-					//Debugger.log('ALL UI LOADED, waiting for all true to dispatch init events: _dictionaryLoaded:'+_dictionaryLoaded+'_themeLoaded:'+_themeLoaded ,Debugger.GEN,'checkUILoaded','Application');
-
                     //If dictionary is loaded and event hasn't been dispatched - dispatch it
                     if(_dictionaryLoaded && !_dictionaryEventDispatched){
 						_dictionaryEventDispatched = true;
@@ -254,7 +249,8 @@
 						msg+=Dictionary.getValue("app_fail_continue");
 						var e:LFError = new LFError(msg,"Canvas.setDroppedTemplateActivity",this,'_themeEventDispatched:'+_themeEventDispatched+' _dictionaryEventDispatched:'+_dictionaryEventDispatched);
 						e.showErrorAlert();
-						//todo:  give the user a message
+						
+						//TODO:  give the user a message
 						clearInterval(_UILoadCheckIntervalID);
 					}
                 }
@@ -271,7 +267,6 @@
     */
     public function UIElementLoaded(evt:Object) {
        if(evt.type=='load'){
-            //Which item has loaded
             switch (evt.target.className) {
 				case 'Wizard' :
                     _wizardLoaded = true;
@@ -295,7 +290,8 @@
     private function setupUI(){
 		//Create the application root
         _appRoot_mc = _container_mc.createEmptyMovieClip('appRoot_mc',APP_ROOT_DEPTH);
-        //Create screen elements
+        
+		//Create screen elements
         dialogueContainer = _container_mc.createEmptyMovieClip('_dialogueContainer_mc',DIALOGUE_DEPTH);
         _tooltipContainer_mc = _container_mc.createEmptyMovieClip('_tooltipContainer_mc',TOOLTIP_DEPTH);
         _cursorContainer_mc = _container_mc.createEmptyMovieClip('_cursorContainer_mc',CURSOR_DEPTH);
@@ -305,7 +301,8 @@
 		// WIZARD 
 		_wizard = new Wizard(_appRoot_mc,WIZARD_X, WIZARD_Y, WIZARD_W, WIZARD_H);
         _wizard.addEventListener('load',Proxy.create(this,UIElementLoaded));
-        //WORKSPACE
+        
+		//WORKSPACE
         _workspace = new Workspace();
 		
     }
@@ -347,16 +344,6 @@
     * Receives events from the Stage resizing
     */
     public function onResize(){
-        //Debugger.log('onResize',Debugger.GEN,'main','org.lamsfoundation.lams.Application');
-
-        //Get the stage width and height and call onResize for stage based objects
-       // var w:Number = Stage.width;
-       // var h:Number = Stage.height;
-		//var someListener:Object = new Object();
-		//someListener.onMouseUp = function () {
-		//	_wizard.setSize(w,h);
-		//}
-		//_wizard.setSize(w,h);
     }
 	
 	/**
@@ -383,7 +370,6 @@
 	 */
 	public function setClipboardData(obj:Object):Void{
 		_clipboardData = obj;
-		trace("clipBoard data id"+_clipboardData);
 	}
 	
 	/**
@@ -396,19 +382,13 @@
 		return _clipboardData;
 	}
 	
-	
 	public function cut():Void{
-		 //setClipboardData(_canvas.model.selectedItem);
 	}
 	
 	public function copy():Void{
-		trace("testing copy");
-		 //setClipboardData(_canvas.model.selectedItem);
 	}
 	
 	public function paste():Void{
-		trace("testing paste");
-		//_canvas.setPastedItem(getClipboardData());
 	}
 	
 	public function get controlKeyPressed():String{
@@ -473,10 +453,6 @@
     * Handles KEY presses for Application
     */
     private function onKeyDown(){
-		
-		//var mouseListener:Object = new Object();
-        //Debugger.log('Key.isDown(Key.CONTROL): ' + Key.isDown(Key.CONTROL),Debugger.GEN,'onKeyDown','Application');
-        //Debugger.log('Key: ' + Key.getCode(),Debugger.GEN,'onKeyDown','Application');
 		//the debug window:
         if (Key.isDown(Key.CONTROL) && Key.isDown(Key.ALT) && Key.isDown(QUESTION_MARK_KEY)) {
             if (!_debugDialog.content){
@@ -486,4 +462,4 @@
             }               
         }
 	}
-}
\ No newline at end of file
+}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/Wizard.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/Wizard.as,v
diff -u -r1.1 -r1.2
--- lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/Wizard.as	5 Jun 2007 02:58:05 -0000	1.1
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/Wizard.as	20 Jun 2008 06:15:04 -0000	1.2
@@ -46,6 +46,7 @@
 	
 	// Model
 	private var wizardModel:WizardModel;
+	
 	// View
 	private var wizardView:WizardView;
 	private var wizardView_mc:MovieClip;
@@ -59,8 +60,6 @@
 	
 	private var _onOKCallBack:Function;
 	
-	
-	
 	/**
 	 * Wizard Constructor Function
 	 * 
@@ -80,8 +79,6 @@
 		//Create the view
 		wizardView_mc = target_mc.createChildAtDepth("wizardView",DepthManager.kTop);	
 		
-		trace(wizardView_mc);
-		
 		wizardView = WizardView(wizardView_mc);
 		wizardView.init(wizardModel,undefined);
         wizardView.addEventListener('load',Proxy.create(this,viewLoaded));
@@ -104,7 +101,6 @@
 	public function broadcastInit(){
 		dispatchEvent({type:'init',target:this});		
 	}
- 
 	
 	private function viewLoaded(evt:Object){
         Debugger.log('viewLoaded called',Debugger.GEN,'viewLoaded','Wizard');
@@ -145,29 +141,25 @@
 		if(classID != undefined && courseID != undefined){
 			Application.getInstance().getComms().getRequest('workspace.do?method=getOrganisationsByUserRole&userID='+_root.userID+'&courseID='+courseID+'&classID='+classID+'&roles=MONITOR,COURSE MANAGER',callback, false);
 		}else if(courseID != undefined){
-			trace('course defined: doing request');
 			Application.getInstance().getComms().getRequest('workspace.do?method=getOrganisationsByUserRole&userID='+_root.userID+'&courseID='+courseID+'&roles=MONITOR,COURSE MANAGER',callback, false);
 		}else{
 			// TODO no course or class defined
 		}
 	}
 	
 	private function showOrgTree(dto:Object):Void{
-		trace('organisations tree returned...');
-		trace('creating root node...');
 		// create root (dummy) node
-		
 		var odto = getDataObject(dto);
 		
 		wizardModel.initOrganisationTree();
 		var rootNode:XMLNode = wizardModel.treeDP.addTreeNode(odto.name, odto);
-		//rootNode.attributes.isBranch = true;
+		
 		wizardModel.setOrganisationResource(RT_ORG+'_'+odto.organisationID,rootNode);
+		
 		if(_root.classID != undefined){
 			// create tree xml branches
 			createXMLNodes(rootNode, dto.nodes);
 			
-			
 			wizardView.setUpOrgTree(true);
 		}else{
 			// create tree xml branches
@@ -181,13 +173,9 @@
 	
 	private function createXMLNodes(root:XMLNode, nodes:Array) {
 		for(var i=0; i<nodes.length; i++){
-			trace('creating child node...');
-			
 			var odto = getDataObject(nodes[i]);
 			var childNode:XMLNode = root.addTreeNode(odto.name, odto);
 			
-			trace('adding node with org ID: ' + odto.organisationID);
-			
 			if(nodes[i].nodes.length>0){
 				childNode.attributes.isBranch = true;
 				createXMLNodes(childNode, nodes[i].nodes);
@@ -231,7 +219,6 @@
 	 * @return  
 	 */
     private function openDesignById(workspaceResultDTO:Object){
-		trace('step 1 completed');
 		ObjectUtils.toString(workspaceResultDTO);
 		wizardModel.workspaceResultDTO = workspaceResultDTO;
 		//var designId:Number = workspaceResultDTO.selectedResourceID;
@@ -246,7 +233,6 @@
 	
 	public function requestUsers(role:String, orgID:Number, callback:Function){
 		Application.getInstance().getComms().getRequest('workspace.do?method=getUsersFromOrganisationByRole&organisationID='+orgID+'&role='+role,callback, false);
-	
 	}
 	
 	/**
@@ -258,7 +244,6 @@
 	 */
 	
 	public function initializeLesson(resultDTO:Object, callback:Function){
-		
 		var designId:Number = resultDTO.selectedResourceID;
 		var lessonName:String = resultDTO.resourceTitle;
 		var lessonDesc:String = resultDTO.resourceDescription;
@@ -274,7 +259,6 @@
 	}
 	
 	public function startLesson(isScheduled:Boolean, lessonID:Number, datetime:String){
-		trace('starting lesson...');
 		var callback:Function = Proxy.create(this, onStartLesson);
 		
 		if(isScheduled){
@@ -285,13 +269,10 @@
 	}
 	
 	private function onStartLesson(b:Boolean){
-		trace('receive back after lesson started..');
 		if(b){
-			trace('lesson started');
 			wizardModel.broadcastViewUpdate("LESSON_STARTED", WizardView.FINISH_MODE);
 		} else {
 			// error occured
-			trace('error occurred starting lesson');
 		}
 	}
 	
@@ -301,7 +282,6 @@
 	 */
 	
 	public function createLessonClass():Void{
-		trace('creating lesson class...');
 		var dto:Object = wizardModel.getLessonClassData();
 		var callback:Function = Proxy.create(this,onCreateLessonClass);
 		
@@ -314,12 +294,9 @@
 			r.showErrorAlert();
 		} else if(r) {
 			// lesson class created
-			trace('lesson class created');
-			trace('mode: ' + wizardModel.resultDTO.mode);
 			wizardModel.broadcastViewUpdate("SAVED_LC", wizardModel.resultDTO.mode);
 		} else {
 			// failed creating lesson class
-			trace('failed creating lesson class');
 		}
 	}
 
@@ -376,9 +353,11 @@
     function get className():String { 
         return _className;
     }
+	
 	public function getWM():WizardModel{
 		return wizardModel;
 	}
+	
 	public function getWV():WizardView{
 		return wizardView;
 	}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/WizardController.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/WizardController.as,v
diff -u -r1.3 -r1.4
--- lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/WizardController.as	25 Mar 2008 05:43:16 -0000	1.3
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/WizardController.as	20 Jun 2008 06:15:04 -0000	1.4
@@ -40,6 +40,7 @@
 	private var _wizardView:WizardView;
 	private var _resultDTO:Object;
 	private var _isBusy:Boolean;
+	
 	/**
 	* Constructor
 	*
@@ -92,7 +93,7 @@
 	}
 	
 	private function gonext(evt:Object){
-       Debugger.log('I am in goNext:',Debugger.CRITICAL,'click','gonext');
+        Debugger.log('I am in goNext:',Debugger.CRITICAL,'click','gonext');
 		_global.breakpoint();
 		var wizView:WizardView = getView();
 		if(wizView.validateStep(_wizardModel)){
@@ -101,26 +102,18 @@
     }
 	
 	private function gocancel(evt:Object){
-		// close window
-		//getURL('javascript:window.close()');
 		ApplicationParent.extCall("closeWindow", null);
 	}
 	
 	private function goclose(evt:Object){
-		//getURL('javascript:closeWizard()');
 		ApplicationParent.extCall("closeWizard", null);
 	}
 	
 	private function goprev(evt:Object){
-		trace('PREV CLICKED');
-		//var wm:WizardModel = WizardModel(getModel());
 		_wizardModel.stepID--;
-		trace('new step ID: ' +_wizardModel.stepID);
 	}
 	
 	private function gofinish(evt:Object){
-		trace('FINISH CLICKED');
-		//var wm:WizardModel = WizardModel(getModel());
 		var wizView:WizardView = getView();
 		if(wizView.validateStep(_wizardModel)){
 			wizView.resultDTO.mode = WizardView.FINISH_MODE;
@@ -130,8 +123,6 @@
 	}
 	
 	private function gostart(evt:Object){
-		trace('START CLICKED');
-		//var wm:WizardModel = WizardModel(getModel());
 		var wizView:WizardView = getView();
 		if(wizView.validateStep(_wizardModel)){
 			wizView.resultDTO.mode = WizardView.START_MODE;
@@ -144,14 +135,12 @@
     * Workspace dialog OK button clicked handler
     */
     private function okClicked(evt:Object) {
-		
 		if(evt.type == 'okClicked'){
 			//invalidate the cache of folders
 			//getView().workspaceView.getModel().clearWorkspaceCache(evt.target.resultDTO.targetWorkspaceFolderID);
 			
 			//pass the resultant DTO back to the class that called us.
             Application.getInstance().getWorkspace().onOKCallback(evt.target.resultDTO);
-			
 		}
 	}
 	
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/WizardModel.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/WizardModel.as,v
diff -u -r1.3 -r1.4
--- lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/WizardModel.as	25 Mar 2008 05:43:16 -0000	1.3
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/WizardModel.as	20 Jun 2008 06:15:04 -0000	1.4
@@ -87,7 +87,7 @@
     public var removeEventListener:Function;
 	
 	/**
-	* Constructor.
+	* Constructor
 	*/
 	public function WizardModel (wizard:Wizard){
 		_wizard = wizard;
@@ -140,7 +140,6 @@
 		
 	}
 	
-	
 	/**
 	* Periodically checks if users have been loaded
 	*/
@@ -154,11 +153,9 @@
 			if(_staffLoaded && _learnersLoaded) {
 				clearInterval(_UserLoadCheckIntervalID);
 				
-				trace('ALL USERS LOADED -CONTINUE');
 				// populate learner/staff scrollpanes
 				broadcastViewUpdate("USERS_LOADED", null, null);
 				
-				
 			} else if(_userLoadCheckCount >= USER_LOAD_CHECK_TIMEOUT_COUNT) {
 				Debugger.log('reached timeout waiting for data to load.',Debugger.CRITICAL,'checkUsersLoaded','MonitorModel');
 				clearInterval(_UserLoadCheckIntervalID);		
@@ -174,39 +171,30 @@
 	}
 	
 	private function requestLearners(data:Object){
-		
-		trace('requesting learners...');
 		var callback:Function = Proxy.create(this,saveLearners);
 		_wizard.requestUsers(LEARNER_ROLE, data.organisationID, callback);
 	}
 
 	
 	private function requestStaff(data:Object){
-		
-		trace('requesting staff members...');
 		var callback:Function = Proxy.create(this,saveStaff);
 		
 		_wizard.requestUsers(MONITOR_ROLE, data.organisationID, callback);
 	}
 	
 	public function saveLearners(users:Array){
-		trace('retrieving back users for org by role: ' + LEARNER_ROLE);
-		
 		saveUsers(users, LEARNER_ROLE);
 		
 		dispatchEvent({type:'learnersLoad',target:this});
 	}
 	
 	public function saveStaff(users:Array){
-		trace('retrieving back users for org by role: ' + MONITOR_ROLE);
-		
 		saveUsers(users, MONITOR_ROLE);
 		
 		dispatchEvent({type:'staffLoad',target:this});
 	}
 
 	private function saveUsers(users:Array, role:String):Void{
-		
 		for(var i=0; i< users.length; i++){
 			var u:Object = users[i];
 			
@@ -257,7 +245,8 @@
         //Set state variables
 		__x = x;
 		__y = y;
-        //Set flag for notify observers
+        
+		//Set flag for notify observers
 		setChanged();
         
 		//build and send update object
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/WizardSummery.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/WizardSummery.as,v
diff -u -r1.1 -r1.2
--- lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/WizardSummery.as	5 Jun 2007 02:58:05 -0000	1.1
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/WizardSummery.as	20 Jun 2008 06:15:04 -0000	1.2
@@ -36,8 +36,7 @@
 /**  
 *  
 */  
-class WizardSummery extends MovieClip {  
-//class org.lamsfoundation.lams.authoring.cv.CanvasActivity extends MovieClip{  
+class WizardSummery extends MovieClip {
 	
 	//this is set by the init object
 	private var _wizardController:WizardController;
@@ -83,7 +82,6 @@
 		MovieClipUtils.doLater(Proxy.create(this,draw));
 
 	}
-	
 
 	/**
 	 * Does the work of laying out the screen assets.
@@ -98,7 +96,6 @@
 		_visible = true;
 	}
 	
-	
 	/**
 	 * Get the CSSStyleDeclaration objects for each component and applies them
 	 * directly to the instanced
@@ -125,6 +122,5 @@
 		staff_lbl.text = Dictionary.getValue('summery_staff_lbl');
 		learners_lbl.text = Dictionary.getValue('summery_learners_lbl');
 	}
-    
 
 }
\ No newline at end of file
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/WizardView.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/WizardView.as,v
diff -u -r1.5 -r1.6
--- lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/WizardView.as	30 May 2008 05:42:04 -0000	1.5
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/WizardView.as	20 Jun 2008 06:15:04 -0000	1.6
@@ -386,9 +386,10 @@
 		start_btn._x = panel._width - start_btn._width - X_BUTTON_OFFSET;
 		close_btn._x = panel._width - close_btn._width - X_BUTTON_OFFSET;
 		
-		finish_btn._x = 10; // panel._width - finish_btn._width - X_BUTTON_OFFSET;
+		finish_btn._x = 10;
 		
 		Debugger.log("visible: "+ _wizardLessonView.getScheduleBtn().visible, Debugger.CRITICAL, "positionButtons", "WizardView");
+		
 		if(_wizardLessonView.getScheduleBtn().visible) {
 			button = _wizardLessonView.getScheduleBtn();
 			RET_OFFSET = _wizardLessonView._x;
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/steps/WizardLessonDetailsView.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/steps/WizardLessonDetailsView.as,v
diff -u -r1.1 -r1.2
--- lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/steps/WizardLessonDetailsView.as	25 Mar 2008 05:43:16 -0000	1.1
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/steps/WizardLessonDetailsView.as	20 Jun 2008 06:15:04 -0000	1.2
@@ -199,7 +199,6 @@
 		
 		var valid:Boolean = true;
 		if(resourceTitle_txi.text == ""){
-			trace('title is empty must contain value');
 			valid = false;
 		} 
 		
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/steps/WizardOrganisationView.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/steps/WizardOrganisationView.as,v
diff -u -r1.3 -r1.4
--- lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/steps/WizardOrganisationView.as	9 Apr 2008 03:15:12 -0000	1.3
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/steps/WizardOrganisationView.as	20 Jun 2008 06:15:04 -0000	1.4
@@ -310,10 +310,7 @@
 
 	public function setSize(dHeight:Number) {
 		org_treeview.setSize(org_treeview.width, Number(org_treeview.height + dHeight));
-		
-		//staff_scp.setSize(staff_scp._width, staff_scp._height + dHeight);
-		learner_scp.setSize(learner_scp._width, learner_scp._height + dHeight);
-		
+		learner_scp.setSize(learner_scp._width, learner_scp._height + dHeight);
 	}
 	
 	private function toogleStaffSelection(evt:Object) {
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/steps/WizardSequenceView.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/steps/WizardSequenceView.as,v
diff -u -r1.1 -r1.2
--- lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/steps/WizardSequenceView.as	25 Mar 2008 05:43:16 -0000	1.1
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/steps/WizardSequenceView.as	20 Jun 2008 06:15:04 -0000	1.2
@@ -255,9 +255,11 @@
 	 */
 	public function refreshFolder(nodeToOpen:XMLNode, wm:WorkspaceModel){
 		Debugger.log('refreshFolder:'+nodeToOpen ,Debugger.GEN,'refreshFolder','org.lamsfoundation.lams.ws.WorkspaceDialog');
+		
 		//close the node
 		location_treeview.setIsOpen(nodeToOpen,false);		
-		//we are gonna need to fire the event manually for some stupid reason the tree is not firing it.
+		
+		//we are gonna need to fire the event manually for some stupid reason the tree is not firing it.
 		//dispatchEvent({type:'nodeOpen',target:treeview,node:nodeToOpen});
 		_workspaceController = _workspaceView.getController();
 		_workspaceController.onTreeNodeOpen({type:'nodeOpen',target:location_treeview,node:nodeToOpen});
Index: lams_flash/src/common/flash/assets/tools/CreateDictionary.swf
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/assets/tools/CreateDictionary.swf,v
diff -u -r1.2 -r1.3
Binary files differ
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/ApplicationParent.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/ApplicationParent.as,v
diff -u -r1.13 -r1.14
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/ApplicationParent.as	17 Apr 2008 05:30:59 -0000	1.13
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/ApplicationParent.as	20 Jun 2008 06:15:04 -0000	1.14
@@ -56,7 +56,7 @@
 	public static var NORMAL_MODE:String = "author";		// Normal Operation Mode
 	public static var EDIT_MODE:String = "editonfly";		// Edit-On-The-Fly Mode
 
-	public static var DIALOGUE_DEPTH:Number = 55;	//depth of the cursors
+	public static var DIALOGUE_DEPTH:Number = 55;			//depth of the cursors
     
     private var _comms:Communication;
     private var _themeManager:ThemeManager;
@@ -65,7 +65,7 @@
     private var _workspace:Workspace;
 	
 	private var _currentDialog:MovieClip;
-	private var _customCursor_mc:MovieClip;         //Cursor container
+	private var _customCursor_mc:MovieClip;         		//Cursor container
 	
 	private static var _controlKeyPressed:String;
 	
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/Config.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/Config.as,v
diff -u -r1.2 -r1.3
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/Config.as	7 Jan 2008 04:12:57 -0000	1.2
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/Config.as	20 Jun 2008 06:15:04 -0000	1.3
@@ -40,6 +40,7 @@
 	//MS of delay between clicks to make a double click
 	//TODO - set this to 500 ms when not in IDE
 	public static var DOUBLE_CLICK_DELAY:Number = 500;
+	
 	//message type codes
 	public static var MESSAGE_TYPE_ERROR:Number = 1;
 	public static var MESSAGE_TYPE_CRITICAL:Number = 2;
@@ -124,7 +125,6 @@
         var callBack = Proxy.create(this,serverDefaultsLoaded);
 
         _comms.getRequest('flashxml/configData.xml',callBack)
-        //_comms.loadXML('lams_authoring/configData.xml',callBack,true,true);
     }
         
     /**
@@ -233,10 +233,8 @@
     * gets the language from the root that was passed in by the JSP page containing the SWF
     */
     private function getLanguage():String{
-        //TODO: make this a real call to get browser lcoale!
-		//return 'en';
-        //return 'en';
-        var lang:String;
+        //TODO: make this a real call to get browser locale
+		var lang:String;
 		
         if(_root.lang){
 			lang = _root.lang;
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/DebugDialog.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/DebugDialog.as,v
diff -u -r1.1 -r1.2
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/DebugDialog.as	5 Jun 2007 02:57:36 -0000	1.1
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/DebugDialog.as	20 Jun 2008 06:15:04 -0000	1.2
@@ -122,10 +122,12 @@
         //Add event listeners for ok, cancel and close buttons
         ok_btn.addEventListener('click',Delegate.create(this, ok));
         cancel_btn.addEventListener('click',Delegate.create(this, cancel));
-        //Assign Click (close button) and resize handlers
+        
+		//Assign Click (close button) and resize handlers
         _container.addEventListener('click',this);
         _container.addEventListener('size',this);
-        //Register as listener with StyleManager and set Styles
+        
+		//Register as listener with StyleManager and set Styles
         themeManager.addEventListener('themeChanged',this);
         
         //Register with the Debugger class to pick up log messages
@@ -200,20 +202,11 @@
             var beginPos:Number = 0;
             var endPos:Number = text_str.indexOf('=');
             var obj_str:String = text_str.substr(0,endPos);
-            //var obj = eval(obj_str);
-            //get the property which is after the = sign
             var prop = text_str.substr(endPos+1,text_str.length-endPos);
-            //trace('obj_str :' + obj_str);
-            //trace('prop :' + prop);
-           
-            //Make the assignment
-            //obj = prop;
             var o:String = '_root'
             var p:String = '_root._x';
             var val:String = '500'
-            //setProperty(o,p,val);
-            //setProperty(obj,prop,
-        } else {
+		} else {
             traceMsg('Missing = sign or invalid string');
         }
     }
@@ -237,11 +230,13 @@
                 //Get comms and serialize object
                 var comms = ApplicationParent.getInstance().getComms();
                 var sx:String = comms.serializeObj(data);
-                //Write out the serialized object
+                
+				//Write out the serialized object
                 messages_ta.html=false;
                 traceMsg('serializing \n' + input_ti.text +'\n \n' + sx);
                 messages_ta.html=true;
-                //Copy to clipboard
+                
+				//Copy to clipboard
                 System.setClipboard(sx);
             }else {
                 traceMsg("no 'toData' or 'itemToData' method or found for :" + text_str);
@@ -314,7 +309,6 @@
 		var url_str:String = input_ti.text;
 		var comms = ApplicationParent.getInstance().getComms();
 		comms.getRequest(url_str,testLoadXMLLoaded,true);
-		
 	}
 
 	/**
@@ -324,7 +318,6 @@
         _global.breakpoint();
 		var test=dto;
 		ObjectUtils.printObject(dto);
-		
     }
 
     /**
@@ -340,11 +333,9 @@
     * Event dispatched by parent container when close button clicked
     */
     public function click(e:Object):Void{
-        trace('PreferencesDialog.click');
-        e.target.deletePopUp();
+       e.target.deletePopUp();
     }
     
-    
     /**
     * Main resize method, called by scrollpane container/parent
     */
@@ -353,7 +344,8 @@
         if(w>400 && h>260){
             //Size the panel
             panel.setSize(w,h);
-            //Buttons
+            
+			//Buttons
             ok_btn.move(w-xOkOffset-20,h-yOkOffset-20);
             cancel_btn.move(w-xCancelOffset-20,h-yCancelOffset-20);
         
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/PreferencesDialog.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/PreferencesDialog.as,v
diff -u -r1.1 -r1.2
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/PreferencesDialog.as	5 Jun 2007 02:57:36 -0000	1.1
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/PreferencesDialog.as	20 Jun 2008 06:15:04 -0000	1.2
@@ -40,25 +40,25 @@
 class PreferencesDialog extends MovieClip implements Dialog{
 
     //References to components + clips 
-    private var _container:MovieClip;  //The container window that holds the dialog
-    private var cfg:Config;            //local config reference
+    private var _container:MovieClip;  		//The container window that holds the dialog
+    private var cfg:Config;            			//local config reference
     
-    private var ok_btn:Button;         //OK+Cancel buttons
+    private var ok_btn:Button;         		//OK+Cancel buttons
     private var cancel_btn:Button;
     
-    private var panel:MovieClip;       //The underlaying panel base
+    private var panel:MovieClip;       		//The underlaying panel base
     
-    private var lang_cb:ComboBox;    //Theme + language labels
+    private var lang_cb:ComboBox;    			//Theme + language labels
     private var theme_cb:ComboBox;    
     
-    private var lang_lbl:Label;        //Theme + language labels
+    private var lang_lbl:Label;        		//Theme + language labels
     private var theme_lbl:Label;
     
     
-    private var fm:FocusManager;            //Reference to focus manager
-    private var themeManager:ThemeManager;  //Theme manager
+    private var fm:FocusManager;            	//Reference to focus manager
+    private var themeManager:ThemeManager;  	//Theme manager
     
-    private var currentLanguage:String;     //Language and theme settings for current and new 
+    private var currentLanguage:String;     	//Language and theme settings for current and new 
     private var newLanguage:String;
 
     private var currentTheme:String;
@@ -83,7 +83,7 @@
         //Set up this class to use the Flash event delegation model
         EventDispatcher.initialize(this);
 
-        //set up local confi reference
+        //set up local config reference
         cfg = Config.getInstance();
         
         //Create a clip that will wait a frame before dispatching init to give components time to setup
@@ -120,7 +120,8 @@
         //Add event listeners for ok, cancel and close buttons
         ok_btn.addEventListener('click',Delegate.create(this, ok));
         cancel_btn.addEventListener('click',Delegate.create(this, cancel));
-        //Assign Click (close button) and resize handlers
+        
+		//Assign Click (close button) and resize handlers
         _container.addEventListener('click',this);
         _container.addEventListener('size',this);
         
@@ -138,43 +139,47 @@
         //Languages is an array containing objects with label and data properties
         var languages = cfg.getItem('languages');
         lang_cb.dataProvider = languages;
-        //Select current language
+        
+		//Select current language
         var language = cfg.getItem('language');
-        //Go through all options to find current language index and select it in combo
+        
+		//Go through all options to find current language index and select it in combo
         for(var i=0;i<lang_cb.length;i++){
             if(lang_cb.getItemAt(i).data == language){
                 lang_cb.selectedIndex = i;
                 break;
             }
         }
-        //Set up event handler
+        
+		//Set up event handler
         lang_cb.addEventListener('change',Delegate.create(this,languageSelectionChanged));
         
         //THEMES
         var themes = cfg.getItem('themes');
         theme_cb.dataProvider = themes;
-        //Select current theme
+        
+		//Select current theme
         var theme = cfg.getItem('theme');
-        //Go through all options to find current language index and select it in combo
+        
+		//Go through all options to find current language index and select it in combo
         for(var i=0;i<theme_cb.length;i++){
             if(theme_cb.getItemAt(i).data == theme){
                 theme_cb.selectedIndex = i;
                 break;
             }
         }
-        //Set up event handler
+        
+		//Set up event handler
         theme_cb.addEventListener('change',Delegate.create(this,themeSelectionChanged));
     }
     
-    
     /**
     * Event fired when theme combo box has been used to change the theme selection
     * @param evt:Object containing type and source as per Flash event delegation model
     */
     private function themeSelectionChanged(evt:Object) {
         //Verify event type
         if(evt.type == 'change'){
-            trace("Value changed to " + evt.target.value);
             //Store selected language
             newTheme = evt.target.value;
         } else {
@@ -190,7 +195,6 @@
     private function languageSelectionChanged(evt:Object) {
         //Verify event type
         if(evt.type == 'change'){
-            trace("Value changed to " + evt.target.value);
             //Store selected language
             newLanguage = evt.target.value;
         } else {
@@ -239,7 +243,6 @@
     * Called by the cancel button 
     */
     private function cancel(){
-        trace('Cancel');
         //close parent window
         _container.deletePopUp();
     }
@@ -265,7 +268,8 @@
             //Save the change to the config class
             validateOk = cfg.setItem('theme',newTheme);
             validateOk = cfg.saveItem('theme');
-            //Load the new theme and then broadcast change
+            
+			//Load the new theme and then broadcast change
             themeManager.loadTheme(newTheme);
             themeManager.broadcastThemeChanged();
         }
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/Progress.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/Progress.as,v
diff -u -r1.3 -r1.4
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/Progress.as	22 Feb 2008 05:01:42 -0000	1.3
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/Progress.as	20 Jun 2008 06:15:04 -0000	1.4
@@ -79,9 +79,6 @@
 	}
 	
 	public static function compareProgressData(learner:Progress, activityID:Number):String{
-		trace ("activity ID passed is: "+activityID)
-		trace("Number of Activities completed in the lesson are: "+learner.getCompletedActivities().length)
-		
 		var arrLearnerProgComp = learner.getCompletedActivities()
 		for (var i=0; i<arrLearnerProgComp.length; i++){
 			if (activityID == arrLearnerProgComp[i]){
@@ -92,9 +89,7 @@
 		}
 		
 		var arrLearnerProgAttempt = learner.getAttemptedActivities()
-		trace("Attempted activities are: "+arrLearnerProgAttempt.length)
 		for (var j=0; j<arrLearnerProgAttempt.length; j++){
-			trace("Activity Id Passed is "+activityID+" and attempted ID is "+arrLearnerProgAttempt[j])
 			if (activityID == arrLearnerProgAttempt[j]){
 				if (activityID == learner.getCurrentActivityId()){
 					var clipName:String = "current_mc";
@@ -105,8 +100,8 @@
 				}
 			}
 			
-		}
-		//arrLearnerProg = learner.getCurrentActivityId()
+		}
+		
 		if (activityID == learner.getCurrentActivityId()){
 			var clipName:String = "current_mc";
 			return clipName;
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/Sequence.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/Sequence.as,v
diff -u -r1.1 -r1.2
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/Sequence.as	5 Jun 2007 02:57:36 -0000	1.1
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/Sequence.as	20 Jun 2008 06:15:04 -0000	1.2
@@ -270,11 +270,7 @@
 	public function setLearningDesignID(learningDesignID:Number){
 		_learningDesignID = learningDesignID;
 		
-	}
-	
-	//public function getLearningDesignID():Number{
-	//	return _learningDesignID;
-	//}
+	}
 	
 	public function get learningDesignID():Number{
 		return _learningDesignID;
@@ -393,16 +389,7 @@
 		
 		return true;
 	}
-	
-	/**public function setFinishDateTime(seqFinishDate:Date){
-		_seqFinishDate = seqFinishDate;
-	}
-	
-	public function getFinishDateTime():String{
-		var finishDate:String = (_seqFinishDate.getDate()+" "+(StringUtils.getMonthAsString(_seqFinishDate.getMonth()+1))+" "+_seqFinishDate.getFullYear());;
-		return finishDate;
-	}
-	*/
+	
 	public function setActive() {
 		_active = true;
 		trace('setting seq active...');
@@ -498,8 +485,5 @@
 	function get className():String{
         return 'Sequence';
     }
-	
-	
-	
 
 }
\ No newline at end of file
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/ToolTip.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/ToolTip.as,v
diff -u -r1.3 -r1.4
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/ToolTip.as	28 Apr 2008 04:12:12 -0000	1.3
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/ToolTip.as	20 Jun 2008 06:15:04 -0000	1.4
@@ -28,6 +28,7 @@
 	// The button to display the ToolTip on
 	var btn:Button;
 	var ttHolder:MovieClip;
+	
 	// The movieclips & textfield which form the tooltip
 	var ToolTipHolder:MovieClip;
 	var ToolTipBackground:MovieClip;
@@ -96,6 +97,7 @@
 		
 		var bgwidth = ttHolder.ToolTipHolder.ToolTipText.textWidth + 8;
 		var bgheight = ttHolder.ToolTipHolder.ToolTipText.textHeight + 4;
+		
 		// Create the background on the tool tip
 		ttHolder.ToolTipHolder.createEmptyMovieClip("ToolTipBackground", 2);
 		with (ttHolder.ToolTipHolder.ToolTipBackground){
@@ -215,9 +217,6 @@
 		ttHolder.ToolTipHolder._visible = true;
 		ttHolder.ToolTipHolder._alpha = 0;
 		
-		//ttHolder.ToolTipHolder._x = _root._xmouse + xoffset
-		//ttHolder.ToolTipHolder._y = _root._ymouse + yoffset
-		
 		var delayed = 0;
 		var delayfor = this.delay * 10;
 		
@@ -238,7 +237,6 @@
 	
 	public function CloseToolTip(){
 		delete ttHolder.ToolTipHolder.onEnterFrame;
-		//ttHolder.ToolTipHolder._visible = false;	
 		ttHolder.ToolTipHolder.removeMovieClip();
 	}
 }
\ No newline at end of file
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/comms/Communication.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/comms/Communication.as,v
diff -u -r1.3 -r1.4
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/comms/Communication.as	7 Jan 2008 04:12:57 -0000	1.3
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/comms/Communication.as	20 Jun 2008 06:15:05 -0000	1.4
@@ -50,30 +50,19 @@
     
     private var queue:Array;
     private var queueID:Number;
-	
-	//so compiler can see application when not in LAMS - but this overwrites the actual ref... need to think about this one
-	//TODO: Fix the above
-	//private var _app:Application;
-	//private var Application;
-    
-   
+
     /**
     * Comms constructor
     */
     function Communication(aServerURL:String){
-        trace('Communication.constructor');
-
-		//_app = Application.getInstance();
-
         //Set up queue
         queue=[];
         queueID=0;
         
         
         ignoreWhite = true;
-		//_global.breakpoint();
+		
 		if(_serverURL == null){
-			//_serverURL = Config.getInstance().serverUrl;
 			if(_root.serverURL!=null){
 				_serverURL = _root.serverURL;
 			}else if(aServerURL != null){
@@ -83,15 +72,9 @@
 			}
 			
 		}
-        
-        
-		//Debugger.log('_serverURL:'+_serverURL,4,'Consturcutor','Communication');
-        wddx = new Wddx();
-    }
-	
-	
-	
-	
+       
+	    wddx = new Wddx();
+    }
     
     /**
     * Make a request to the server.  Each request handlers is added to a queue whilst waiting for the (asynchronous) response 
@@ -131,9 +114,6 @@
 			responseXML.load(_serverURL+requestURL);
 		}
     }
-    
-    
-    
   
     /**
 	* Sends a data object to the server and directs response to handler function.
@@ -147,26 +127,21 @@
 	* 
     */
     public function sendAndReceive(rawDto:Object, requestURL:String,handler:Function,isFullURL){
-        //denull the object first, stops the wddx processor on java side form barfing
-		
-		
-		//var dto:Object = ObjectUtils.deNull(rawDto);
-		
-		//Serialise the Data Transfer Object
+        //Serialise the Data Transfer Object
         var xmlToSend:XML = serializeObj(rawDto);
 		xmlToSend.ignoreWhite = ignoreWhite;
-		//xmlToSend.contentType="dave";
-        
+		
 		//Create XML response object 
         var responseXML = new XML();
 		 //Assign onLoad handler
         responseXML.onLoad = Proxy.create(this,onServerResponse,queueID);
 
         //Assign onLoad handler
-       // responseXML.onLoad = Proxy.create(this,onSendACK,queueID);
+        //responseXML.onLoad = Proxy.create(this,onSendACK,queueID);
         //Add handler to queue
         addToQueue(handler);        
-        //Assign onData function        
+        
+		//Assign onData function        
         setOnData(responseXML);
         
         //TODO DI 11/04/05 Stub here for now until we have server implmenting new WDDX structure
@@ -188,8 +163,8 @@
     * @param queueID:Number     ID of request handler on queue 
     */
     private function onServerResponse(success:Boolean,wrappedPacketXML:XML,queueID:Number){
-        //trace('XML loaded success:'+ success);
-		Debugger.log('xml recieved is:'+wrappedPacketXML.toString(),Debugger.VERBOSE,'onServerResponse','Communication');
+        Debugger.log('xml recieved is:'+wrappedPacketXML.toString(),Debugger.VERBOSE,'onServerResponse','Communication');
+		
 		//Load ok?
         if(success){
 		   var responseObj:Object = wddx.deserialize(wrappedPacketXML);
@@ -227,7 +202,6 @@
             Debugger.log("XML Load failed",Debugger.CRITICAL,'onServerResponse','Communication');
 			var e = new LFError("Communication with the server has failed. \nPlease check you are connected to the internet and/or LAMS server","onServerResponse",this,'Server URL:'+_serverURL);
 			e.showMessageConfirm();
-		
 		}
     }
     
@@ -251,11 +225,14 @@
     public function loadXML(requestURL:String,handler:Function,isFullURL:Boolean,deserialize:Boolean):Void{
         //Create XML response object 
         var responseXML = new XML();
-        //Assign onLoad handler
+        
+		//Assign onLoad handler
         responseXML.onLoad = Proxy.create(this,onXMLLoad,queueID,deserialize);
-        //Add handler to queue
+        
+		//Add handler to queue
         addToQueue(handler);        
-        //Assign onData function        
+        
+		//Assign onData function        
         setOnData(responseXML);
         
         //TODO DI 11/04/05 Stub here for now until we have server implmenting new WDDX structure
@@ -296,10 +273,8 @@
     private function setOnData(xmlObject:XML){
         //Set ondata handler to validate data returned in XML object
         xmlObject.onData = function(src){
-			//Debugger.log('src:'+src,Debugger.GEN,' xmlObject.onData ','Communication');		
-			//if(Application != null){
-				Cursor.showCursor(ApplicationParent.C_DEFAULT);
-           // }
+			Cursor.showCursor(ApplicationParent.C_DEFAULT);
+           
 			if (src != undefined) {
                 //Check for login page
                 if(src.indexOf("j_security_login_page") != -1){
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/dict/Dictionary.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/dict/Dictionary.as,v
diff -u -r1.1 -r1.2
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/dict/Dictionary.as	5 Jun 2007 02:58:17 -0000	1.1
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/dict/Dictionary.as	20 Jun 2008 06:15:05 -0000	1.2
@@ -86,7 +86,8 @@
 		
 		var _oldDate:Object = null;
 		var _removeCache:Boolean = Config.getInstance().removeCache;
-        // Cookie or server?
+        
+		// Cookie or server?
 		Debugger.log('Config.DOUBLE_CLICK_DELAY:'+Config.DOUBLE_CLICK_DELAY,Debugger.GEN,'load','org.lamsfoundation.lams.dict.Dictionary');
 		Debugger.log('Config.USE_CACHE:'+Config.USE_CACHE,Debugger.GEN,'load','org.lamsfoundation.lams.dict.Dictionary');
         if(CookieMonster.cookieExists(DICT_DATE)){
@@ -147,14 +148,10 @@
         var v:String = _instance.items.get(key).value;
 		if(v!=null){
 			if(param!=null){
-				trace('using params..');
 				for(var i=0; i<param.length; i++){
-					trace('param values: ' + param[0]);
 					// replace param {i} with value in array
 					var str_toReplace =  String.fromCharCode(123) + String(i) + String.fromCharCode(125);
-					trace(str_toReplace);
 					var newStr:String = StringUtils.replace(v, str_toReplace, String(param[i]));
-					trace(String(newStr));
 					v = newStr;
 				}
 			}
@@ -314,11 +311,12 @@
 		this._module = app.module;
 		Debugger.log('URL : '+ 'flashxml/' + _module  + '/' + _currentLanguage + '_dictionary.xml',Debugger.CRITICAL,'openFromServer','Dictionary');
 		var callBack = Proxy.create(this,onDictionaryLoadedFromServer);
-        //comms.loadXML('http://dolly.uklams.net/lams/lams_authoring/' + _currentLanguage + '_dictionary.xml',callBack,true,true);
         comms.getRequest('flashxml/' + _module + '/' + _currentLanguage + '_dictionary.xml' + "?v=" + _root.build,callBack,false);
     }
     
     /**
+	* @deprecated
+	* 
     * TODO: THIS IS ONLY USED FOR TESTING WHILST SERVER DOES NOT SUPPORT STRUCTURE
     * REMOVE WHEN NO LONGER REQUIRED
     */
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/layout/ILayoutManager.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/layout/ILayoutManager.as,v
diff -u -r1.2 -r1.3
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/layout/ILayoutManager.as	2 Aug 2007 04:07:48 -0000	1.2
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/layout/ILayoutManager.as	20 Jun 2008 06:15:04 -0000	1.3
@@ -34,7 +34,6 @@
 	* 
 	*
 	*/
-  
 	public function setup(target:ApplicationParent):Void;
   
 	public function getLayoutName():String;
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/style/ThemeManager.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/style/ThemeManager.as,v
diff -u -r1.3 -r1.4
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/style/ThemeManager.as	7 Jan 2008 04:12:57 -0000	1.3
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/style/ThemeManager.as	20 Jun 2008 06:15:04 -0000	1.4
@@ -148,6 +148,7 @@
     
     
     /**
+	* @deprecated
     * TODO: THIS IS ONLY USED FOR TESTING WHILST SERVER DOES NOT SUPPORT STRUCTURE
     * REMOVE WHEN NO LONGER REQUIRED
 	* //BASE STYLE OBJ not being used - see the node on getStyleObject
@@ -440,7 +441,6 @@
     */
     public function broadcastThemeChanged(){
         dispatchEvent({type:'themeChanged',target:_instance});
-        trace('broadcast');
     }
     
     
@@ -457,8 +457,6 @@
         //Get base style object theme + overwrite properties with ones in visual element for selected theme if found 
         var baseSO = _theme.baseStyleObject;
 		
-		
-
         //Get the correct visual element
         var visualElement:VisualElement = _theme.getVisualElement(visualElementId);
 		if(visualElement){
@@ -596,18 +594,11 @@
 		}
 		
 		res += hex[I];
-		/* WARNING SECTION - Can be removed */
-		//warns if given dec was not integer
-		//dec was converted to integer
-		//if(this != Math.floor(this)){
-		//trace("Warning: Given number "+this+" was not integer.");
-		//trace(" Integer "+Math.floor(this)+" was used instead.");
-		//}
-		/* ENDS WARNING SECTION */
 		
 		return res;
-		}
-    /**
+	}
+    
+	/**
      * Converts style object to a data format that can be serialized
      * @param   so - an MX style object
      * @return  Object
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/AlertDialog.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/AlertDialog.as,v
diff -u -r1.9 -r1.10
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/AlertDialog.as	12 Oct 2007 06:18:19 -0000	1.9
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/AlertDialog.as	20 Jun 2008 06:15:04 -0000	1.10
@@ -47,11 +47,11 @@
 	private var _bgpanel:MovieClip;
 	private var _bgcolor:Color;
 
-    private var ok_btn:Button;         //OK+Cancel buttons
+    private var ok_btn:Button;         		//OK+Cancel buttons
     private var cancel_btn:Button;
 	
 	private var _title:TextArea;
-    private var _message:TextArea;	// Alert message text
+    private var _message:TextArea;				// Alert message text
 	
 	private var _okHandler:Function;
 	private var _cancelHandler:Function;
@@ -60,8 +60,8 @@
 	private var _isDragging:Boolean;
     
 	private var app:Object;
-    private var fm:FocusManager;            //Reference to focus manager
-    private var themeManager:ThemeManager;  //Theme manager
+    private var fm:FocusManager;            	//Reference to focus manager
+    private var themeManager:ThemeManager;  	//Theme manager
     
 	private var transparentCover:MovieClip;
 	private var clickTarget:MovieClip;
@@ -104,11 +104,8 @@
 		_isDragging = false;
 		
 		clickTarget.enabled = true;	
-		
-		//clickTarget.onPress = Proxy.create(this, onDrag);
 		clickTarget.onPress = Proxy.create(this, onDrag);
 		clickTarget.onRelease = Proxy.create(this, onDrag);
-		
 		clickTarget.onReleaseOutside = Proxy.create(this, onDrag);
 
 		ok_btn.addEventListener('click', Delegate.create(this, onOkPress));
@@ -154,13 +151,10 @@
 		
 		transparentCover = target.createClassObject(Panel, "transparentCover", DepthManager.kTop, {_visible: true, enabled: false, _alpha: 0, _width: Stage.width, _height: Stage.height, styleName: styleObj});
 		transparentCover.onPress = null;
-		
-		///org.lamsfoundation.lams.authoring.Application.getInstance().getToolbar().disableAll();
 	}
 	
 	private function removeTransparentLayer() {
 		transparentCover.removeMovieClip();
-		//org.lamsfoundation.lams.authoring.Application.getInstance().getToolbar().enableAll();
 	}
 	
 	public function setOKButton(lbl:String,fn:Function){
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/Cursor.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/Cursor.as,v
diff -u -r1.1 -r1.2
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/Cursor.as	5 Jun 2007 02:58:10 -0000	1.1
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/Cursor.as	20 Jun 2008 06:15:04 -0000	1.2
@@ -36,26 +36,18 @@
 	private static var _cursors:Array = new Array();
 	private static var _bk_cursors:Array = new Array();
 	private static var _current:String = new String();
-    //Declarations  
-    //Constructor  
-  function Cursor() {  
-		
-  }
+    
+	//Declarations  
+    
+	//Constructor  
+    function Cursor() {  
+	
+    }
   
   
     
 	 
 	public static function addCursor(id:String,aCursor_mc:MovieClip):Void{
-		//Application.cursor.
-		//var _cursor = _root.attachMovie(id,id+'_mc',DepthManager.kCursor);
-		//Debugger.log('Test cursor id:' + id + '(' + _cursor + ')',Debugger.GEN,'addCursor','Cursor');
-		
-		//var cursor_mc:MovieClip = ApplicationParent.ccursor.createChildAtDepth(id, DepthManager.kCursor);
-		
-		//var cursor_mc:MovieClip = DepthManager.createObjectAtDepth(id, DepthManager.kCursor);
-		//cursor_mc._visible = false;
-		//_cursors[id]=cursor_mc;
-		
 		updateOrCreateCursorRef(id, ApplicationParent.ccursor, DepthManager.kCursor);
 		
 		Debugger.log('Adding cursor ID:'+id+'('+_cursors[id]+')',Debugger.GEN,'addCursor','Cursor');
@@ -113,8 +105,6 @@
 		_cursors[cursor_id] = cursor_mc;
 		
 		Debugger.log('cursor_mc: '+ cursor_mc,Debugger.GEN,'updateOrCreateCursorRef','Cursor');
-		
-	
 	}
 		
 	/**
@@ -138,13 +128,5 @@
 			return _cursors[_current];
 		}
 	}
-	
-	
-	
-	
-	
-	
-	
-	
 	
 }
\ No newline at end of file
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/Dialog.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/Dialog.as,v
diff -u -r1.8 -r1.9
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/Dialog.as	22 Nov 2007 01:14:09 -0000	1.8
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/Dialog.as	20 Jun 2008 06:15:04 -0000	1.9
@@ -30,11 +30,11 @@
 import org.lamsfoundation.lams.common.*;
 import org.lamsfoundation.lams.common.ui.*
 import org.lamsfoundation.lams.common.util.*
-import org.lamsfoundation.lams.common.dict.*
+import org.lamsfoundation.lams.common.dict.*
+
 import mx.containers.*
 import mx.managers.*
 import mx.events.*
-//import org.lamsfoundation.lams.authoring.*
 
 
 class org.lamsfoundation.lams.common.ui.Dialog {
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/Grid.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/Grid.as,v
diff -u -r1.1 -r1.2
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/Grid.as	5 Jun 2007 02:58:10 -0000	1.1
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/Grid.as	20 Jun 2008 06:15:04 -0000	1.2
@@ -32,11 +32,11 @@
 
 class Grid {
 	//constants
-	private static var LINE_THICKNESS:Number = 1;				//lines
+	private static var LINE_THICKNESS:Number = 1;								//lines
 	private static var LINE_ALPHA:Number = 30;
 	private static var LINE_COLOR:Number = 0x000000;
 
-	public static var SMALL_GRID_H_SPACING:Number = 21;				           //Small grid dimensions
+	public static var SMALL_GRID_H_SPACING:Number = 21;				        //Small grid dimensions
 	public static var SMALL_GRID_V_SPACING:Number = 28;
 	public static var LARGE_GRID_H_SPACING:Number = 5 * SMALL_GRID_H_SPACING;  //Large grid dimensions
 	public static var LARGE_GRID_V_SPACING:Number = 5 * SMALL_GRID_V_SPACING;
@@ -118,13 +118,7 @@
 		_mc.lineStyle(LINE_THICKNESS,LINE_COLOR,LINE_ALPHA);
 		for (var i=0; i<= hLines;i++){
 			var x:Number = i*hGap;
-				
-			/*	
-				public static function dashTo(target:MovieClip, x1:Number, 
-		y1:Number,x2:Number, y2:Number, dashLength:Number, 
-		spaceLength:Number,strokeWidth:Number,rgbHex:Number )
-		*/
-		
+			
 			if(GRID_STYLE == 'dots'){
 				Draw.dashTo(_mc,x,0,x,gridHeight,1,hGap,1,0xCCCCCC);
 			}else{
@@ -134,25 +128,9 @@
 			
 			
 		}
-		//draw vertical lines
-		/*var vLines:Number = Math.floor(gridHeight/vGap);
-		for (i=0; i<= vLines;i++){
-			var y = i*vGap;
-			
-			if(GRID_STYLE == 'dots'){
-				Draw.dashTo(_mc,0,y,gridWidth,y,1,vGap,1,0x000000);
-			}else{
-				_mc.moveTo(0,y);
-				_mc.lineTo(gridWidth,y);
-			}
-			
-		}*/
 		
-		
 		return _mc;
 		
-		
-		
 	}
 
 }
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/InputDialog.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/InputDialog.as,v
diff -u -r1.2 -r1.3
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/InputDialog.as	12 Jun 2007 07:51:09 -0000	1.2
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/InputDialog.as	20 Jun 2008 06:15:04 -0000	1.3
@@ -83,11 +83,7 @@
         fm.enabled = true;
         input_txi.setFocus();
 		
-        // Set the text for buttons
-		// ok_btn.label = Dictionary.getValue('input_dlg_ok');
-		// cancel_btn.label = Dictionary.getValue('input_dlg_cancel');
 		// Fire contentLoaded event, this is required by all dialogs so that creator of LFWindow can know content loaded
-        
 		_container.contentLoaded();
         
 	}
@@ -188,12 +184,9 @@
     */
     public function setSize(w:Number,h:Number):Void{
         //Debugger.log('setSize',Debugger.GEN,'setSize','org.lamsfoundation.lams.common.ws.WorkspaceDialog');
-        //Size the panel
+        
+		//Size the panel
         panel.setSize(w,h);
-
-        //Buttons
-        //ok_btn.move(w-xOkOffset,h-yOkOffset);
-        //cancel_btn.move(w-xCancelOffset,h-yCancelOffset);
     }
     
     //Gets+Sets
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/LFLoader.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/LFLoader.as,v
diff -u -r1.1 -r1.2
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/LFLoader.as	5 Jun 2007 02:58:09 -0000	1.1
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/LFLoader.as	20 Jun 2008 06:15:04 -0000	1.2
@@ -36,8 +36,7 @@
 */
 class LFLoader extends MovieClip {
 	
-	// components
-	//private var panel:MovieClip;
+	// components
 	private var lams_logo:MovieClip;
 	private var pBar:MovieClip;
 	private var pBar_lbl:Label;
@@ -109,8 +108,6 @@
 	 */
 	
 	private function resize(){
-		//panel._width = Stage.width;
-		//panel._height = Stage.height;
 		pBar._x = (Stage.width - pBar._width)/2;
 		pBar._y = (Stage.height - pBar._height)/2;
 		pBar_lbl._x = pBar._x + LABEL_X_OFFSET;
@@ -139,18 +136,7 @@
 		setProgress(1,1);
 		destroy();
 	}
-
-	/**
-    * Called on initialisation and themeChanged event handler
-    /
-    private function setStyles(){
-		panel.setStyle('backgroundColor', 0xDBE6FD);
-		pBar.setStyle('themeColor', 'haloBlue');
-		pBar_lbl.setStyle('color', 0x0B333C);
-		pBar_lbl.setStyle('fontFamily', 'Tahoma');
-		pBar_lbl.setStyle('fontSize', 9);
-	}
-	*/
+
 	public function setProgress(completed:Number, total:Number){
 		if(completed != undefined && total != undefined){
 			pBar.setProgress(completed, total);
@@ -164,7 +150,6 @@
 	 * Update the progress bar after a component has been completed
 	 *  
 	 */
-	
 	public function complete(){
 		_noCompleted++;
 		if(_noCompleted <= _noComponents){
@@ -179,22 +164,18 @@
 	/**
 	* Set the number of application components to load
 	*/
-	
 	public function set noComponents(a:Number){
 		_noComponents = a;
 	}
 	
 	/**
 	 * Remove the MovieClip
 	 *  
-	 */
-	
+	 */
 	private function destroy(){
 		if(!LOADER_INT){
-			trace('setting loader interval');
 			LOADER_INT = setInterval(Proxy.create(this, remove), LOADER_DELAY);
 		} else {
-			trace('already interval');
 		}
 	}
 	
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/LFMenuBar.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/LFMenuBar.as,v
diff -u -r1.5 -r1.6
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/LFMenuBar.as	1 May 2008 06:23:34 -0000	1.5
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/LFMenuBar.as	20 Jun 2008 06:15:04 -0000	1.6
@@ -23,10 +23,10 @@
 import org.lamsfoundation.lams.common.ApplicationParent;
 import org.lamsfoundation.lams.common.ui.*
 import org.lamsfoundation.lams.common.util.*
-//import org.lamsfoundation.lams.authoring.*
 import org.lamsfoundation.lams.common.style.*
 import org.lamsfoundation.lams.common.dict.*
-import org.lamsfoundation.lams.common.ws.Workspace
+import org.lamsfoundation.lams.common.ws.Workspace
+
 import mx.controls.*
 import mx.utils.*
 
@@ -95,8 +95,8 @@
         delete this.onEnterFrame;
         
         //Register for theme changed events and set Initial style
-        tm.addEventListener('themeChanged',this);
-        //setStyles();
+        tm.addEventListener('themeChanged',this);
+		
         //Broadcast event
         dispatchEvent({type:'load',target:this});
 		this.tabChildren = true;
@@ -119,18 +119,14 @@
 	private function setupMenuItems(){
 		
 		setVisible(!isLocked);
-		
-		//trace("Called From: "+env)
+		
 		if (env != "Monitoring"){
 			
 		/*=================
             FILE MENU
         =================*/
         file_menu = _mb.addMenu(Dictionary.getValue('mnu_file'));
         
-        // "new" is the linkage id of the movie clip to be used as the icon for the "New" menu item.
-        //file_menu.addMenuItem({label:"New", instanceName:"newInstance", icon:"new"});
-        //_global.breakpoint();
         if(layout != ApplicationParent.EDIT_MODE) {
 			file_menu.addMenuItem({label:Dictionary.getValue('mnu_file_new'), instanceName:"newItem"});
 			file_menu.addMenuItem({label:Dictionary.getValue('mnu_file_open'), instanceName:"openItem"});
@@ -164,9 +160,6 @@
         =================*/
         edit_menu = _mb.addMenu(Dictionary.getValue("mnu_edit"));
         
-        // "new" is the linkage id of the movie clip to be used as the icon for the "New" menu item.
-        //file_menu.addMenuItem({label:"New", instanceName:"newInstance", icon:"new"});
-        //_global.breakpoint();
         edit_menu.addMenuItem({label:Dictionary.getValue('mnu_edit_undo'), instanceName:"undoItem"});
         edit_menu.addMenuItem({label:Dictionary.getValue('mnu_edit_redo'), instanceName:"redoItem"});
         edit_menu.addMenuItem({type:"separator"});
@@ -465,7 +458,6 @@
 	}
 	
 	public function setDefaults():Void{
-		//file_menu.setMenuItemEnabled(file_menu.getMenuItemAt(0), true);
 		file_menu.setMenuItemEnabled(file_menu.getMenuItemAt(1), false);
 		file_menu.setMenuItemEnabled(file_menu.getMenuItemAt(2), false);
 		file_menu.setMenuItemEnabled(file_menu.getMenuItemAt(3), false);
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/MultiLineCell.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/MultiLineCell.as,v
diff -u -r1.1 -r1.2
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/MultiLineCell.as	16 Jan 2008 22:40:53 -0000	1.1
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/MultiLineCell.as	20 Jun 2008 06:15:04 -0000	1.2
@@ -31,8 +31,8 @@
 class org.lamsfoundation.lams.common.ui.MultiLineCell extends mx.core.UIComponent
 {
 	var multiLineLabel; 
-	var owner; // row that contains the cell
-	var listOwner; // List that contains the cell
+	var owner; 		// row that contains the cell
+	var listOwner; 	// List that contains the cell
 
 	function MultiLineCell() {
 	}
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/Panel.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/Panel.as,v
diff -u -r1.1 -r1.2
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/Panel.as	5 Jun 2007 02:58:10 -0000	1.1
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/Panel.as	20 Jun 2008 06:15:04 -0000	1.2
@@ -24,6 +24,7 @@
 //import org.lamsfoundation.lams.common.util.Debugger
 import mx.core.UIComponent
 import mx.styles.StyleManager
+
 /**
 * Panel is a base UI building block used in LAMS.  
 * It is often a holder or background for other UI components
@@ -78,7 +79,8 @@
 		
 		//some default values;
 		_borderType  = "inset";
-		_backgroundColour = 0xCCCCCC;
+		_backgroundColour = 0xCCCCCC;
+		
 		//hide the bounding box place holder
 		boundingBox_mc._visible = false;
 		boundingBox_mc._width = 0;
@@ -101,10 +103,10 @@
 	
 	public function draw () : Void 
 	{
-		//trace ('panel.draw()');
 		super.draw ();
 		layoutChildren ();
 	}
+	
 	/**
 	* Overrides the function in UIObject.
 	* Calls invalidate, which will call draw() one frame 
@@ -113,7 +115,6 @@
 	*/
 	public function size (Void) : Void
 	{
-		//trace ('Panel.size()');
 		invalidate ();
 	}
 	
@@ -127,7 +128,6 @@
 	*/
 	[Inspectable(enumeration="inset,outset,solid,default,dropDown,none"defaultValue="inset")]
 	function set borderType (bStyle:String):Void{
-		//trace('set bStyle:'+bStyle);
 		_borderType = bStyle;
 		invalidate();
 	}
@@ -150,7 +150,6 @@
 	* 
 	*/
 	public function setStyle(styleProp:String, newValue):Void{
-		//trace('[Panel setStyle]styleProp:'+styleProp+' newValue:'+newValue);
 		//only process if we want to set the bkg
 		if(styleProp == "backgroundColor"){
 			_backgroundColour = newValue;
@@ -165,11 +164,9 @@
 			_backgroundColour = newValue.getStyle('backgroundColor');
 			_borderType = newValue.getStyle('borderStyle');
 			_borderColor = newValue.getStyle('borderColor');
-			//trace('[Panel setStyle]styleName: _backgroundColour:'+_backgroundColour);
-			//trace('[Panel setStyle]styleName: borderStyle:'+_borderType);
 		}else{
-			trace('Panel got an unsupported set style type.... can only be backgroundColor or borderStyle or styleName');
 		}
+		
 		invalidate();
 	}
 	
@@ -183,9 +180,7 @@
 	*/
 	private function createChildren() : Void
 	{
-		//trace('create children in panel, panel:'+panel);
 		panel = this.createObject ("PanelAssets", "panel", getNextHighestDepth());
-		//trace('panel:'+panel);
 		background_ct = new Color(panel.background_mc);
 		//the border is a MM rect border
 		border_mc = createClassObject(mx.skins.RectBorder,"border_mc", getNextHighestDepth()); //make sure this is the last
@@ -225,9 +220,7 @@
 			border_mc.setStyle('borderColor',_borderColor);
 		}
 
-	}
-
-	
+	}
 	
 	/*
 	* These are not used, but I have left them her so we know how 
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/CustomContextMenu.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/CustomContextMenu.as,v
diff -u -r1.6 -r1.7
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/CustomContextMenu.as	8 May 2008 06:14:16 -0000	1.6
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/CustomContextMenu.as	20 Jun 2008 06:15:04 -0000	1.7
@@ -24,9 +24,10 @@
 import org.lamsfoundation.lams.authoring.Activity;
 import org.lamsfoundation.lams.common.ApplicationParent;
 import org.lamsfoundation.lams.common.util.*
-import org.lamsfoundation.lams.common.dict.*
+import org.lamsfoundation.lams.common.dict.*
+
 /**
-* DTO  Generic data transfer obj
+* CustomContextMenu
 */
 class CustomContextMenu {
 	//Declarations
@@ -47,8 +48,6 @@
 	
 	//Constructor
 	private function CustomContextMenu() {
-		
-		
 		//To hide builtin menu for root
 		rootMenu = new ContextMenu();
 		rootMenu.hideBuiltInItems();
@@ -59,9 +58,7 @@
 		
 		authorMenu = new ContextMenu();
 		authorMenu.hideBuiltInItems();
-		//To show hide menu for activities
 		
-		
 		mx.events.EventDispatcher.initialize(this);
 	}
 	
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/Debugger.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/Debugger.as,v
diff -u -r1.1 -r1.2
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/Debugger.as	5 Jun 2007 02:58:10 -0000	1.1
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/Debugger.as	20 Jun 2008 06:15:04 -0000	1.2
@@ -75,8 +75,6 @@
         EventDispatcher.initialize(this);
         _msgLog = [];
 		_crashDumpMsgLog = [];
-		
-		
 	}  
     
     /**
@@ -120,8 +118,7 @@
 	* Method to get the Design Data from canvas & debugger log and store it in an object to send it to the server. 
 	*/
 	public static function crashDataDump():Void{
-        //getInstance();
-		var dto:Object = new Object()
+        var dto:Object = new Object()
 		var _instance = getInstance()
 		
 		
@@ -136,10 +133,7 @@
 			}
         }
 		
-		//trace("Length of _crashDumpMsgLog:- "+_crashDumpMsgLog.length)	
 		var sendDumpMsgLog = _crashDumpMsgLog;
-		//_global.breakpoint();
-		//Debugger.log('HI there: '+mytest,Debugger.CRITICAL,'crashDataDump','Debugger');
 		
 		// save model data depending on which application is running
 		switch(ApplicationParent.getInstance().module){
@@ -209,16 +203,11 @@
 				
 				//Write to trace(NOT USED??)
                 msg = "["+fname+"]"+msg
-				
-				//chuck it to the trace window
-				trace(msg);
-				
-                
+				 
                 //Write to log
                 _msgLog.push(obj);
 					
-				//trace("Length of _msgLog:- "+_msgLog.length)
-                //Dispatch update event
+				//Dispatch update event
                 _instance.dispatchEvent({type:'update',target:_instance});
 			}
 		}
@@ -227,9 +216,7 @@
 	public static function error(e:Object):Void{
 		if(e instanceof LFError){
 			var lfe = LFError(e);
-			trace("/////////////////////// ERROR ///////////////////");
 			log(lfe.message,Debugger.CRITICAL,lfe.fname,"LFError");
-			trace("/////////////////////////////////////////////////");
 		}else{
 			log("Recieved unsupported error type",Debugger.CRITICAL,"error","Debugger");
 		}
@@ -261,15 +248,11 @@
             format = {};
             format.date = false;
         }
-        //Loop through messages and build return string
-        //for(var i=0;i<_msgLog.length;i++) {
-        //    ret += buildMessage(format,_msgLog[i]);
-        //}
-		//Loop through messages and build return string
 		
         for(var i=0;i<_msgLog.length;i++) {
             ret += buildMessage(format,_msgLog[i]);
         }
+		
         return ret;
     }
 	
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/Hashtable.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/Hashtable.as,v
diff -u -r1.1 -r1.2
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/Hashtable.as	5 Jun 2007 02:58:10 -0000	1.1
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/Hashtable.as	20 Jun 2008 06:15:04 -0000	1.2
@@ -122,12 +122,13 @@
     public function remove(o) {
 		setBusy();
 
-        trace("removing " + o);
         var i = this._getIndex(o);
+		
 		//we gotta clear the busy flag as keys needs to be called
 		clearBusy();
-        var l = this.keys().length;
-        setBusy();
+        var l = this.keys().length;
+		setBusy();
+		
 		if(i < l){
             // o found
             var r = this.elements[i].val;
@@ -137,8 +138,8 @@
             }
             
             this.elements.splice(i, 1);
-            trace("length after removal: "+ this.elements.length);
-			clearBusy();
+			clearBusy();
+			
             return r;
         }else{
 			clearBusy();
@@ -187,15 +188,6 @@
     public function isEmpty() {
         return this.elements.length == 0;
     }
-    /*
-    public function toString = function() {
-        var r = "";
-        for (var i = 0; i < this.elements.length; i++) {
-            r += ", " + this.elements[i];
-        }
-        return r.substring(2 * (r.length > 0));
-    } 
-	*/
     
     public function startWatch(newWatchFunction,loc) {
         this._watch = true;
@@ -217,7 +209,6 @@
     * o = search term, f is name of field, can be 'val' or blank is key
     */
     private function _getIndex (o, f) {
-        //trace('Hashtable.prototype._getIndex');
         var r;
         f = f == undefined ? "key" : f;
         for (r = 0; r < this.elements.length && this.elements[r][f] != o; r++);
@@ -238,7 +229,4 @@
 		_isBusy=false;
 	}
 	
-	
-	
-
 }
\ No newline at end of file
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/HashtableElement.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/HashtableElement.as,v
diff -u -r1.1 -r1.2
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/HashtableElement.as	5 Jun 2007 02:58:10 -0000	1.1
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/HashtableElement.as	20 Jun 2008 06:15:04 -0000	1.2
@@ -33,14 +33,14 @@
 	
     //Constructor
     function HashtableElement(key, val) {
-	//trace('Object.prototype.HashtableElement called');
-        this.key = key;
+	    this.key = key;
         this.val = val;
     }
 
     public function toString() {
         return "{" + this.key + "=" + this.val + "}";
     }
+	
     //Getters+Setters
 }
 
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/JsPopup.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/JsPopup.as,v
diff -u -r1.1 -r1.2
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/JsPopup.as	5 Jun 2007 02:58:10 -0000	1.1
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/JsPopup.as	20 Jun 2008 06:15:04 -0000	1.2
@@ -29,7 +29,8 @@
 import org.lamsfoundation.lams.common.dict.*
 import org.lamsfoundation.lams.common.* 
 import mx.managers.*
-import mx.utils.*
+import mx.utils.*
+
 /**
  * Popup method for opening browser popup window using javascript in author.js file.
  * @author  Pradeep Sharma
@@ -39,9 +40,7 @@
 class JsPopup{
 	
 	private static var _instance:JsPopup = null;
-	
 
-
 	/**
 	 * Constructor Function
 	 * @usage   
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/LFError.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/LFError.as,v
diff -u -r1.3 -r1.4
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/LFError.as	16 Jul 2007 08:33:00 -0000	1.3
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/LFError.as	20 Jun 2008 06:15:04 -0000	1.4
@@ -24,9 +24,9 @@
 import org.lamsfoundation.lams.common.ui.*
 import org.lamsfoundation.lams.common.util.*
 import org.lamsfoundation.lams.common.dict.*
+
 import mx.controls.Alert;
 
-
 /**  
 * LFError  
 * 
@@ -40,77 +40,40 @@
 	 private var title:String;
 	 	 
      //Constructor  
-  function LFError(msg:String,fn:String,ref:Object,debugInfo:String) {
+	function LFError(msg:String,fn:String,ref:Object,debugInfo:String) {
 	 super(msg);
 	 _fn = fn;
 	 _ref = ref;
+	 
 	 Debugger.log('Creating LFError instance:'+msg,Debugger.CRITICAL,'LFError','LFError');
 	 Debugger.log('Function:'+fn,Debugger.CRITICAL,'LFError','LFError');
 	 Debugger.log('Ref:'+ref,Debugger.CRITICAL,'LFError','LFError');
 	 Debugger.log('debugInfo:'+debugInfo,Debugger.CRITICAL,'LFError','LFError');
-	
-	 //title = Dictionary.getValue('al_alert')
-	 
-  }
+	}
   
-  public function showErrorAlert(okHandler){
-	/**title = Dictionary.getValue('al_alert')
-	var a:Alert;
-	
-	Alert.okLabel = Dictionary.getValue('al_ok');
-	
-	if(okHandler != undefined){
-		
-		//TODO: Fix the problem of size calculation with icons
-	   a = Alert.show(message,title,Alert.OK,null,okHandler,null,Alert.OK);
-	}else{
-	   a = Alert.show(message,title,Alert.OK,null,null,null,Alert.OK);
+	public function showErrorAlert(okHandler){
+		LFMessage.showMessageAlert(message, okHandler);
 	}
-	*/
-	
-	LFMessage.showMessageAlert(message, okHandler);
-  }
-  /**
- * Shows an alert confirm dialogue.  It is centred in the root time line and diplays the standard LAMS alert icon
- * @usage   
- * @param   msg     	The message to display
- * @param   handler		A handler for the click events broadcast when the buttons are clicked. In addition to the standard click event object properties, there is an additional detail property, which contains the flag value of the button that was clicked (Alert.OK, Alert.CANCEL, Alert.YES, Alert.NO). This handler can be a function or an object
- * @return  
- */
-  public static function showSendErrorRequest(msg:String, msgTitle:String, okHandler:Function, cancelHandler:Function){
+	  
 	/**
-	var alt:Alert;
-	var customTitle = Dictionary.getValue(msgTitle)
-	var handlerObj = new Object();
-	
-	Alert.okLabel = Dictionary.getValue('al_send');
-	Alert.cancelLabel = Dictionary.getValue('al_cancel');
-	
-	handlerObj.click = function(e){
-		if(e.detail == Alert.OK){
-			okHandler();
-		}else if(e.detail == Alert.CANCEL){
-			cancelHandler();
-		}else{
-			Debugger.log('Unknown event detail form confirm:'+e.detail,Debugger.CRITICAL,"showMessageConfirm",'LFMessage');		
-		}
-	}
-	
-	alt = Alert.show(msg, customTitle ,Alert.OK | Alert.CANCEL, null, handlerObj, null, Alert.OK);
+	* Shows an alert confirm dialogue.  It is centred in the root time line and diplays the standard LAMS alert icon
+	* @usage   
+	* @param   msg     	The message to display
+	* @param   handler		A handler for the click events broadcast when the buttons are clicked. In addition to the standard click event object properties, there is an additional detail property, which contains the flag value of the button that was clicked (Alert.OK, Alert.CANCEL, Alert.YES, Alert.NO). This handler can be a function or an object
+	* @return  
 	*/
-	
-	var customTitle = Dictionary.getValue(msgTitle);
-	LFMessage.showMessageConfirm(msg, okHandler, cancelHandler, Dictionary.getValue('al_send'), Dictionary.getValue('al_cancel'), customTitle);
-  
-  }
-  
-  public function get reference():Object{
-   return _ref;
-  }
-	
-  public function get fname():String{
-	return _fn;
-  }
-
+	public static function showSendErrorRequest(msg:String, msgTitle:String, okHandler:Function, cancelHandler:Function){
+		var customTitle = Dictionary.getValue(msgTitle);
+		LFMessage.showMessageConfirm(msg, okHandler, cancelHandler, Dictionary.getValue('al_send'), Dictionary.getValue('al_cancel'), customTitle);
+	  
+	}
+	  
+	public function get reference():Object{
+	   return _ref;
+	}
+		
+	public function get fname():String{
+		return _fn;
+	}
 	 
 }
\ No newline at end of file
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/MovieClipUtils.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/MovieClipUtils.as,v
diff -u -r1.1 -r1.2
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/MovieClipUtils.as	5 Jun 2007 02:58:10 -0000	1.1
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/MovieClipUtils.as	20 Jun 2008 06:15:04 -0000	1.2
@@ -22,7 +22,8 @@
  */
 
 import org.lamsfoundation.lams.common.util.*
-import org.lamsfoundation.lams.common.ui.*
+import org.lamsfoundation.lams.common.ui.*
+
 /**  
 * MovieclipUtils  
 */  
@@ -63,7 +64,6 @@
         //Assign function to clip and set up onEnterFrame
         doLater_mc.fn = fn;
         doLater_mc.onEnterFrame = function () {
-            //trace('doLater.onEnterFrame');
             //Call the fn, kill the enterframe and remove the clip
             fn.apply();
             delete this.onEnterFrame;
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/MovieLoader.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/MovieLoader.as,v
diff -u -r1.1 -r1.2
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/MovieLoader.as	5 Jun 2007 02:58:10 -0000	1.1
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/MovieLoader.as	20 Jun 2008 06:15:04 -0000	1.2
@@ -69,9 +69,6 @@
 		  MovieLoader.movieCache[_mcUrl] = loaded_mc;
 		  var myFn = Proxy.create(_scope,_fn,loaded_mc);
 		  myFn.call();
-		  //_fn.apply(_scope,[loaded_mc]);
-		  
-		  
 	  }
 	  
 	 public function onLoadError(loaded_mc:MovieClip,errorCode:String):Void{
@@ -92,7 +89,7 @@
 	
 		
 	
-		//TODO: Add all the other handlers and methods to set n get them
+	//TODO: Add all the other handlers and methods to set n get them
 	
 
 
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/ObjectUtils.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/ObjectUtils.as,v
diff -u -r1.1 -r1.2
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/ObjectUtils.as	5 Jun 2007 02:58:10 -0000	1.1
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/ObjectUtils.as	20 Jun 2008 06:15:04 -0000	1.2
@@ -31,9 +31,7 @@
 * 
 */  
 class org.lamsfoundation.lams.common.util.ObjectUtils{
-	
 
-	
 	/**
 	* Recursively goes through and object and prints out property values
 	* @usage   printObject(_global);
@@ -43,9 +41,6 @@
 	public static function printObject(target):String{  
 		var str:String = "";
 		for(var o in target){  
-			//trace('object:' + o  + ' value:' + target[o]);  
-			
-			
 			Debugger.log(o  + ':' + target[o],Debugger.GEN,'printObject','org.lamsfoundation.lams.common.util.ObjectUtils');
 			str += o  + ':' + target[o];
 			printObject(target[o]);  
@@ -63,10 +58,6 @@
 	public static function toString(target):String{ 
 		var str:String = "";
 		for(var o in target){  
-			//trace('object:' + o  + ' value:' + target[o]);  
-			
-			
-			//Debugger.log(o  + ':' + target[o],Debugger.GEN,'printObject','org.lamsfoundation.lams.common.util.ObjectUtils');
 			str += '\n'+ o  + ':' + target[o];
 			toString(target[o]);  
 		}  
@@ -75,7 +66,7 @@
 	
 	public static function deNull(obj:Object):Object{
 		Debugger.log('FOR:'+printObject(obj),Debugger.GEN,'deNull','org.lamsfoundation.lams.common.util.ObjectUtils');
-			//Removes null values in objects suitable for sending XML to the Java WDDX deserialiser
+		//Removes null values in objects suitable for sending XML to the Java WDDX deserialiser
 		
 		if (obj instanceof Array) {
 			for (var i = 0; i<obj.length; i++) {
@@ -100,8 +91,6 @@
 	}
 	
 	private static function replaceNullValues(val){
-		//Debugger.log('Communication.STRING_NULL_VALUE:'+Communication.STRING_NULL_VALUE,Debugger.GEN,'deNull','org.lamsfoundation.lams.common.util.ObjectUtils');
-
 		switch(typeof(val)){
 			
 			case "string":
@@ -131,12 +120,7 @@
 			default:
 				val = Config.STRING_NULL_VALUE;
 				return val;
-			
-						
-		
 		}
-		
 	}
 	
-	
 }
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/Proxy.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/Proxy.as,v
diff -u -r1.1 -r1.2
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/Proxy.as	5 Jun 2007 02:58:11 -0000	1.1
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/Proxy.as	20 Jun 2008 06:15:04 -0000	1.2
@@ -33,9 +33,7 @@
  * @since   
  */
 class org.lamsfoundation.lams.common.util.Proxy {
-	
-	
-	
+
 	/**
 	 * Creates a function that executes in the scope passed in as target, 
 	 * not the scope it is actually executed in.  
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/StringUtils.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/StringUtils.as,v
diff -u -r1.2 -r1.3
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/StringUtils.as	16 Jul 2007 08:33:00 -0000	1.2
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/StringUtils.as	20 Jun 2008 06:15:04 -0000	1.3
@@ -99,14 +99,14 @@
 	 * @return  		The result
 	 */
 	public static function replace (s:String,p_str:String,p_repl:String) {
-		//var s:String = this.toString();
-		//var s:String = new String(;
 		var position:Number;
+		
 		while((position = s.indexOf(p_str)) != -1) {
 			position= s.indexOf(p_str);
 			s = s.substring(0,position)+p_repl+s.substring(position+p_str.length,s.length)
 		}
-		return s
+		
+		return s;
 	}
 	
 
@@ -175,18 +175,22 @@
     public static function getUID():String {
         //Return object
         var uid:String;
-        //Get the time now in ms and concatenate with random number between 1-10
+        
+		//Get the time now in ms and concatenate with random number between 1-10
         var date:Date = new Date();
         
         //YEAR
         var year_str:String = String(date.getFullYear());
-        //MONTH
+        
+		//MONTH
         var month_str:String = String(date.getMonth()+1);
         month_str = StringUtils.pad(month_str,2);
-        //DAY
+        
+		//DAY
         var day_str:String = String(date.getDate());
         day_str = StringUtils.pad(day_str,2);
-        //HOUR
+        
+		//HOUR
         var hour_str:String = String(date.getHours());
         hour_str = StringUtils.pad(hour_str,2);
 
@@ -202,9 +206,6 @@
         var milliSecond_str:String = String(date.getMilliseconds());
         milliSecond_str = StringUtils.pad(milliSecond_str,3);
 
-        //var rand_str:String = String(NumberUtils.randomBetween(0,999));
-        //rand_str = StringUtils.pad(rand_str,3);
-        
         var id:String = String(_nextID++);
         id = StringUtils.pad(id,3);
         
@@ -214,7 +215,6 @@
         }
         
         //Convert back to a number for return
-        //uid = year_str + month_str + day_str + hour_str + minute_str + second_str + milliSecond_str + '-'+ rand_str;
         uid = year_str + month_str + day_str + hour_str + minute_str + second_str + milliSecond_str + '-'+ id;
        
         return uid;
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/ws/Workspace.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/ws/Workspace.as,v
diff -u -r1.2 -r1.3
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/ws/Workspace.as	17 Mar 2008 07:14:53 -0000	1.2
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/ws/Workspace.as	20 Jun 2008 06:15:03 -0000	1.3
@@ -45,9 +45,9 @@
 	
 	//Model
 	private var workspaceModel:WorkspaceModel;
+	
 	//View
-	private var workspaceView:WorkspaceView;
-
+	private var workspaceView:WorkspaceView;
 	private var _onOKCallBack:Function;
 	
 
@@ -71,7 +71,6 @@
 		//requestUserWorkspace();
 		workspaceModel.initWorkspaceTree();
 		requestAvailableLicenses();
-			
 	}
 	
 	/**
@@ -94,7 +93,6 @@
 		Debugger.log('workspaceID:'+dto.workspaceID+',rootFolderID:'+dto.rootFolderID,Debugger.GEN,'recievedUserWorkspace','Workspace');			
 		workspaceModel.rootFolderID = dto.rootFolderID;
 		workspaceModel.workspaceID = dto.workspaceID;
-
 	}
 	
 	/**
@@ -110,8 +108,6 @@
 		if(funcToCall != undefined || funcToCall != null){ callback = funcToCall; }
         var uid:Number = Config.getInstance().userID;
 		ApplicationParent.getInstance().getComms().getRequest('workspace.do?method=getFolderContents&folderID='+folderID+'&mode='+Config.getInstance().mode+'&userID='+uid,callback, false);
-		//ApplicationParent.getInstance().getComms().getRequest('workspace.do?method=getFolderContentsExcludeHome&folderID='+folderID+'&mode='+Config.getInstance().mode+'&userID='+uid,callback, false);
-		
 	}
 	
 	/**
@@ -193,7 +189,6 @@
 		var fn:Function = Proxy.create(ref,requestDeleteResource,resourceID,resourceType,true);
 		fn.apply();
 	}
-	
 
 	public function requestNewFolder(parentFolderID:Number,folderName:String){
 		Debugger.log('parentFolderID:'+parentFolderID+', folderName'+folderName,Debugger.GEN,'requestNewFolder','Workspace');			
@@ -224,7 +219,6 @@
 		
 		workspaceModel.clearWorkspaceCacheMultiple();
 
-		
 	}
 	
 	/**
@@ -250,6 +244,7 @@
 
 	}
 	 */
+	 
 	/**
 	 * Gets a list of available licenses to apply to the designs.  Mostly they are creative commons licenses
 	 * @usage   
@@ -271,16 +266,13 @@
 		workspaceModel.setAvailableLicenses(dto);
 	}
 	
-	
-	
 	/**
 	 * Shows the workspace browsing dialoge to open a design
 	 * Usually used by the canvas.
     * 
     */
     public function userSelectItem(callback, mode){
 		_onOKCallBack = callback;
-		//var fn:Function = Delegate.create(this,itemSelected);
 		workspaceModel.currentMode = (mode != null) ? mode : "OPEN";
 		workspaceModel.openDesignBySelection();
     }
@@ -362,7 +354,5 @@
 	public function getWV():WorkspaceView{
 		return workspaceView;
 	}
-	
-	
 	
 }
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/ws/WorkspaceController.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/ws/WorkspaceController.as,v
diff -u -r1.1 -r1.2
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/ws/WorkspaceController.as	5 Jun 2007 02:57:36 -0000	1.1
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/ws/WorkspaceController.as	20 Jun 2008 06:15:03 -0000	1.2
@@ -48,9 +48,6 @@
 		_workspaceModel = WorkspaceModel(wm);
 		_isBusy = false;
 	}
-   
-   
-   
 
 	/**
 	 * called when the dialog is loaded, calles methods to set up content in dialogue
@@ -241,50 +238,36 @@
 			_workspaceModel.folderIDPendingRefresh = null;
 			_workspaceModel.folderIDPendingRefreshList = new Array(targetFolderID,sourceFolderID);
 			
-			//Debugger.log('SourceNode:\n'+ObjectUtils.toString(sourceNodeData),Debugger.GEN,'onDragComplete','org.lamsfoundation.lams.WorkspaceController');
-			//Debugger.log('TargetNode:\n'+ObjectUtils.toString(targetNodeData),Debugger.GEN,'onDragComplete','org.lamsfoundation.lams.WorkspaceController');
-			
 			//ok we are going to do a move:
 			if(isWritable){
 				_workspaceModel.getWorkspace().requestMoveResource(sourceNodeData.resourceID, targetFolderID, sourceNodeData.resourceType);
 			}else{
-				//show an alert();
 				LFMessage.showMessageAlert(Dictionary.getValue('ws_no_permission'),null,null);
+				
 				//we still have to refresh the folders as the DnD tree will be showing wrong info
 				_workspaceModel.clearWorkspaceCacheMultiple();
 			}
 		
 		}
 		
-		
-		
 	}
 	
-	
-	
-		/**
+	/**
 	 * Handles the events from the cut, copy, paste n delete buttons
 	 * @usage   
 	 * @param   e 
 	 * @return  
 	 */
 	public function fileOperationRequest(e:Object){
-		setBusy()
+		setBusy();
 		var tgt:String = new String(e.target);
 		var workspaceDialogue = getView().workspaceDialogue;
+		
 		Debugger.log('type:'+e.type+',target:'+tgt,Debugger.GEN,'fileOperationRequest','org.lamsfoundation.lams.WorkspaceController');
+		
 		//get the selected node:
 		var snode = workspaceDialogue.treeview.selectedNode;
 		
-		//Number(snode.attributes.data.resourceID);
-		//check target for button name
-		/* TODO: Add cut implementation, for now just scrap it :-)
-		if(tgt.indexOf("cut_btn") != -1){
-			_workspaceModel.setClipboardItem(snode,"CUT");
-			//TODO: Be nice to dim the branch in the tree
-			
-		}else 
-		*/
 		_global.breakpoint();
 		if(tgt.indexOf("copy_btn") != -1){
 			_workspaceModel.setClipboardItem(snode.attributes.data);
@@ -344,8 +327,6 @@
 			var snodeData = workspaceDialogue.treeview.selectedNode.attributes.data;
 			
 			if(snodeData != null){
-				
-				
 				//check if we can write to this folder
 				if(_workspaceModel.isWritableResource(snodeData.resourceType,snodeData.resourceID)){
 					Dialog.createInputDialog(Dictionary.getValue('ws_newfolder_ins'), Dictionary.getValue('ws_newfolder_ok'), Dictionary.getValue('ws_newfolder_cancel'), Delegate.create(_workspaceController ,setNewFolderName),null);
@@ -361,9 +342,7 @@
 			
 		}else if(tgt.indexOf("rename_btn") != -1){
 			//check we can rename a folder here
-			
 			if(isUserPrivateFolder(snode)) { LFMessage.showMessageAlert(Dictionary.getValue('ws_no_permission'),null,null);  clearBusy(); return; }
-			
 			
 			var snodeData = workspaceDialogue.treeview.selectedNode.attributes.data;
 			if(snodeData != null){
@@ -378,10 +357,8 @@
 				//nothing to rename
 			}
 			
-			//_workspaceModel.getWorkspace().requestCreateFolder();
-			
 		}
-		clearBusy()
+		clearBusy();
 		
 		//TODO: integrate with key listener for canvas!! CTRL-C is handels by the canvas at the mo... need to set somethign in application.#
 		
@@ -412,13 +389,16 @@
 		var workspaceDialogue = getView().workspaceDialogue;
 		var snodeData = workspaceDialogue.treeview.selectedNode.attributes.data;
 		var selectedFolderID:Number;
+		
 		//if its a folder then the resourceID is the selected folder ID, otherwise its the parent
 		if(snodeData.resourceType == _workspaceModel.RT_FOLDER){
 			selectedFolderID = snodeData.resourceID;
 		}else{
 			selectedFolderID = snodeData.workspaceFolderID;
 		}
+		
 		_workspaceModel.folderIDPendingRefresh = selectedFolderID;
+		
 		//TODO: Validate is allowed name
 		_workspaceModel.getWorkspace().requestNewFolder(selectedFolderID,newName);
 	}
@@ -429,7 +409,6 @@
 	 * @param   snode Node to check
 	 * @return  
 	 */
-	
 	private function isUserPrivateFolder(snode:XMLNode) {
 		if(_workspaceModel.getWorkspaceResource(_workspaceModel.RT_FOLDER + "_" + WorkspaceModel.ROOT_VFOLDER).firstChild == snode) {
 			return true;
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as,v
diff -u -r1.5 -r1.6
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as	17 Mar 2008 07:14:53 -0000	1.5
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as	20 Jun 2008 06:15:03 -0000	1.6
@@ -386,8 +386,10 @@
 	 */
 	private function refreshFolder(nodeToOpen:XMLNode, wm:WorkspaceModel){
 		Debugger.log('refreshFolder:'+nodeToOpen ,Debugger.GEN,'refreshFolder','org.lamsfoundation.lams.ws.WorkspaceDialog');
+		
 		//close the node
 		treeview.setIsOpen(nodeToOpen,false);		
+		
 		//we are gonna need to fire the event manually for some stupid reason the tree is not firing it.
 		//dispatchEvent({type:'nodeOpen',target:treeview,node:nodeToOpen});
 		_workspaceController = _workspaceView.getController();
@@ -397,29 +399,23 @@
 	private function removeProps(wm:WorkspaceModel):Void{
 		if (wm.currentMode == Workspace.MODE_OPEN || wm.currentMode == Workspace.MODE_INSERT){
 				switchView_tab.removeItemAt(1)
-		}	
-		
+		}
 	}
 	
 	private function restoreProps(wm:WorkspaceModel):Void{
 		if(wm.currentMode == Workspace.MODE_OPEN){	
-				if (typeof(switchView_tab.getItemAt(1)) != "object"){
-					switchView_tab.addItem({label:Dictionary.getValue('ws_dlg_properties_button'), data:'PROPERTIES'});
-				}
-			}	
-		
+			if (typeof(switchView_tab.getItemAt(1)) != "object"){
+				switchView_tab.addItem({label:Dictionary.getValue('ws_dlg_properties_button'), data:'PROPERTIES'});
+			}
+		}
 	}
 	
 	private function itemSelected(newSelectedNode:XMLNode,wm:WorkspaceModel){
 		//update the UI with the new info:
-		//_global.breakpoint();
-
 		//Only update the details if the node if its a resource:a
 		var nodeData = newSelectedNode.attributes.data;
 		removeProps(wm);
 		if(nodeData.resourceType == _workspaceModel.RT_FOLDER){
-			
-			
 			resourceTitle_txi.text = "";
 			
 			if(wm.currentMode != Workspace.MODE_SAVEAS || wm.currentMode != Workspace.MODE_SAVE){	
@@ -451,8 +447,8 @@
 					}
 				}
 				if(wm.currentMode == Workspace.MODE_OPEN){
-					//licenseID_cmb.enabled = false;
 				}
+				
 				onLicenseComboSelect();
 				
 				
@@ -527,8 +523,6 @@
 		licenseImg_pnl.createEmptyMovieClip("image_mc", this.getNextHighestDepth());
 		licenseImg_pnl.image_mc.loadMovie(licenseID_cmb.value.pictureURL);
 
-		//license_txa.text = StringUtils.cleanNull(evt.target.data.
-		
 		if(licenseID_cmb.value.url == undefined){
 			viewLicense_btn.enabled = false;
 		}else{
@@ -562,7 +556,6 @@
 		name_lbl.visible = v;
 		resourceTitle_txi.visible = v;
 		new_btn.visible = v;
-		//cut_btn.visible = v;
 		copy_btn.visible = v;
 		paste_btn.visible = v;
 		delete_btn.visible = v;
@@ -586,8 +579,6 @@
 			license_comment_lbl.visible = false;
 			license_txa.visible = false;
 		}
-		
-		
 
 	}
 	
@@ -604,28 +595,26 @@
 		if(tabToSelect == "LOCATION"){
 			setLocationContentVisible(true);
 			setPropertiesContentVisible(false);
-			//setTabIndex("LOCATION");
+			
 			if(wm.currentMode==Workspace.MODE_OPEN){
 				licenseID_cmb.enabled = true;
 			}
 			_currentTab = LOCATION_TAB;
 			
-			//removeProps(wm);
 						
 		}else if(tabToSelect == "PROPERTIES"){
 			setLocationContentVisible(false);
 			setPropertiesContentVisible(true);
 			if(wm.currentMode==Workspace.MODE_OPEN){
 				licenseID_cmb.enabled = false;
 			}
-			//setTabIndex("PROPERTIES");
+			
 			_currentTab = PROP_TAB;
 		}
 		
 		//set the right label on the 'doit' button
 		if(wm.currentMode==Workspace.MODE_OPEN){
 			ok_btn.label = Dictionary.getValue('ws_dlg_open_btn');
-			//licenseID_cmb.enabled = false;
 		}else if(wm.currentMode == Workspace.MODE_INSERT){
 			ok_btn.label = Dictionary.getValue("ws_dlg_insert_btn");
 		}else if(wm.currentMode==Workspace.MODE_SAVE || wm.currentMode==Workspace.MODE_SAVEAS){
@@ -640,26 +629,19 @@
 	}
 	
 	private function setTabIndex(selectedTab:String){
-		
 		ok_btn.tabIndex = 25
         cancel_btn.tabIndex = 26
 		switchView_tab.tabIndex = 1
-		//think this is failing....
-		//if(tabToSelect == "LOCATION"){
-			new_btn.tabIndex = 2
-			//cut_btn.addEventListener('click',Delegate.create(_workspaceController, _workspaceController.fileOperationRequest));
-			copy_btn.tabIndex = 3
-			paste_btn.tabIndex = 4
-			delete_btn.tabIndex = 5
-			rename_btn.tabIndex = 6
-			location_dnd.tabIndex = 7
-			treeview.tabIndex = 7
-		//}else {
-			resourceDesc_txa.tabIndex = 8
-			licenseID_cmb.tabIndex = 9
-			viewLicense_btn.tabIndex = 10
-		//}
-		
+		new_btn.tabIndex = 2
+		copy_btn.tabIndex = 3
+		paste_btn.tabIndex = 4
+		delete_btn.tabIndex = 5
+		rename_btn.tabIndex = 6
+		location_dnd.tabIndex = 7
+		treeview.tabIndex = 7
+		resourceDesc_txa.tabIndex = 8
+		licenseID_cmb.tabIndex = 9
+		viewLicense_btn.tabIndex = 10
 	}
     
     /**
@@ -679,37 +661,11 @@
     * Called on initialisation and themeChanged event handler
     */
     private function setStyles(){
-        //LFWindow, goes first to prevent being overwritten with inherited styles.
-        //var styleObj = themeManager.getStyleObject('LFWindow');
-        //_container.setStyle('styleName',styleObj);
-
-        //Get the button style from the style manager
-       // styleObj = themeManager.getStyleObject('button');
-        
-        //apply to both buttons
-       // Debugger.log('styleObject : ' + styleObj,Debugger.GEN,'setStyles','org.lamsfoundation.lams.WorkspaceDialog');
-       // ok_btn.setStyle('styleName',styleObj);
-        //cancel_btn.setStyle('styleName',styleObj);
-        
         //Get label style and apply to label
 		var styleObj = themeManager.getStyleObject('label');
         name_lbl.setStyle('styleName',styleObj);
+	}
 
-        //Apply treeview style 
-       // styleObj = themeManager.getStyleObject('treeview');
-        //treeview.setStyle('styleName',styleObj);
-
-        //Apply datagrid style 
-      //  styleObj = themeManager.getStyleObject('datagrid');
-        //datagrid.setStyle('styleName',styleObj);
-
-/*
-        //Apply combo style 
-        styleObj = themeManager.getStyleObject('combo');
-        combo.setStyle('styleName',styleObj);
-  */
-  }
-
     /**
     * Called by the cancel button 
     */
@@ -732,7 +688,6 @@
 		licenseID_cmb.enabled = v;
 		viewLicense_btn.enabled = v;
 	}
-	
 	 
    /**
     * Called by the OK button
@@ -746,17 +701,16 @@
     *</code>
 	*/
     private function ok(){
-		
-        trace('OK');
-		_global.breakpoint();
+        _global.breakpoint();
 		_workspaceController = _workspaceView.getController();
 		_workspaceController.setBusy()
+		
 		//TODO: Validate you are allowed to use the name etc... Are you overwriting - NOTE Same names are nto allowed in this version
 		
 		var snode = treeview.selectedNode;
 		
 		if(isVirtualFolder(snode)){
-			_workspaceController.clearBusy();			//LFMessage.showMessageAlert(Dictionary.getValue('ws_click_virtual_folder'),null);
+			_workspaceController.clearBusy();
 			return;
 		}
 		
@@ -791,11 +745,9 @@
 		
 		if (snode.attributes.data.resourceType==_workspaceModel.RT_FOLDER){
 			if(resourceTitle_txi.text == null){
-				//LFMessage.showMessageAlert(Dictionary.getValue('ws_click_file_open'),null);
 			} else {
 				if(!searchForFile(snode, resourceTitle_txi.text)){
-					//LFMessage.showMessageAlert(Dictionary.getValue('ws_no_file_open'),null);
-				_workspaceController.clearBusy()	
+					_workspaceController.clearBusy()	
 				}
 			}
 		} else {
@@ -808,7 +760,6 @@
 	 *   
 	 * @param   snode folder to save to
 	 */
-	
 	private function saveFile(snode:XMLNode):Void{
 		Debugger.log('Saving a file.',Debugger.GEN,'saveFile','org.lamsfoundation.lams.WorkspaceDialog');
 		_workspaceController = _workspaceView.getController();
@@ -916,7 +867,6 @@
 				}
 			} else {
 				if(!searchForFile(_workspaceModel.getWorkspaceResource('Folder_'+dto.workspaceFolderID), _resultDTO.resourceName)){
-					//LFMessage.showMessageAlert(Dictionary.getValue('ws_no_file_open'),null);
 					_workspaceController.clearBusy()
 				}
 			}
@@ -931,7 +881,6 @@
 	 * @param   resourceID  
 	 * @return  
 	 */
-	
 	private function isVirtualFolder(folder:XMLNode){
 		return folder.attributes.data.resourceID < 0;
 	}
@@ -980,14 +929,11 @@
 
         dispatchEvent({type:'okClicked',target:this});
 		_workspaceController.clearBusy();
-        //closeThisDialogue();
-		
 	}
 	
 	public function closeThisDialogue(){
 		 close();
 	}
-
 	
 	/**
 	 * Called when the tabs are clicked
@@ -1008,9 +954,7 @@
     * Event dispatched by parent container when close button clicked
     */
     private function click(e:Object){
-        trace('WorkspaceDialog.click');
-		close(e.target);
-        // e.target.deletePopUp();
+        close(e.target);
     }
 	
 	private function close(container:Object){
@@ -1071,39 +1015,28 @@
 	 */
 	private function setUpTreeview(){
 			
-		//Debugger.log('_workspaceView:'+_workspaceView,Debugger.GEN,'setUpTreeview','org.lamsfoundation.lams.common.ws.WorkspaceDialog');
-		
 		setUpBranchesInit();
 		Debugger.log('WorkspaceModel(_workspaceView.getModel()).treeDP:'+WorkspaceModel(_workspaceView.getModel()).treeDP.toString(),Debugger.GEN,'setUpTreeview','org.lamsfoundation.lams.common.ws.WorkspaceDialog');
 		
-		//Debugger.log('_workspaceController.onTreeNodeOpen:'+_workspaceController.onTreeNodeOpen,Debugger.GEN,'setUpTreeview','org.lamsfoundation.lams.common.ws.WorkspaceDialog');
-		
-		
-		
 		treeview.addEventListener("nodeOpen", Delegate.create(_workspaceController, _workspaceController.onTreeNodeOpen));
 		treeview.addEventListener("nodeClose", Delegate.create(_workspaceController, _workspaceController.onTreeNodeClose));
 		treeview.addEventListener("change", Delegate.create(_workspaceController, _workspaceController.onTreeNodeChange));
 		
-		//location_dnd.addEventListener('double_click', dndList);
-		//location_dnd.addEventListener('drag_start', dndList);
-		//location_dnd.addEventListener('drag_fail', dndList);
-		
-		//location_dnd.addEventListener('drag_target', dndList);
 		location_dnd.addEventListener("drag_complete", Delegate.create(_workspaceController, _workspaceController.onDragComplete));
-		//location_dnd.addEventListener('drag_complete', dndList);
+		
 		//use the above event, on comlete the drop, send the request to do the move to the server (evt.targetNode);
 		//then immediatly invlaidate the cache.  then server may return error if therrte is a problem, else new details willbe shown
 		
 		// open My Workspace virtual folder
 		var wsNode:XMLNode = treeview.firstVisibleNode;
-		//treeview.setIsOpen(wsNode, true);
+		
 		_workspaceController.forceNodeOpen(wsNode);
 		
     }
     
     /**
     * XML onLoad handler for treeview data
- */
+	*/
     private function tvXMLLoaded (ok:Boolean,rootXML:XML){
         if(ok){
             /*
@@ -1160,12 +1093,10 @@
 		return _workspaceView;
 	}
 	
-    
     function get selectedDesignId():Number { 
         return _selectedDesignId;
     }
 	
-	
 	/**
 	 * 
 	 * @usage   
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/ws/WorkspaceModel.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/ws/WorkspaceModel.as,v
diff -u -r1.3 -r1.4
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/ws/WorkspaceModel.as	13 Jan 2008 23:16:40 -0000	1.3
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/ws/WorkspaceModel.as	20 Jun 2008 06:15:03 -0000	1.4
@@ -25,10 +25,10 @@
 import org.lamsfoundation.lams.common.dict.*;
 import org.lamsfoundation.lams.common.ui.Cursor;
 import org.lamsfoundation.lams.common.ApplicationParent;
-
-//import mx.utils.ObjectCopy;
+
 import mx.events.*
 import mx.utils.*
+
 /*
 * Model for the Canvas
 */
@@ -46,39 +46,31 @@
 	public var MEMBERSHIP_ACCESS:Number = 2;
 	public var OWNER_ACCESS:Number = 3;
 	public var NO_ACCESS:Number = 4;
-	
-	
 
 	//ref to the wsp containter
 	private var _workspace:Workspace;
 	
 	private var _availableLicenses:Array;
 	
-
-	
-	//private data
+	// private data
 	private var _workspaceID:Number;
 	private var _rootFolderID:Number;
-	//this is hte inital data
-	//private var _workspaceData:Object;
 	
-	
-	//private var _workspaceResources:Hashtable;				//this contains refs to the tree nodes stored by resourceID
-	private var _workspaceResources:Array;				//this contains refs to the tree nodes stored by resourceType_resourceID
+	private var _workspaceResources:Array;					//this contains refs to the tree nodes stored by resourceType_resourceID
 	private var _accessibleWorkspaceFoldersDTOCopy:Object; // this is used so we can start again after we kill the cache
 	
-	//this is the dartaprovider for the tree
+	//this is the data provider for the tree
 	private var _treeDP:XML;
 
 	private var _selectedTreeNode:XMLNode;
-	private var _currentOpenNode:Object;	// node of the current file which is open on the canvas
+	private var _currentOpenNode:Object;			// node of the current file which is open on the canvas
 	
-	private var _currentTab:String; //tells us which tab should be displayed - LOCATION or PROPERTIES
+	private var _currentTab:String; 				// tells us which tab should be displayed - LOCATION or PROPERTIES
 	private var _defaultTab:String;
-	private var _currentMode:String; //Tells us which mode the dialogue should be in - SAVE, SAVEAS, OPEN...
+	private var _currentMode:String; 				// Tells us which mode the dialogue should be in - SAVE, SAVEAS, OPEN...
 	private var _clipboard:Object;
-	private var _clipboardMode:String; // tells us if its a cut or copy 
-	private var _folderIDPendingRefresh:Number; // The ID of the folder an operation has just been done on, will be refreshed...
+	private var _clipboardMode:String; 			// tells us if its a cut or copy 
+	private var _folderIDPendingRefresh:Number; 	// The ID of the folder an operation has just been done on, will be refreshed...
 	private var _folderIDPendingRefreshList:Array; // The List of ID of the folder an operation has just been done on, will be refreshed...
 
 	// if true folder is being forced to open
@@ -99,7 +91,6 @@
 		_workspaceResources = new Array();
 		_availableLicenses = new Array();
 		_defaultTab = "LOCATION";
-		
 	}	
 	
 	
@@ -110,14 +101,10 @@
 	 * @return  
 	 */
 	public function openDesignBySelection(){
-		
-        //workspaceView.createWorkspaceDialogOpen('centre',Delegate.create(this,itemSelected));
-		
-		var dto:Object = {};
+        var dto:Object = {};
 		dto.pos='centre';
 		Debugger.log('_workspace.itemSelected:'+_workspace.itemSelected,Debugger.GEN,'openDesignBySelection','WorkspaceModel');
 		broadcastViewUpdate('CREATE_DIALOG',dto);
-		
 	}
 	
 	/**
@@ -143,8 +130,6 @@
 		var dto:Object = {};
 		dto.pos='centre';
 		broadcastViewUpdate('CREATE_DIALOG',dto);
-		
-		
 	}
 	
 	/**
@@ -157,8 +142,8 @@
 		if(tabToSelect == undefined){
 			tabToSelect = _defaultTab;
 		}
-		broadcastViewUpdate('SHOW_TAB',tabToSelect);
 		
+		broadcastViewUpdate('SHOW_TAB',tabToSelect);
 	}
 	
 	/**
@@ -186,8 +171,6 @@
         dispatchEvent({type:'viewUpdate',target:this,updateType:_updateType,data:_data});
     }
 	
-	
-	
 	/**
 	 * Sets up the tree for the 1st time
 	 * Creates the dummy root folder with ID -1
@@ -198,16 +181,17 @@
 		Debugger.log('Running',Debugger.GEN,'initWorkspaceTree','org.lamsfoundation.lams.WorkspaceModel');
 		_treeDP = new XML();
 		_workspaceResources = new Array();
+		
 		//add top level
 		//create the data obj:
 		var mdto= {};
 		mdto.creationDateTime = new Date(null);
 		mdto.description = "";
 		mdto.lastModifiedDateTime = new Date(null);
-		//why is this returning undefines
+		
 		mdto.name = Dictionary.getValue('ws_tree_mywsp');
-		trace(Dictionary.getValue('ws_dlg_location_button'));
 		mdto.parentWorkspaceFolderID = null;
+		
 		//read only
 		mdto.permissionCode = 1;
 		mdto.resourceID = "-1";
@@ -218,7 +202,7 @@
 		var rootNode = _treeDP.addTreeNode(mdto.name,mdto);
 		rootNode.attributes.isBranch = true;
 		setWorkspaceResource(RT_FOLDER+'_'+mdto.resourceID,rootNode);
-		//ObjectUtils.printObject(getWorkspaceResource(RT_FOLDER+'_'+mdto.resourceID));
+	
 	}
 	
 	/**
@@ -232,21 +216,12 @@
 		Cursor.showCursor(ApplicationParent.C_HOURGLASS, _workspace.getWV().workspaceCursor);
 		
 		Debugger.log('resourceToOpen :'+resourceToOpen ,Debugger.GEN,'openFolderInTree','org.lamsfoundation.lams.WorkspaceModel');
-		//lets see if its in the hash table already (prob not)
-		//if(_workspaceResources.get(resourceToOpen).attributes.data.contents == undefined){
-			Debugger.log('Requesting...',Debugger.GEN,'openFolderInTree','org.lamsfoundation.lams.WorkspaceModel');
-			//get that resource
-			_forced = forced;
-			_workspace.requestFolderContents(resourceToOpen);
-			
-	
-		//}else{
-		//	Debugger.log('Already in hashtable',Debugger.GEN,'openResourceInTree','org.lamsfoundation.lams.WorkspaceModel');
-			//just update the tree, nothing to do...
-			
-			
-		//}
+		Debugger.log('Requesting...',Debugger.GEN,'openFolderInTree','org.lamsfoundation.lams.WorkspaceModel');
 		
+		_forced = forced;
+		_workspace.requestFolderContents(resourceToOpen);
+
+		
 	}
 	
 	/**
@@ -283,7 +258,6 @@
 		Debugger.log('looking for:Folder_'+dto.workspaceFolderID+', parentWorkspaceFolderID:'+dto.parentWorkspaceFolderID,Debugger.GEN,'setFolderContents','org.lamsfoundation.lams.WorkspaceModel');
 		_global.breakpoint();
 		
-		//if(_workspaceResources.containsKey(dto.workspaceFolderID)){
 		if(getWorkspaceResource('Folder_'+dto.workspaceFolderID)!=null){
 			nodeToUpdate = getWorkspaceResource('Folder_'+dto.workspaceFolderID);
 			Debugger.log('nodeToUpdate.attributes.data.resourceID:'+nodeToUpdate.attributes.data.resourceID,Debugger.GEN,'setFolderContents','org.lamsfoundation.lams.WorkspaceModel');
@@ -294,10 +268,7 @@
 		
 		// do not populate folder if already contains contents
 		if(nodeToUpdate.hasChildNodes()) { 
-			
-			//return; 
-			broadcastViewUpdate('UPDATE_CHILD_FOLDER_NOOPEN',nodeToUpdate);
-			
+			broadcastViewUpdate('UPDATE_CHILD_FOLDER_NOOPEN',nodeToUpdate);	
 		}
 		
 		// sort contents for content folders
@@ -326,13 +297,13 @@
 			if(dto.contents[i].resourceType==RT_FOLDER){
 				cNode.attributes.isBranch=true;	
 				
-				// no longer force open Organisation virtual folder
+				// **no longer force open Organisation virtual folder
 				// force open the Organisation virtual folder when opening My Workspace (root) virtual folder
-				//if(cNode.attributes.data.resourceID == ORG_VFOLDER && !cNode.hasChildNodes()){ openFolderInTree(cNode.attributes.data.resourceID, forced); }
+				// if(cNode.attributes.data.resourceID == ORG_VFOLDER && !cNode.hasChildNodes()){ openFolderInTree(cNode.attributes.data.resourceID, forced); }
 			
 			}else{
-				
 			}
+			
 			Debugger.log('Adding new node to _workspaceResources ID :'+key,Debugger.GEN,'setFolderContents','org.lamsfoundation.lams.WorkspaceModel');
 			setWorkspaceResource(key,cNode);
 		}
@@ -343,7 +314,6 @@
 		
 		Cursor.showCursor(ApplicationParent.C_DEFAULT);
 		
-		
 	}
 	
 	/**
@@ -364,8 +334,8 @@
 		
 				if (wspResource.hasChildNodes()) {
 				   var deleteQue:Array = new Array();
-				  //mental. but true - you have to add them to an array and then delete them from the array, 
-				  //as deleting in the loop them will remove the reference from nextSibling
+				  // mental. but true - you have to add them to an array and then delete them from the array, 
+				  // as deleting in the loop them will remove the reference from nextSibling
 				  // also childNodes:Array not seem to work properly.
 				  // use firstChild to iterate through the child nodes of wspResource
 				  for (var aNode:XMLNode = wspResource.firstChild; aNode != null; aNode=aNode.nextSibling) {
@@ -374,7 +344,6 @@
 				  
 				  for(var i=0; i<deleteQue.length;i++){
 					  var deletedNode:XMLNode = deleteQue[i].removeTreeNode();
-					  //Debugger.log('Removed node:'+deletedNode,Debugger.GEN,'clearWorkspaceCache','org.lamsfoundation.lams.WorkspaceModel');
 				  }
 				  
 
@@ -383,14 +352,8 @@
 					nodeToUpdate.attributes.isEmpty = null;
 					Debugger.log('No Child nodes to delete',Debugger.GEN,'clearWorkspaceCache','org.lamsfoundation.lams.WorkspaceModel');
 				}
+				
 				_folderIDPendingRefresh = null;
-	/*			//this only deletes some children, dont know why, see solution above
-				for(var i=0; i<wspResource.childNodes.length;i++){
-					var deletedNode:XMLNode = wspResource.childNodes[i].removeTreeNode();
-					Debugger.log('Removed node:'+deletedNode,Debugger.GEN,'clearWorkspaceCache','org.lamsfoundation.lams.WorkspaceModel');
-					
-				}
-		*/		
 		}else{
 			//think this wont ever happen as must have been listed by prevous node
 			Debugger.log('Failing! - Did not find folderIDPendingRefresh:'+folderIDPendingRefresh+' Cant do anything',Debugger.CRITICAL,'clearWorkspaceCache','org.lamsfoundation.lams.WorkspaceModel');
@@ -447,8 +410,6 @@
 		var nodeToOpen:XMLNode = getWorkspaceResource('Folder_'+folderID);
 		Debugger.log('Basic open folder call:'+nodeToOpen,Debugger.GEN,'setFolderOpen','org.lamsfoundation.lams.WorkspaceModel');
 		broadcastViewUpdate('OPEN_FOLDER',nodeToOpen);
-		
-		
 	}
 	
 	/**
@@ -472,7 +433,6 @@
 		//mode not used :-) no cut, only copy functionality this time.
 		_clipboardMode = mode;
 		_clipboard = item;
-		
 	}
 	
 	/**
@@ -500,30 +460,32 @@
 		if(rData.permissionCode == READ_ACCESS){
 			return false;
 		}
+		
 		if(rData.permissionCode == MEMBERSHIP_ACCESS){
 			if(!rData.readOnly) { //if the file folder is writable
 				if (resourceType == "Folder")
 					return true;
 			}
 			return false;
 		}
+		
 		if(rData.permissionCode == OWNER_ACCESS){
 			if(!rData.readOnly)
 				return true;
 			else
 				return false;
 		}
+		
 		if(rData.permissionCode == NO_ACCESS){
 			return false;
 		}
+		
 		if(rData.permissionCode == undefined || rData.permissionCode == null){
 			return false;
 		}
 	
 	}
 	
-	
-	
 	//getts n setters
 	/**
 	 * 
@@ -535,6 +497,7 @@
 		Debugger.log(key+'='+newworkspaceResources,Debugger.GEN,'setWorkspaceResource','org.lamsfoundation.lams.WorkspaceModel');
 		_workspaceResources[key] = newworkspaceResources;
 	}
+	
 	/**
 	 * 
 	 * @usage   
@@ -545,14 +508,11 @@
 		return _workspaceResources[key];
 		
 	}
-
 	
 	public function get treeDP():XML{
 		return _treeDP;
 	}
-
 	
-	
 	/**
 	 * 
 	 * @usage   
@@ -611,6 +571,7 @@
 		//dispatch an update to the view
 		broadcastViewUpdate('ITEM_SELECTED',_selectedTreeNode);
 	}
+	
 	/**
 	 * 
 	 * @usage   
@@ -664,6 +625,7 @@
 	public function set currentMode (newcurrentMode:String):Void {
 		_currentMode = newcurrentMode;
 	}
+	
 	/**
 	 * 
 	 * @usage   
@@ -682,6 +644,7 @@
 	public function set folderIDPendingRefresh (newfolderIDPendingRefresh:Number):Void {
 		_folderIDPendingRefresh = newfolderIDPendingRefresh;
 	}
+	
 	/**
 	 * 
 	 * @usage   
@@ -691,7 +654,6 @@
 		return _folderIDPendingRefresh;
 	}
 
-
 	/**
 	 * 
 	 * @usage   
@@ -731,6 +693,7 @@
 		newavailableLicenses.sortOn('name');
 		_availableLicenses = newavailableLicenses;
 	}
+	
 	/**
 	 * 
 	 * @usage   
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/ws/WorkspaceView.as
===================================================================
RCS file: /usr/local/cvsroot/lams_flash/src/common/flash/org/lamsfoundation/lams/common/ws/WorkspaceView.as,v
diff -u -r1.2 -r1.3
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/ws/WorkspaceView.as	16 Jul 2007 08:32:59 -0000	1.2
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/ws/WorkspaceView.as	20 Jun 2008 06:15:03 -0000	1.3
@@ -126,7 +126,6 @@
 		wizard.initWorkspace();
 	}
 	
-	
 	/**
 	 * 
 	 * @usage   
@@ -136,6 +135,7 @@
 	public function set workspaceDialog (newworkspaceDialog:MovieClip):Void {
 		dialog = newworkspaceDialog;
 	}
+	
 	/**
 	 * 
 	 * @usage   
@@ -161,6 +161,7 @@
 		dialog.deletePopUp();
 		isOpen = false;
 	}
+	
 	/**
 	 * Overrides method in abstract view to ensure cortect type of controller is returned
 	 * @usage   
@@ -180,9 +181,5 @@
         trace('default controller in wsv');
 		return new WorkspaceController(model);
     }
-	
-	
-
     
-    
 }