Index: lams_flex/LamsAuthor/src/assets/languages/dictionary.xml
===================================================================
diff -u -r0d708f58ed65f8cfce869f3aee815cea0d4c3f14 -ra7b231505aaaa6e1c52468e782074c07128c675d
--- lams_flex/LamsAuthor/src/assets/languages/dictionary.xml	(.../dictionary.xml)	(revision 0d708f58ed65f8cfce869f3aee815cea0d4c3f14)
+++ lams_flex/LamsAuthor/src/assets/languages/dictionary.xml	(.../dictionary.xml)	(revision a7b231505aaaa6e1c52468e782074c07128c675d)
@@ -194,6 +194,18 @@
 	    <entry key="pi_equal_group_sizes">
 	      <name>Equal group sizes</name>
 	    </entry>
+	    <entry key="pi_group_type">
+	      <name>Grouping type</name>
+	    </entry>
+	    <entry key="random_grp_lbl">
+	      <name>Random</name>
+	    </entry>
+	    <entry key="chosen_grp_lbl">
+	      <name>Choose in Monitor</name>
+	    </entry>
+	    <entry key="learner_choice_grp_lbl">
+	      <name>Learner's choice</name>
+	    </entry>
 		
 	</language>
 </xml>
\ No newline at end of file
Index: lams_flex/LamsAuthor/src/assets/languages/en_AU.xml
===================================================================
diff -u -r60b2439a6205536482d65d00c64c18be2c744ad1 -ra7b231505aaaa6e1c52468e782074c07128c675d
--- lams_flex/LamsAuthor/src/assets/languages/en_AU.xml	(.../en_AU.xml)	(revision 60b2439a6205536482d65d00c64c18be2c744ad1)
+++ lams_flex/LamsAuthor/src/assets/languages/en_AU.xml	(.../en_AU.xml)	(revision a7b231505aaaa6e1c52468e782074c07128c675d)
@@ -209,5 +209,17 @@
 	    <entry key="none_act_lbl">
 	      <name>None</name>
 	    </entry>
+		<entry key="pi_group_type">
+	      <name>Grouping type</name>
+	    </entry>
+	    <entry key="random_grp_lbl">
+	      <name>Random</name>
+	    </entry>
+	    <entry key="chosen_grp_lbl">
+	      <name>Choose in Monitor</name>
+	    </entry>
+	    <entry key="learner_choice_grp_lbl">
+	      <name>Learner's choice</name>
+	    </entry>
 	</language>
 </xml>
\ No newline at end of file
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/PropertyInspector.mxml
===================================================================
diff -u -r2453e0d0a14dab2534256200e96c507cb47aab00 -ra7b231505aaaa6e1c52468e782074c07128c675d
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/PropertyInspector.mxml	(.../PropertyInspector.mxml)	(revision 2453e0d0a14dab2534256200e96c507cb47aab00)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/PropertyInspector.mxml	(.../PropertyInspector.mxml)	(revision a7b231505aaaa6e1c52468e782074c07128c675d)
@@ -3,6 +3,7 @@
 	buttonClick="toggleMininmiseMaximise()" buttonPadding="4"
 	buttonIcon="{minimiseIcon}"
 	xmlns:group="org.lamsfoundation.lams.author.components.activity.group.*"
+	xmlns:common="org.lamsfoundation.lams.common.components.*"
 	xmlns="org.lamsfoundation.lams.common.ui.components.*"
 	layout="absolute"
 	minWidth="250"
@@ -17,6 +18,8 @@
 	
 	<mx:Script>
 		<![CDATA[
+			import org.lamsfoundation.lams.author.controller.PropertyInspectorController;
+			import org.lamsfoundation.lams.author.util.Constants;
 			import org.lamsfoundation.lams.author.util.AuthorUtil;
 			import org.lamsfoundation.lams.author.controller.AuthorController;
 			import org.lamsfoundation.lams.author.model.ToolOutputDefinition;
@@ -33,33 +36,40 @@
 			import org.lamsfoundation.lams.author.components.activity.ToolActivityComponent;
 			import mx.core.Application;
 			import mx.managers.PopUpManager;
-		
-			
+					
 			public static const MIN_INPUT_WIDTH:int = 100;
 			public static const MAX_INPUT_WIDTH:int = 100;
 			
+			private var authController:AuthorController = AuthorController.instance;
+			private var propController:PropertyInspectorController = PropertyInspectorController.instance;
+			
 			[Bindable] private var selectedActivityComponent:ActivityComponent;
 			
+			[Bindable] private var applicationCenter:Point = new Point();
 			
-			private var titleDisabledColors:Object;
-			
-			[Bindable]
-			private var applicationCenter:Point = new Point();
-			
-			[Bindable]
-			[Embed("assets/icons/minimise.png")] 
+			[Bindable][Embed("assets/icons/minimise.png")] 
 			private var minimiseIcon:Class;
 			
-			[Bindable]
-			[Embed("assets/icons/maximise.png")] 
+			[Bindable][Embed("assets/icons/maximise.png")] 
 			private var maximiseIcon:Class;
+			
+			[Bindable] private var groupTypes:Array = new Array(1, 2, 3);
+			
+			[Bindable] private var currentAvailableGroups:ArrayCollection;
+			
 						
 			public function openPropertyInspector():void {
 				visible = true;
 				PopUpManager.addPopUp(this, this, false);
 				
 				applicationCenter.x = Application.application.width/2;
 				applicationCenter.y = Application.application.height/2;
+				
+				if (selectedActivityComponent != null && AuthorUtil.activitySupportsGrouping(selectedActivityComponent.rootActivity)) {
+					currentAvailableGroups = authController.getAllPossibleGroupings(selectedActivityComponent);
+				} else {
+					currentAvailableGroups = null;
+				}
 			}
 			
 			public function closePropertyInspector():void {
@@ -101,16 +111,24 @@
 					this.mybtn.setStyle("icon", minimiseIcon);
 				}
 			}
+			
+			private function openNameGroupsWindow():void {
+				nameGroupsWindow.openWindow();
+			}
+			
 		]]>
 	</mx:Script>
 	
 	<mx:Binding destination="selectedActivityComponent" source="AuthorController.instance.selectedActivityComponent" />
 	<mx:Binding destination="selectedActivityComponent.title" source="txtTitle.text" />
 	
 	<mx:VBox id="vbox" height="100%" width="100%" 
