Updated Branches:
  refs/heads/develop 130d94271 -> 6036d5d35

Changed DropDownListList to extend SimpleList instead of List, making it 
possible to include simple strings in the drop list as a default.


Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/6036d5d3
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/6036d5d3
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/6036d5d3

Branch: refs/heads/develop
Commit: 6036d5d356f4d9f980bcc788110727855205228d
Parents: 130d942
Author: Peter Ent <[email protected]>
Authored: Mon Sep 30 10:35:32 2013 -0400
Committer: Peter Ent <[email protected]>
Committed: Mon Sep 30 10:35:32 2013 -0400

----------------------------------------------------------------------
 frameworks/as/defaults.css                                     | 6 ++++++
 frameworks/as/src/org/apache/flex/core/IItemRendererParent.as  | 1 +
 .../beads/DataItemRendererFactoryForArrayData.as               | 3 +++
 .../beads/TextItemRendererFactoryForArrayData.as               | 3 +++
 .../beads/TextItemRendererFactoryForStringVectorData.as        | 3 +++
 .../html/staticControls/supportClasses/DropDownListList.as     | 3 ++-
 .../html/staticControls/supportClasses/NonVirtualDataGroup.as  | 5 +++++
 7 files changed, 23 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6036d5d3/frameworks/as/defaults.css
----------------------------------------------------------------------
diff --git a/frameworks/as/defaults.css b/frameworks/as/defaults.css
index f01484d..a220dc7 100644
--- a/frameworks/as/defaults.css
+++ b/frameworks/as/defaults.css
@@ -104,6 +104,9 @@ ComboBox
     IBeadView: 
ClassReference("org.apache.flex.html.staticControls.beads.ComboBoxView");
     IBeadController: 
ClassReference("org.apache.flex.html.staticControls.beads.controllers.ComboBoxController");
     IPopUp: 
ClassReference("org.apache.flex.html.staticControls.supportClasses.DropDownListList");
+    IDataProviderItemRendererMapper: 
ClassReference("org.apache.flex.html.staticControls.beads.TextItemRendererFactoryForArrayData");
+    IItemRendererClassFactory: 
ClassReference("org.apache.flex.core.ItemRendererClassFactory");
+    IItemRenderer: 
ClassReference("org.apache.flex.html.staticControls.supportClasses.StringItemRenderer");
 }
 
 Container
@@ -135,6 +138,9 @@ DropDownList
 DropDownListList
 {
     IBeadModel: 
ClassReference("org.apache.flex.html.staticControls.beads.models.ArraySelectionModel");
+    IDataProviderItemRendererMapper: 
ClassReference("org.apache.flex.html.staticControls.beads.TextItemRendererFactoryForArrayData");
+    IItemRendererClassFactory: 
ClassReference("org.apache.flex.core.ItemRendererClassFactory");
+    IItemRenderer: 
ClassReference("org.apache.flex.html.staticControls.supportClasses.StringItemRenderer");
 }
 
 Image

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6036d5d3/frameworks/as/src/org/apache/flex/core/IItemRendererParent.as
----------------------------------------------------------------------
diff --git a/frameworks/as/src/org/apache/flex/core/IItemRendererParent.as 
b/frameworks/as/src/org/apache/flex/core/IItemRendererParent.as
index a9bc5a6..0095b2e 100644
--- a/frameworks/as/src/org/apache/flex/core/IItemRendererParent.as
+++ b/frameworks/as/src/org/apache/flex/core/IItemRendererParent.as
@@ -24,5 +24,6 @@ package org.apache.flex.core
        public interface IItemRendererParent extends IParent, IEventDispatcher
        {
                function getItemRendererForIndex(index:int):IItemRenderer;
+               function removeAllElements():void;
        }
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6036d5d3/frameworks/as/src/org/apache/flex/html/staticControls/beads/DataItemRendererFactoryForArrayData.as
----------------------------------------------------------------------
diff --git 
a/frameworks/as/src/org/apache/flex/html/staticControls/beads/DataItemRendererFactoryForArrayData.as
 
b/frameworks/as/src/org/apache/flex/html/staticControls/beads/DataItemRendererFactoryForArrayData.as
index 186a77d..dbb06ed 100644
--- 
a/frameworks/as/src/org/apache/flex/html/staticControls/beads/DataItemRendererFactoryForArrayData.as
+++ 
b/frameworks/as/src/org/apache/flex/html/staticControls/beads/DataItemRendererFactoryForArrayData.as
@@ -74,6 +74,9 @@ package org.apache.flex.html.staticControls.beads
                        var dp:Array = selectionModel.dataProvider as Array;
                        if (!dp)
                                return;