-		horizontalAlign="center" verticalGap="2" paddingBottom="3" paddingLeft="2" paddingRight="2" top="5">
+		horizontalAlign="center" verticalGap="2" paddingBottom="0" paddingLeft="0" paddingRight="0" top="5">
 		<mx:Grid id="grid" verticalGap="4">
-			<mx:GridRow height="16" visible="{selectedActivityComponent != null}" 
+			
+			<!-- Grid row for the activity title, valid for most acitvity types -->
+			<mx:GridRow id="titleGridRow" 
+				height="16" visible="{selectedActivityComponent != null}" 
 				includeInLayout="{selectedActivityComponent != null}">
 				<mx:GridItem>
 					<mx:Label text="{Application.application.dictionary.getLabel('pi_lbl_title')}" height="22" />
@@ -120,22 +138,142 @@
 						text="{selectedActivityComponent.title}" />
 				</mx:GridItem>
 			</mx:GridRow>
+			
+			<!-- ROW FOR GROUPING -->
 			<mx:GridRow id="groupingGridRow" 
-				visible="{AuthorController.activitySupportsGrouping(selectedActivityComponent.activityTypeID, selectedActivityComponent.rootActivity)}" 
+				visible="{AuthorUtil.activitySupportsGrouping(selectedActivityComponent.rootActivity)}" 
 				includeInLayout="{groupingGridRow.visible}">
 				<mx:GridItem>
 					<mx:Label text="{Application.application.dictionary.getLabel('grouping_act_title')}" />
 				</mx:GridItem>
 				<mx:GridItem>
-					<!--<mx:ComboBox id="groupingCombo" dropdownWidth="250" labelField="title" dataProvider="{currentAvailableGroups}" width="{MIN_INPUT_WIDTH}"   />-->
+					<common:BindableComboBox id="groupingCombo" dropdownWidth="250" labelField="title" width="{MIN_INPUT_WIDTH}" 
+						dataProvider="{currentAvailableGroups}" 
+						/>
 				</mx:GridItem>
 			</mx:GridRow>
+			
+			<!-- ROWS FOR TOOL ACTIVITIES -->
+			<mx:GridRow styleName="firstInGroup"
+				visible="{selectedActivityComponent is ToolActivityComponent}" 
+				includeInLayout="{selectedActivityComponent is ToolActivityComponent}">
+				<mx:GridItem>
+					<mx:Label text="{Application.application.dictionary.getLabel('pi_runoffline')}" />
+				</mx:GridItem>
+				<mx:GridItem>
+					<mx:CheckBox id="runOffline" change="propController.setRunOffline(event)"
+						selected="{(selectedActivityComponent is ToolActivityComponent) ? ToolActivityComponent(this.selectedActivityComponent).activity.runOffline : undefined}" />
+				</mx:GridItem>
+			</mx:GridRow>
+			<mx:GridRow
+				visible="{selectedActivityComponent is ToolActivityComponent}" 
+				includeInLayout="{selectedActivityComponent is ToolActivityComponent}">
+				<mx:GridItem>
+					<mx:Label text="{Application.application.dictionary.getLabel('pi_define_monitor_cb_lbl')}" />
+				</mx:GridItem>
+				<mx:GridItem>
+					<mx:CheckBox id="defineLater" change="propController.setDefineLater(event)"
+						selected="{(selectedActivityComponent is ToolActivityComponent) ? ToolActivityComponent(this.selectedActivityComponent).activity.defineLater : undefined}"/>
+				</mx:GridItem>
+			</mx:GridRow>
+			
+			<!-- ROWS FOR GROUP ACITIVITES -->
+			<mx:GridRow id="groupingTypeGridRow" styleName="firstInGroup"
+				visible="{selectedActivityComponent is GroupActivityComponent}" 
+				includeInLayout="{groupingTypeGridRow.visible}">
+				<mx:GridItem>
+					<mx:Label text="{Application.application.dictionary.getLabel('pi_group_type')}" />
+				</mx:GridItem>
+				<mx:GridItem>
+				<common:BindableComboBox id="groupingTypeCombo" dropdownWidth="250" labelFunction="propController.getGroupTypeName"
+						value="{(selectedActivityComponent is GroupActivityComponent) ? GroupActivityComponent(selectedActivityComponent).activity.groupingTypeID : undefined}"
+						dataProvider="{groupTypes}" width="{MIN_INPUT_WIDTH}"  change="propController.setGroupType(event)" />
+				</mx:GridItem>
+			</mx:GridRow>
+			<mx:GridRow id="groupingNumGR"
+				visible="{selectedActivityComponent is GroupActivityComponent}" 
+				includeInLayout="{selectedActivityComponent is GroupActivityComponent}">
+				<mx:GridItem>
+					<mx:Label text="{Application.application.dictionary.getLabel('pi_num_groups')}" />
+				</mx:GridItem>
+				<mx:GridItem>
+					<mx:RadioButton id="groupNumRad"
+						visible="{(selectedActivityComponent is GroupActivityComponent) ? GroupActivityComponent(selectedActivityComponent).activity.groupingTypeID != Constants.GROUPING_TYPE_TEACHER_CHOSEN : false}"
+						includeInLayout="{groupNumRad.visible}"
+						selected="{(selectedActivityComponent is GroupActivityComponent) ? 
+							(GroupActivityComponent(selectedActivityComponent).activity.useGroupNumber || 
+								GroupActivityComponent(selectedActivityComponent).activity..groupingTypeID != Constants.GROUPING_TYPE_TEACHER_CHOSEN)
+									: undefined}"
+						change="propController.setGroupUseGroupNumber(event)"
+						/>
+					<mx:NumericStepper id="groupNum" minimum="2" height="22" width="40" fontSize="10" textAlign="center"
+						enabled="{groupNumRad.selected}" 
+						value="{(selectedActivityComponent is GroupActivityComponent) ? GroupActivityComponent(selectedActivityComponent).activity.numberOfGroups : undefined}"
+						change="propController.setGroupNumber(event)"
+						/>
+				</mx:GridItem>
+			</mx:GridRow>
+			<mx:GridRow id="learnerNumGR" 
+				visible="{(selectedActivityComponent is GroupActivityComponent) ? GroupActivityComponent(selectedActivityComponent).activity.groupingTypeID != Constants.GROUPING_TYPE_TEACHER_CHOSEN : false}" 
+				includeInLayout="{learnerNumGR.visible}">
+				<mx:GridItem>
+					<mx:Label text="{Application.application.dictionary.getLabel('pi_num_learners')}" />
+				</mx:GridItem>
+				<mx:GridItem>
+					<mx:RadioButton id="learnerNumRad"
+						visible="{learnerNumGR.visible}"
+						includeInLayout="{learnerNumGR.visible}"
+						selected="{(selectedActivityComponent is GroupActivityComponent) ? !GroupActivityComponent(selectedActivityComponent).activity.useGroupNumber : undefined}"
+						change="propController.setGroupUseGroupNumber(event)"
+						/>
+					<mx:NumericStepper id="learnerNum" minimum="1" height="22" width="40" fontSize="10" textAlign="center"
+						visible="{learnerNumRad.visible}"
+						includeInLayout="{learnerNumRad.visible}"
+						enabled="{learnerNumRad.selected}" 
+						value="{(selectedActivityComponent is GroupActivityComponent) ? GroupActivityComponent(selectedActivityComponent).activity.learnersPerGroups : undefined}"
+						change="propController.setLearnerNumber(event)"
+						/>
+				</mx:GridItem>
+			</mx:GridRow>
+			<mx:GridRow id="equalGroupSizesGR" styleName="firstInGroup"
+				visible="{(selectedActivityComponent is GroupActivityComponent) ? GroupActivityComponent(selectedActivityComponent).activity.groupingTypeID == Constants.GROUPING_TYPE_LEARNER_CHOICE : false}"
+				includeInLayout="{equalGroupSizesGR.visible}">
+				<mx:GridItem>
+					<mx:Label text="{Application.application.dictionary.getLabel('pi_equal_group_sizes')}" />
+				</mx:GridItem>
+				<mx:GridItem>
+					<mx:CheckBox id="equalGroupSizesChk" change="propController.setEqualGroupSizes(event)"
+						selected="{(selectedActivityComponent is GroupActivityComponent) ? GroupActivityComponent(this.selectedActivityComponent).activity.equalGroupSizes : undefined}"/>
+				</mx:GridItem>
+			</mx:GridRow>
+			<mx:GridRow id="viewStudentsBeforeSelectionGR" 
+				visible="{equalGroupSizesGR.visible}"
+				includeInLayout="{equalGroupSizesGR.visible}">
+				<mx:GridItem>
+					<mx:Label text="{Application.application.dictionary.getLabel('view_students_before_selection')}" />
+				</mx:GridItem>
+				<mx:GridItem>
+					<mx:CheckBox id="viewStudentsBeforeSelectionChk" change="propController.setViewStudentsBeforeSelection(event)"
+						selected="{(selectedActivityComponent is GroupActivityComponent) ? GroupActivityComponent(this.selectedActivityComponent).activity.viewStudentsBeforeSelection : undefined}"/>
+				</mx:GridItem>
+			</mx:GridRow>
+			<mx:GridRow styleName="firstInGroup">
+				<mx:GridItem></mx:GridItem>
+				<mx:GridItem>
+					<mx:Button label="{Application.application.dictionary.getLabel('pi_group_naming_btn_lbl')}" 
+		                		height="18" click="openNameGroupsWindow()" />
+				</mx:GridItem>
+			</mx:GridRow>
+			
+			
+			
 		</mx:Grid>
 	</mx:VBox>
 	<mx:Canvas id="opacityLayer" height="100%" width="100%" backgroundColor="white" backgroundAlpha="0.6" />
 	
-	<mx:ArrayCollection id="currentAvailableGroups" />
 	<mx:ArrayCollection id="toolOutputDefs" />
 	
+	<group:NameGroupsWindow id="nameGroupsWindow"  includeInLayout="false" />
+	
 
 </ButtonPanel>
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml
===================================================================
diff -u -r2453e0d0a14dab2534256200e96c507cb47aab00 -ra7b231505aaaa6e1c52468e782074c07128c675d
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml	(.../ActivityComponent.mxml)	(revision 2453e0d0a14dab2534256200e96c507cb47aab00)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponent.mxml	(.../ActivityComponent.mxml)	(revision a7b231505aaaa6e1c52468e782074c07128c675d)
@@ -223,19 +223,27 @@
 				_activity.title = title;
 			}
 			
-			public function get activityTypeID():int {
+			[Bindable] public function get activityTypeID():int {
 				return _activity.activityTypeID;
 			}
 			
+			public function set activityTypeID(activityTypeID:int):void {
+				_activity.activityTypeID = activityTypeID;
+			}
+			
 			/**
 			 * Returns the root activity object
 			 * This is required as AS3 has not concept of abstract methods.
 			 * So we need to be able to fetch this activity instance
 			 * Without knowing what activity type it is.
 			 */ 
-			public function get rootActivity():Activity {
+			[Bindable]public function get rootActivity():Activity {
 				return _activity;
 			}
+			
+			public function set rootActivity(activity:Activity):void {
+				this._activity = activity;
+			}
 
 		]]>
 	</mx:Script>
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponentFactory.as
===================================================================
diff -u -r3444f7cd21be73f0284515ef8f821ad9320b54a0 -ra7b231505aaaa6e1c52468e782074c07128c675d
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponentFactory.as	(.../ActivityComponentFactory.as)	(revision 3444f7cd21be73f0284515ef8f821ad9320b54a0)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/ActivityComponentFactory.as	(.../ActivityComponentFactory.as)	(revision a7b231505aaaa6e1c52468e782074c07128c675d)
@@ -9,7 +9,7 @@
 	import org.lamsfoundation.lams.author.model.activity.Activity;
 	import org.lamsfoundation.lams.author.model.activity.ActivityFactory;
 	import org.lamsfoundation.lams.author.model.activity.CombinedActivity;