+                       
+                       dataGroup.removeAllElements();
+                       
                        var n:int = dp.length; 
                        for (var i:int = 0; i < n; i++)
                        {

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6036d5d3/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextItemRendererFactoryForArrayData.as
----------------------------------------------------------------------
diff --git 
a/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextItemRendererFactoryForArrayData.as
 
b/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextItemRendererFactoryForArrayData.as
index f233ef8..5fc7188 100644
--- 
a/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextItemRendererFactoryForArrayData.as
+++ 
b/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextItemRendererFactoryForArrayData.as
@@ -74,6 +74,9 @@ package org.apache.flex.html.staticControls.beads
                        var dp:Array = selectionModel.dataProvider as Array;
                        if (!dp)
                                return;
+                       
+                       dataGroup.removeAllElements();
+                       
                        var n:int = dp.length; 
                        for (var i:int = 0; i < n; i++)
                        {

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6036d5d3/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextItemRendererFactoryForStringVectorData.as
----------------------------------------------------------------------
diff --git 
a/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextItemRendererFactoryForStringVectorData.as
 
b/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextItemRendererFactoryForStringVectorData.as
index c72561b..77302f4 100644
--- 
a/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextItemRendererFactoryForStringVectorData.as
+++ 
b/frameworks/as/src/org/apache/flex/html/staticControls/beads/TextItemRendererFactoryForStringVectorData.as
@@ -56,6 +56,9 @@ package org.apache.flex.html.staticControls.beads
                private function dataProviderChangeHandler(event:Event):void
                {
                        var dp:Vector.<String> = selectionModel.dataProvider as 
Vector.<String>;
+                       
+                       dataGroup.removeAllElements();
+                       
                        var n:int = dp.length; 
                        for (var i:int = 0; i < n; i++)
                        {

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6036d5d3/frameworks/as/src/org/apache/flex/html/staticControls/supportClasses/DropDownListList.as
----------------------------------------------------------------------
diff --git 
a/frameworks/as/src/org/apache/flex/html/staticControls/supportClasses/DropDownListList.as
 
b/frameworks/as/src/org/apache/flex/html/staticControls/supportClasses/DropDownListList.as
index d42a739..04f9f7c 100644
--- 
a/frameworks/as/src/org/apache/flex/html/staticControls/supportClasses/DropDownListList.as
+++ 
b/frameworks/as/src/org/apache/flex/html/staticControls/supportClasses/DropDownListList.as
@@ -20,11 +20,12 @@ package org.apache.flex.html.staticControls.supportClasses
 {
     import org.apache.flex.core.IPopUp;
     import org.apache.flex.html.staticControls.List;
+    import org.apache.flex.html.staticControls.SimpleList;
     import org.apache.flex.html.staticControls.beads.SolidBackgroundBead;
     
     [Event(name="change", type="org.apache.flex.events.Event")]
     
-       public class DropDownListList extends List implements IPopUp
+       public class DropDownListList extends SimpleList implements IPopUp
        {
                public function DropDownListList()
                {

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/6036d5d3/frameworks/as/src/org/apache/flex/html/staticControls/supportClasses/NonVirtualDataGroup.as
----------------------------------------------------------------------
diff --git 
a/frameworks/as/src/org/apache/flex/html/staticControls/supportClasses/NonVirtualDataGroup.as
 
b/frameworks/as/src/org/apache/flex/html/staticControls/supportClasses/NonVirtualDataGroup.as
index ef1c2aa..133ed18 100644
--- 
a/frameworks/as/src/org/apache/flex/html/staticControls/supportClasses/NonVirtualDataGroup.as
+++ 
b/frameworks/as/src/org/apache/flex/html/staticControls/supportClasses/NonVirtualDataGroup.as
@@ -33,5 +33,10 @@ package org.apache.flex.html.staticControls.supportClasses
         {
             return getChildAt(index) as IItemRenderer;
         }
+               
+               public function removeAllElements():void
+               {
+                       this.removeChildren(0);
+               }
        }
 }
\ No newline at end of file

Reply via email to