-	import org.lamsfoundation.lams.author.model.activity.GroupActivity;
+	import org.lamsfoundation.lams.author.model.activity.group.GroupActivity;
 	import org.lamsfoundation.lams.author.model.activity.OptionalActivity;
 	import org.lamsfoundation.lams.author.model.activity.ToolActivity;
 	import org.lamsfoundation.lams.author.util.Constants;
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/GroupActivityComponent.mxml
===================================================================
diff -u -r6049b2dc7dad8cf49c0e9f8a92ffe6bb517139c6 -ra7b231505aaaa6e1c52468e782074c07128c675d
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/GroupActivityComponent.mxml	(.../GroupActivityComponent.mxml)	(revision 6049b2dc7dad8cf49c0e9f8a92ffe6bb517139c6)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/GroupActivityComponent.mxml	(.../GroupActivityComponent.mxml)	(revision a7b231505aaaa6e1c52468e782074c07128c675d)
@@ -7,10 +7,9 @@
 	<mx:Script>
 		<![CDATA[
 			import org.lamsfoundation.lams.author.controller.AuthorController;
-			import org.lamsfoundation.lams.author.model.activity.GroupActivity;
+			import org.lamsfoundation.lams.author.model.activity.group.GroupActivity;
 			
-			[Bindable]
-			public function get activity():GroupActivity {
+			[Bindable] public function get activity():GroupActivity {
 				return this._activity as GroupActivity;
 			}
 			
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/NameGroupsWindow.mxml
===================================================================
diff -u -r09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc -ra7b231505aaaa6e1c52468e782074c07128c675d
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/NameGroupsWindow.mxml	(.../NameGroupsWindow.mxml)	(revision 09b7412b77d263dcb1f5dc6a0ff1609796bc1ebc)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/activity/group/NameGroupsWindow.mxml	(.../NameGroupsWindow.mxml)	(revision a7b231505aaaa6e1c52468e782074c07128c675d)
@@ -5,11 +5,12 @@
 	minWidth="150"
 	title="{Application.application.dictionary.getLabel('groupnaming_dlg_title_lbl')}"
 	>
-	
-	
+
 	<mx:Script>
 		<![CDATA[
+			import org.lamsfoundation.lams.author.model.activity.group.Group;
 			import org.lamsfoundation.lams.author.controller.AuthorController;
+			import org.lamsfoundation.lams.author.components.activity.group.GroupActivityComponent;
 			import mx.events.ListEventReason;
 			import mx.controls.TextInput;
 			import mx.events.ListEvent;
@@ -21,42 +22,38 @@
 			import mx.binding.utils.ChangeWatcher;
 			import mx.core.Application;
 			
-			private var changeWatcher1:ChangeWatcher;
-			private var changeWatcher2:ChangeWatcher;
-			
 			public function openWindow():void {
 				this.visible=true;
-				
 				var x:int = Application.application.applicationCenter.x;
-				
-				if (Application.application.selectedActivity is GroupActivityComponent) {
-					var groupActivity:GroupActivityComponent = Application.application.selectedActivity as GroupActivityComponent;
-					changeWatcher1 = BindingUtils.bindProperty(nameList, "dataProvider", groupActivity, "groupNames");
-					changeWatcher2 = BindingUtils.bindProperty(groupActivity, "groupNames", nameList, "dataProvider");
-				}
-				
 				PopUpManager.addPopUp(this, this, true);
 			}
 			
 			public function closeWindow():void {
 				this.visible=false;
-				changeWatcher1.unwatch();
-				changeWatcher2.unwatch();
 				PopUpManager.removePopUp(this);
 			}
 			
 			private function itemEditEnd(event:ListEvent):void {
 				var editor:TextInput = TextInput(event.currentTarget.itemEditorInstance);
 				if ((StringUtil.trim(editor.text)).length== 0){
+					// Invalid input, stop the edit
 					event.preventDefault();
 					event.stopPropagation();
+				} else {
+					if (Application.application.selectedActivity is GroupActivityComponent) {
+						var groupActivityComponent:GroupActivityComponent = Application.application.selectedActivity as GroupActivityComponent;
+						var group:Group = groupActivityComponent.activity.groups.getItemAt(event.rowIndex) as Group;
+						group.groupName = editor.text;
+					}
 				}
 			}
 			
 		]]>
 	</mx:Script>
 	<mx:Text text="{Application.application.dictionary.getLabel('groupnaming_dialog_instructions_lbl')}" />
-	<mx:List id="nameList" editable="true" itemEditEnd="itemEditEnd(event)" width="100%" maxHeight="140" ></mx:List>
+	<mx:List id="nameList" editable="true" labelField="groupName" itemEditEnd="itemEditEnd(event)" width="100%" maxHeight="140" 
+		dataProvider="{(AuthorController.instance.selectedActivityComponent is GroupActivityComponent)? 
+		GroupActivityComponent(AuthorController.instance.selectedActivityComponent).activity.groups
+		:null}"/>
 	<mx:Button label="OK" click="closeWindow()" />
-	 
 </Window>
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/toolbar/ToolBar.mxml
===================================================================
diff -u -r2aa362fa3ab4a8226745005fce896c82f7a03309 -ra7b231505aaaa6e1c52468e782074c07128c675d
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/toolbar/ToolBar.mxml	(.../ToolBar.mxml)	(revision 2aa362fa3ab4a8226745005fce896c82f7a03309)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/components/toolbar/ToolBar.mxml	(.../ToolBar.mxml)	(revision a7b231505aaaa6e1c52468e782074c07128c675d)
@@ -249,7 +249,7 @@
     		label="{Application.application.dictionary.getLabel('monitor_group_btn')}" 
     		toolTip="{Application.application.dictionary.getLabel('monitor_group_btn_tooltip')}"/>
     		
-    	<toolbar:SystemToolComponent activityTypeID="{Constants.ACTIVITY_TYPE_GROUPING}" groupingType="{Constants.GROUPING_TYPE_STUDENT_CHOICE}" height="25" 
+    	<toolbar:SystemToolComponent activityTypeID="{Constants.ACTIVITY_TYPE_GROUPING}" groupingType="{Constants.GROUPING_TYPE_LEARNER_CHOICE}" height="25" 
     		click="mouseClick(event)"
     		icon="@Embed(source='assets/icons/group.png')" 
     		label="{Application.application.dictionary.getLabel('learner_group_btn')}" 
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/controller/AuthorController.as
===================================================================
diff -u -r2453e0d0a14dab2534256200e96c507cb47aab00 -ra7b231505aaaa6e1c52468e782074c07128c675d
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/controller/AuthorController.as	(.../AuthorController.as)	(revision 2453e0d0a14dab2534256200e96c507cb47aab00)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/controller/AuthorController.as	(.../AuthorController.as)	(revision a7b231505aaaa6e1c52468e782074c07128c675d)
@@ -14,10 +14,8 @@
 	import org.lamsfoundation.lams.author.components.activity.*;
 	import org.lamsfoundation.lams.author.components.toolbar.SystemToolComponent;
 	import org.lamsfoundation.lams.author.model.activity.Activity;
-	import org.lamsfoundation.lams.author.model.activity.GroupActivity;
-	import org.lamsfoundation.lams.author.model.activity.ToolActivity;
+	import org.lamsfoundation.lams.author.model.activity.group.GroupActivity;
 	import org.lamsfoundation.lams.author.model.learninglibrary.LearningLibraryEntry;
-	import org.lamsfoundation.lams.author.util.AuthorUtil;
 	import org.lamsfoundation.lams.author.util.Constants;
 	import org.lamsfoundation.lams.common.dictionary.XMLDictionaryRegistry;
 	
@@ -216,39 +214,32 @@
 			
 			
 			// Make a null grouping for this activity
-			var nullGrouping:GroupActivity = new GroupActivity(0, 1);
-			nullGrouping.title = Application.application.dictionary.getLabel("none_act_lbl");
-			currentAvailableGroups.addItem(nullGrouping);			
-			currentAvailableGroups.addAll(activityComponent.allPossibleGroupings);
+			var nullGrouping:GroupActivity = GroupActivity.nullGroupActivity;
+			currentAvailableGroups.addItem(nullGrouping);
 			
-			return currentAvailableGroups;
-			
-			// TODO: Need to traverse the learning design array to find any previous activities
-			// that are grouping activities
-			
-			
-			/* 
-			var activity:Activity = activityComponent.rootActivity;
-			
-			if (activity.transitionIn != null){
-				var activityCmp:ActivityComponent = this.transitionIn.fromActivity;
+			// Traverse the previous activities to see if one is a group activity
+			if (activityComponent != null) {
+				var activity:Activity = activityComponent.rootActivity;
+				if (activity.transitionTo != null){
+					var prevActivity:Activity = activity.transitionTo.fromActivity;
 				
-				while (true) {
-					if (activityCmp is GroupActivityComponent) {
-						var entry:Object = new Object();
-						entry.activity.activityUIID = activityCmp.activity.activityUIID;
-						entry.activity.title = activityCmp.activity.title;
-						ret.addItem(entry);
-					}
-					
-					if (activityCmp.transitionIn != null) {
-						activityCmp = activityCmp.transitionIn.fromActivity;
-					} else {
-						break;
-					}
-				}  
-			} */
+					while (true) {
+						if (prevActivity is GroupActivity) {
+							currentAvailableGroups.addItem(prevActivity);
+						}
+						
+						if (prevActivity.transitionTo != null) {
+							prevActivity = prevActivity.transitionTo.fromActivity
+						} else {
+							break;
+						}
+					}  
+				}
+				
+				
+			}
 			
+			return currentAvailableGroups;
 			
 			/* groupingCombo.selectedItem = nullGrouping;
 			for each (var item:Object in currentAvailableGroups) {
@@ -271,18 +262,5 @@
 					break;
 			}
 		}
-		
-		public static function activitySupportsGrouping(activityTypeID:int, activity:Activity):Boolean {
-	   		if (AuthorUtil.activitySupportsGrouping(activityTypeID)) {
-	   			if (activity is ToolActivity) {
-	   				return (activity as ToolActivity).groupingEnabled;
-	   			} else {
-	   				return true;
-	   			}
-	   		} else {
-	   			return false;
-	   		}
-	   		
-	   	}
 	}
 }
\ No newline at end of file
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/controller/PropertyInspectorController.as
===================================================================
diff -u
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/controller/PropertyInspectorController.as	(revision 0)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/controller/PropertyInspectorController.as	(revision a7b231505aaaa6e1c52468e782074c07128c675d)
@@ -0,0 +1,105 @@
+package org.lamsfoundation.lams.author.controller
+{
+	import flash.events.Event;
+	
+	import mx.core.Application;
+	
+	import org.lamsfoundation.lams.author.components.activity.ToolActivityComponent;
+	import org.lamsfoundation.lams.author.components.activity.group.GroupActivityComponent;
+	import org.lamsfoundation.lams.author.util.Constants;
+	
+	public class PropertyInspectorController
+	{
+		private static var _instance:PropertyInspectorController;
+		
+		public function PropertyInspectorController() {
+			if (_instance != null) {
+				throw new Error("This is a singleton, do not instanciate, instead use TransitionController.instance");
+			}
+		}
+		
+		public static function get instance():PropertyInspectorController {
+			if (_instance == null) {
+				_instance = new PropertyInspectorController();
+			}
+			return _instance;
+		}
+		
+		public function getGroupTypeName(typeID:Object):String {
+			switch (typeID as int) {
+				case Constants.GROUPING_TYPE_RANDOM:
+					return Application.application.dictionary.getLabel("random_grp_lbl");
+					break;
+				case Constants.GROUPING_TYPE_TEACHER_CHOSEN:
+					return Application.application.dictionary.getLabel("chosen_grp_lbl");
+					break;
+				case Constants.GROUPING_TYPE_LEARNER_CHOICE:
+					return Application.application.dictionary.getLabel("learner_choice_grp_lbl");
+					break;
+				default:
+					return "";
+					break;
+			}
+		}
+		
+		/**
+		* FUNCTIONS FOR TOOL ACTIVITIES
+		*/ 
+		
+		
+		public function setDefineLater(event:Event):void {
+			if (AuthorController.instance.selectedActivityComponent is ToolActivityComponent) {
+				(AuthorController.instance.selectedActivityComponent as ToolActivityComponent).activity.defineLater = event.currentTarget.selected;
+			}
+		}
+		
+		public function setRunOffline(event:Event):void {
+			if (AuthorController.instance.selectedActivityComponent is ToolActivityComponent) {
+				(AuthorController.instance.selectedActivityComponent as ToolActivityComponent).activity.runOffline = event.currentTarget.selected;
+			}
+		}
+		
+		
+		/**
+		* FUNCTIONS FOR GROUP ACTIVITIES
+		*/ 
+		
+		public function setGroupType(event:Event):void {
+			var groupTypeID:int = event.currentTarget.selectedItem as int;
+			if (AuthorController.instance.selectedActivityComponent is GroupActivityComponent) {
+				var groupActCmp:GroupActivityComponent = AuthorController.instance.selectedActivityComponent as GroupActivityComponent;
+				groupActCmp.activity.groupingTypeID = groupTypeID;
+			}
+		}
+		public function setGroupUseGroupNumber(event:Event):void {
+			if (AuthorController.instance.selectedActivityComponent is GroupActivityComponent) {
+				GroupActivityComponent(AuthorController.instance.selectedActivityComponent).activity.useGroupNumber = event.currentTarget.selected;
+			}
+		}
+		public function setGroupNumber(event:Event):void {
+			if (AuthorController.instance.selectedActivityComponent is GroupActivityComponent) {
+				GroupActivityComponent(AuthorController.instance.selectedActivityComponent).activity.setGroupNum(event.currentTarget.value);
+			}
+		}
+		public function setLearnerNumber(event:Event):void {
+			if (AuthorController.instance.selectedActivityComponent is GroupActivityComponent) {
+				GroupActivityComponent(AuthorController.instance.selectedActivityComponent).activity.learnersPerGroups = event.currentTarget.value;
+			}
+		}
+		public function setEqualGroupSizes(event:Event):void {
+			if (AuthorController.instance.selectedActivityComponent is GroupActivityComponent) {
+				GroupActivityComponent(AuthorController.instance.selectedActivityComponent).activity.equalGroupSizes = event.currentTarget.selected;
+			}
+		}
+		public function setViewStudentsBeforeSelection(event:Event):void {
+			if (AuthorController.instance.selectedActivityComponent is GroupActivityComponent) {
+				GroupActivityComponent(AuthorController.instance.selectedActivityComponent).activity.viewStudentsBeforeSelection = event.currentTarget.selected;
+			}
+		}
+		
+		
+		
+		
+
+	}
+}
\ No newline at end of file
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/model/activity/Activity.as
===================================================================
diff -u -r3444f7cd21be73f0284515ef8f821ad9320b54a0 -ra7b231505aaaa6e1c52468e782074c07128c675d
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/model/activity/Activity.as	(.../Activity.as)	(revision 3444f7cd21be73f0284515ef8f821ad9320b54a0)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/model/activity/Activity.as	(.../Activity.as)	(revision a7b231505aaaa6e1c52468e782074c07128c675d)
@@ -1,5 +1,6 @@
 package org.lamsfoundation.lams.author.model.activity
 {
+	import org.lamsfoundation.lams.author.model.activity.group.GroupActivity;
 	import org.lamsfoundation.lams.author.model.transition.Transition;
 	
 	public class Activity
@@ -20,7 +21,7 @@
 		public var activityID:Number;
 		[Bindable] public var activityUIID:int;
 		public var activityCategoryID:Number;
-		public var activityTypeID:Number;
+		[Bindable] public var activityTypeID:int;
 		public var learningLibraryID:Number;
 		public var learningDesignID:Number;
 		public var parentActivityID:Number;		
@@ -38,11 +39,11 @@
 		public var groupingSupportType:Number;	// Possibly not needed because of Tool object	
 		
 		// Activity state
-		public var runOffline:Boolean;
+		[Bindable] public var runOffline:Boolean;
 		public var applyGrouping:Boolean;
 		public var stopAfterActivity:Boolean;
 		public var readOnly:Boolean;
-		public var defineLater:Boolean;
+		[Bindable] public var defineLater:Boolean;
 		public var isActivitySelected:String		// Not found in wddx xml
 			
 		// Not found in wddx xml
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/model/activity/ActivityFactory.as
===================================================================
diff -u -r2453e0d0a14dab2534256200e96c507cb47aab00 -ra7b231505aaaa6e1c52468e782074c07128c675d
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/model/activity/ActivityFactory.as	(.../ActivityFactory.as)	(revision 2453e0d0a14dab2534256200e96c507cb47aab00)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/model/activity/ActivityFactory.as	(.../ActivityFactory.as)	(revision a7b231505aaaa6e1c52468e782074c07128c675d)
@@ -1,7 +1,11 @@
 package org.lamsfoundation.lams.author.model.activity
 {
+	import mx.core.Application;
+	
 	import org.lamsfoundation.lams.author.components.toolbar.SystemToolComponent;
 	import org.lamsfoundation.lams.author.controller.AuthorController;
+	import org.lamsfoundation.lams.author.model.activity.group.Group;
+	import org.lamsfoundation.lams.author.model.activity.group.GroupActivity;
 	import org.lamsfoundation.lams.author.model.learninglibrary.LearningLibraryEntry;
 	import org.lamsfoundation.lams.author.util.Constants;
 	
@@ -54,6 +58,14 @@
 			}
 		}
 		
+		/**
+		 * Create a tool activity instane
+		 * 
+		 * @param learningLibraryEntry the corresponding LearningLibraryEntry for the ToolActivity
+		 * @param UIID the activityUIID for the toolActivity
+		 * @return 
+		 * 
+		 */
 		private static function getToolActivityInstance(learningLibraryEntry:LearningLibraryEntry, UIID:int):ToolActivity {
 			var toolActivity:ToolActivity = new ToolActivity(UIID);
     		toolActivity.tool = learningLibraryEntry.toolTemplates[0];
@@ -91,11 +103,43 @@
     		return combinedActivity;
 		}
 		
+		/**
+		 * Create a groupActivity instance, with a null grouping and
+		 * two default groups
+		 * 
+		 * @param systemToolComponent
+		 * @param UIID
+		 * @return 
+		 * 
+		 */
 		private static function getGroupActivityInstance(systemToolComponent:SystemToolComponent, UIID:int):GroupActivity {
 			var groupActivity:GroupActivity = new GroupActivity(UIID, systemToolComponent.groupingType);
+			
+			// Create two default groups for the groupActivity
+			var group1UIID:int = UIID;
+    		var group2UIID:int = UIID;
+    		if (UIID != 0) {
+    			// this is a canvas instance, need new uuids
+    			group1UIID = AuthorController.instance.generateUIID();
+    			group2UIID = AuthorController.instance.generateUIID();
+    		}
+    		var group1:Group = new Group(group1UIID, UIID, Application.application.dictionary.getLabel('group_btn') + " 1", 1);
+			var group2:Group = new Group(group2UIID, UIID, Application.application.dictionary.getLabel('group_btn') + " 2", 2);
+			
+			// Add groups to the group activity
+			groupActivity.groups.addItem(group1);
+			groupActivity.groups.addItem(group2);
 			return groupActivity;
 		}
 		
+		/**
+		 * Create an optional activity instance
+		 * 
+		 * @param systemToolComponent
+		 * @param UIID
+		 * @return 
+		 * 
+		 */
 		private static function getOptionalActivityInstance(systemToolComponent:SystemToolComponent, UIID:int):OptionalActivity {
 			var optionalActivity:OptionalActivity = new OptionalActivity(UIID);
 			return optionalActivity;
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/model/activity/group/Group.as
===================================================================
diff -u
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/model/activity/group/Group.as	(revision 0)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/model/activity/group/Group.as	(revision a7b231505aaaa6e1c52468e782074c07128c675d)
@@ -0,0 +1,19 @@
+package org.lamsfoundation.lams.author.model.activity.group
+{
+	import mx.core.Application;
+	
+	public class Group
+	{
+		public var groupUIID:int;
+		public var groupActivityUIID:int;
+		public var groupName:String;
+		public var orderID:int;
+		
+		public function Group(groupUIID:int, groupActivityUIID:int, groupName:String, orderID:int){
+			this.groupUIID = groupUIID;
+			this.groupActivityUIID = groupActivityUIID;
+			this.groupName = groupName;
+			this.orderID = orderID;
+		}
+	}
+}
\ No newline at end of file
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/model/activity/group/GroupActivity.as
===================================================================
diff -u
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/model/activity/group/GroupActivity.as	(revision 0)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/model/activity/group/GroupActivity.as	(revision a7b231505aaaa6e1c52468e782074c07128c675d)
@@ -0,0 +1,82 @@
+package org.lamsfoundation.lams.author.model.activity.group
+{
+	import mx.collections.ArrayCollection;
+	import mx.core.Application;
+	
+	import org.lamsfoundation.lams.author.controller.AuthorController;
+	import org.lamsfoundation.lams.author.model.activity.Activity;
+	import org.lamsfoundation.lams.author.util.Constants;
+	
+	public class GroupActivity extends Activity
+	{
+		[Bindable] public var groups:ArrayCollection = new ArrayCollection();
+		[Bindable] public var toolTip:String;
+		
+		[Bindable] public var useGroupNumber:Boolean = true;
+		[Bindable] public var viewStudentsBeforeSelection:Boolean = false;
+		[Bindable] public var equalGroupSizes:Boolean = false;
+		
+		[Bindable] public var groupingTypeID:int;
+		[Bindable] public var numberOfGroups:int = 2;
+		[Bindable] public var maxNumberOfGroups:int;
+		[Bindable] public var learnersPerGroups:int = 1;
+		
+		public var isNullGrouping:Boolean = false;  // Non persistent field
+		
+		public function GroupActivity(UIID:int, groupingTypeID:int)
+		{
+			super(activityUIID);
+			this.activityTypeID = Constants.ACTIVITY_TYPE_GROUPING;
+			this.groupingTypeID = groupingTypeID;
+			
+			this.title = Application.application.dictionary.getLabel("grouping_act_title");
+
+			switch (groupingTypeID) {
+				case Constants.GROUPING_TYPE_RANDOM:
+					this.toolTip = Application.application.dictionary.getLabel('pi_random_group_activity');
+					break;
+				case Constants.GROUPING_TYPE_TEACHER_CHOSEN:
+					this.toolTip = Application.application.dictionary.getLabel('pi_monitor_group_activity');
+					break;
+				case Constants.GROUPING_TYPE_LEARNER_CHOICE:
+					this.toolTip = Application.application.dictionary.getLabel('pi_learner_group_activity');
+					break;
+				
+			} 
+		}
+		
+		/**
+		 * Set the number of groups
+		 * Need to create new group instances when there are more groups
+		 * Or delete them if there are less
+		 * 
+		 * @param groupNum
+		 * 
+		 */
+		public function setGroupNum(groupNum:int):void {
+			if (groupNum > numberOfGroups) {
+				for (var i:int = numberOfGroups; i<groupNum; i++){
+					var newUIID:int = AuthorController.instance.generateUIID();
+					var group:Group = new Group(newUIID, this.activityUIID,  generateGroupName(), i-1);
+					groups.addItem(group);
+				}
+			} else {
+				for (var j:int=numberOfGroups - 1; j>groupNum-1; j--){
+					groups.removeItemAt(j);
+				}
+			}
+			numberOfGroups = groupNum;
+		}
+		
+		private function generateGroupName():String {
+			return Application.application.dictionary.getLabel('group_btn') + " " + (numberOfGroups + 1);
+		}
+		
+		public static function get nullGroupActivity():GroupActivity {
+			var nullGroup:GroupActivity = new GroupActivity(0, 0);
+			nullGroup.title = Application.application.dictionary.getLabel("none_act_lbl");
+			nullGroup.isNullGrouping = true;
+			return nullGroup;
+		}
+	}
+}
\ No newline at end of file
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/util/AuthorUtil.as
===================================================================
diff -u -r3444f7cd21be73f0284515ef8f821ad9320b54a0 -ra7b231505aaaa6e1c52468e782074c07128c675d
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/util/AuthorUtil.as	(.../AuthorUtil.as)	(revision 3444f7cd21be73f0284515ef8f821ad9320b54a0)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/util/AuthorUtil.as	(.../AuthorUtil.as)	(revision a7b231505aaaa6e1c52468e782074c07128c675d)
@@ -8,6 +8,9 @@
 	
 	import mx.controls.Image;
 	
+	import org.lamsfoundation.lams.author.model.activity.Activity;
+	import org.lamsfoundation.lams.author.model.activity.ToolActivity;
+	
 	public class AuthorUtil
 	{
 		public function AuthorUtil(){}
@@ -43,15 +46,31 @@
 			return image;
 	   	}
 	   	
-	   	public static function activitySupportsGrouping(activityTypeID:int):Boolean {
-	   		return activityTypeID != Constants.ACTIVITY_TYPE_GATE_CONDITION &&
+	   	public static function activitySupportsGrouping(activity:Activity):Boolean {
+	   		var activityTypeID:int = activity.activityTypeID;
+	   		if (activityTypeID != Constants.ACTIVITY_TYPE_GATE_CONDITION &&
 	   			activityTypeID != Constants.ACTIVITY_TYPE_GATE_PERMISSION &&
 	   			activityTypeID != Constants.ACTIVITY_TYPE_GATE_SCHEDULE &&
 	   			activityTypeID != Constants.ACTIVITY_TYPE_GATE_SYNCH &&
 	   			activityTypeID != Constants.ACTIVITY_TYPE_GATE_SYSTEM &&
 	   			activityTypeID != Constants.ACTIVITY_TYPE_GROUPING &&
-	   			activityTypeID != Constants.ACTIVITY_TYPE_REFERENCE;
+	   			activityTypeID != Constants.ACTIVITY_TYPE_REFERENCE) {
+	   			if (activity is ToolActivity) {
+	   				return (activity as ToolActivity).groupingEnabled;
+	   			} else {
+	   				return true;
+	   			}
+	   		} else {
+	   			return false;
+	   		}
 	   	}
+	   		
+	   		
+	   		
+	   		
+	   		
+	   		
+	   	
 
 	}
 }
\ No newline at end of file
Index: lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/util/Constants.as
===================================================================
diff -u -r3444f7cd21be73f0284515ef8f821ad9320b54a0 -ra7b231505aaaa6e1c52468e782074c07128c675d
--- lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/util/Constants.as	(.../Constants.as)	(revision 3444f7cd21be73f0284515ef8f821ad9320b54a0)
+++ lams_flex/LamsAuthor/src/org/lamsfoundation/lams/author/util/Constants.as	(.../Constants.as)	(revision a7b231505aaaa6e1c52468e782074c07128c675d)
@@ -50,7 +50,7 @@
 		// Grouping type
 		public static const GROUPING_TYPE_RANDOM:int = 1;
 		public static const GROUPING_TYPE_TEACHER_CHOSEN:int = 2;
-		public static const GROUPING_TYPE_STUDENT_CHOICE:int = 3;
+		public static const GROUPING_TYPE_LEARNER_CHOICE:int = 3;
 		
 		// Transition type
 		public static const TRANSITION_TYPE_NORMAL:int = 1;
Index: lams_flex/LamsFlexCommon/src/org/lamsfoundation/lams/common/components/BindableComboBox.mxml
===================================================================
diff -u
--- lams_flex/LamsFlexCommon/src/org/lamsfoundation/lams/common/components/BindableComboBox.mxml	(revision 0)
+++ lams_flex/LamsFlexCommon/src/org/lamsfoundation/lams/common/components/BindableComboBox.mxml	(revision a7b231505aaaa6e1c52468e782074c07128c675d)
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<mx:ComboBox xmlns:mx="http://www.adobe.com/2006/mxml" >
+	<mx:Script>
+	<![CDATA[
+	
+		private var candidateValue:Object;
+		private var valueDirty:Boolean = false;
+		private var candidateDataProvider:Object;
+		private var dataProviderDirty:Boolean = false;
+		
+		private function applyValue(val:Object):void {
+			if ((val != null) && (dataProvider != null)) {
+			
+				for (var i : int = 0; i < dataProvider.length; i++) {
+					if (val == dataProvider[i]) {
+						selectedIndex = i;
+						return;
+					}    
+				}    
+			}
+			selectedIndex = -1;
+		}    
+		
+		public function set value(val:Object)  : void {
+			candidateValue = val;
+			valueDirty = true;        
+			invalidateProperties();
+		}
+		
+		override public function set dataProvider(value:Object):void {
+			candidateDataProvider = value;
+			dataProviderDirty = true;
+			invalidateProperties();
+		}
+		
+		override protected function commitProperties():void {
+			super.commitProperties();
+			
+			if (dataProviderDirty)    {
+				super.dataProvider = candidateDataProvider;
+				dataProviderDirty = false;
+			}
+			
+			if (valueDirty) {
+				applyValue(candidateValue);
+				valueDirty = false;
+			}            
+		}        
+	]]>
+	</mx:Script>
+</mx:ComboBox>