This is an automated email from the ASF dual-hosted git repository.

carlosrovira pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git


The following commit(s) were added to refs/heads/develop by this push:
     new edfae32  jewel: remove unused beads
edfae32 is described below

commit edfae32dc8812f9372d821642c248396d0f4e222
Author: Carlos Rovira <[email protected]>
AuthorDate: Wed Apr 8 14:40:00 2020 +0200

    jewel: remove unused beads
---
 .../Jewel/src/main/resources/jewel-manifest.xml    |   7 -
 .../AddDataGridItemRendererForArrayListData.as     | 161 -------------
 .../AddListItemRendererForArrayListData.as         | 261 ---------------------
 .../RemoveDataGridItemRendererForArrayListData.as  | 166 -------------
 .../RemoveListItemRendererForArrayListData.as      | 201 ----------------
 .../UpdateDataGridItemRendererForArrayListData.as  |  73 ------
 .../UpdateListItemRendererForArrayListData.as      | 205 ----------------
 7 files changed, 1074 deletions(-)

diff --git a/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml 
b/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
index 1e4697f..201aca3 100644
--- a/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
+++ b/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
@@ -226,14 +226,7 @@
     <component id="DropDownListItemRendererFactoryForCollectionView" 
class="org.apache.royale.jewel.beads.itemRenderers.DropDownListItemRendererFactoryForCollectionView"/>
     <component id="TableItemRendererFactoryForCollectionView" 
class="org.apache.royale.jewel.beads.itemRenderers.TableItemRendererFactoryForCollectionView"/>
     <component id="NoClassSelectorListSelectableItemRendererBead" 
class="org.apache.royale.jewel.beads.itemRenderers.NoClassSelectorListSelectableItemRendererBead"/>
-
-    <component id="AddListItemRendererForArrayListData" 
class="org.apache.royale.jewel.beads.itemRenderers.AddListItemRendererForArrayListData"
 />
-    <component id="RemoveListItemRendererForArrayListData" 
class="org.apache.royale.jewel.beads.itemRenderers.RemoveListItemRendererForArrayListData"
 />
-    <component id="UpdateListItemRendererForArrayListData" 
class="org.apache.royale.jewel.beads.itemRenderers.UpdateListItemRendererForArrayListData"
 />
     
-    <component id="AddDataGridItemRendererForArrayListData" 
class="org.apache.royale.jewel.beads.itemRenderers.AddDataGridItemRendererForArrayListData"
 />
-    <component id="RemoveDataGridItemRendererForArrayListData" 
class="org.apache.royale.jewel.beads.itemRenderers.RemoveDataGridItemRendererForArrayListData"
 />
-    <component id="UpdateDataGridItemRendererForArrayListData" 
class="org.apache.royale.jewel.beads.itemRenderers.UpdateDataGridItemRendererForArrayListData"
 />
     <component id="RemoveAllDataGridItemRendererForArrayListData" 
class="org.apache.royale.jewel.beads.itemRenderers.RemoveAllDataGridItemRendererForArrayListData"
 />
 
     <component id="AddTableRowForArrayListData" 
class="org.apache.royale.jewel.beads.itemRenderers.AddTableRowForArrayListData" 
/>
diff --git 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/AddDataGridItemRendererForArrayListData.as
 
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/AddDataGridItemRendererForArrayListData.as
deleted file mode 100644
index c36fe03..0000000
--- 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/AddDataGridItemRendererForArrayListData.as
+++ /dev/null
@@ -1,161 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  Licensed to the Apache Software Foundation (ASF) under one or more
-//  contributor license agreements.  See the NOTICE file distributed with
-//  this work for additional information regarding copyright ownership.
-//  The ASF licenses this file to You under the Apache License, Version 2.0
-//  (the "License"); you may not use this file except in compliance with
-//  the License.  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.jewel.beads.itemRenderers
-{
-       import org.apache.royale.core.IBead;
-       import org.apache.royale.core.IDataProviderModel;
-       import org.apache.royale.core.ISelectionModel;
-       import org.apache.royale.core.IStrand;
-       import org.apache.royale.core.UIBase;
-       import org.apache.royale.events.CollectionEvent;
-       import org.apache.royale.events.Event;
-       import org.apache.royale.events.IEventDispatcher;
-       import org.apache.royale.jewel.beads.views.DataGridView;
-       import 
org.apache.royale.jewel.supportClasses.datagrid.IDataGridColumnList;
-
-    /**
-        *  Handles the adding of an itemRenderer in a DataGrid component once 
the corresponding datum has been added
-        *  from the IDataProviderModel.
-        *
-        *  @langversion 3.0
-        *  @playerversion Flash 10.2
-        *  @playerversion AIR 2.6
-        *  @productversion Royale 0.9.7
-        */
-       public class AddDataGridItemRendererForArrayListData implements IBead
-       {
-               /**
-                * Constructor
-                *
-                *  @langversion 3.0
-                *  @playerversion Flash 10.2
-                *  @playerversion AIR 2.6
-                *  @productversion Royale 0.9.7
-                */
-               public function AddDataGridItemRendererForArrayListData()
-               {
-               }
-               
-               private var view:DataGridView;
-
-               protected var _strand:IStrand;
-               /**
-                * @copy org.apache.royale.core.IStrand
-                *
-                *  @langversion 3.0
-                *  @playerversion Flash 10.2
-                *  @playerversion AIR 2.6
-                *  @productversion Royale 0.9.7
-                */
-               public function set strand(value:IStrand):void
-               {
-                       _strand = value;
-                       
IEventDispatcher(value).addEventListener("initComplete", initComplete);
-                       
-                       view = UIBase(_strand).view as DataGridView;
-            for (var i:int=0; i < view.columnLists.length; i++)
-            {
-                var list:IDataGridColumnList = view.columnLists[i] as 
IDataGridColumnList;
-                               var 
addItemBead:AddListItemRendererForArrayListData = new 
AddListItemRendererForArrayListData();
-                               list.addBead(addItemBead);
-                               addItemBead.setUp();
-            }
-               }
-
-               /**
-                *  finish setup
-                *
-                *  @langversion 3.0
-                *  @playerversion Flash 10.2
-                *  @playerversion AIR 2.6
-                *  @productversion Royale 0.9.7
-                */
-               protected function initComplete(event:Event):void
-               {
-                       
IEventDispatcher(_strand).removeEventListener("initComplete", initComplete);
-
-                       _dataProviderModel = 
_strand.getBeadByType(ISelectionModel) as ISelectionModel;
-                       
dataProviderModel.addEventListener("dataProviderChanged", 
dataProviderChangeHandler);
-
-                       // invoke now in case "dataProviderChanged" has already 
been dispatched.
-                       dataProviderChangeHandler(null);
-               }
-
-               private var dp:IEventDispatcher;
-               /**
-                * @private
-                */
-               protected function dataProviderChangeHandler(event:Event):void
-               {
-                       if(dp)
-                       {
-                               
dp.removeEventListener(CollectionEvent.ITEM_ADDED, handleItemAdded);
-                       }
-                       dp = dataProviderModel.dataProvider as IEventDispatcher;
-                       if (!dp)
-                               return;
-
-                       // listen for individual items being added in the 
future.
-                       dp.addEventListener(CollectionEvent.ITEM_ADDED, 
handleItemAdded);
-               }
-
-               /**
-                *  Handles the itemAdded event by adding the item.
-                *  Since the addition is done for each column list we need to 
adjust index
-                *  at the end of all column additions
-                *
-                *  @langversion 3.0
-                *  @playerversion Flash 10.2
-                *  @playerversion AIR 2.6
-                *  @productversion Royale 0.9.7
-                *  @royaleignorecoercion 
org.apache.royale.core.ISelectableItemRenderer
-                *  @royaleignorecoercion 
org.apache.royale.events.IEventDispatcher
-         *  @royaleignorecoercion org.apache.royale.core.ISelectionModel
-                */
-               protected function handleItemAdded(event:CollectionEvent):void
-               {
-                       //adjust the model's selectedIndex, if applicable
-                       if (event.index <= 
ISelectionModel(_dataProviderModel).selectedIndex) {
-                               
ISelectionModel(_dataProviderModel).selectedIndex = 
ISelectionModel(_dataProviderModel).selectedIndex + 1;
-                       }
-
-                       // (_strand as IEventDispatcher).dispatchEvent(new 
Event("layoutNeeded"));
-               }
-
-               private var _dataProviderModel: IDataProviderModel;
-
-               /**
-                *  The org.apache.royale.core.IDataProviderModel that contains 
the
-                *  data source.
-                *
-                *  @langversion 3.0
-                *  @playerversion Flash 10.2
-                *  @playerversion AIR 2.6
-                *  @productversion Royale 0.9.7
-                *  @royaleignorecoercion 
org.apache.royale.core.IDataProviderModel
-                */
-               public function get dataProviderModel(): IDataProviderModel
-               {
-                       if (_dataProviderModel == null) {
-                               _dataProviderModel = 
_strand.getBeadByType(IDataProviderModel) as IDataProviderModel;
-                       }
-                       return _dataProviderModel;
-               }
-       }
-}
diff --git 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/AddListItemRendererForArrayListData.as
 
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/AddListItemRendererForArrayListData.as
deleted file mode 100644
index d345458..0000000
--- 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/AddListItemRendererForArrayListData.as
+++ /dev/null
@@ -1,261 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  Licensed to the Apache Software Foundation (ASF) under one or more
-//  contributor license agreements.  See the NOTICE file distributed with
-//  this work for additional information regarding copyright ownership.
-//  The ASF licenses this file to You under the Apache License, Version 2.0
-//  (the "License"); you may not use this file except in compliance with
-//  the License.  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.jewel.beads.itemRenderers
-{
-       import org.apache.royale.core.IBead;
-       import org.apache.royale.core.IDataProviderModel;
-       import org.apache.royale.core.IItemRendererClassFactory;
-       import org.apache.royale.core.IItemRendererOwnerView;
-       import org.apache.royale.core.IIndexedItemRenderer;
-    import org.apache.royale.core.ILabelFieldItemRenderer;
-       import org.apache.royale.core.ISelectionModel;
-       import org.apache.royale.core.IStrand;
-       import org.apache.royale.core.IStrandWithModelView;
-       import org.apache.royale.core.UIBase;
-       import org.apache.royale.events.CollectionEvent;
-       import org.apache.royale.events.Event;
-       import org.apache.royale.events.IEventDispatcher;
-       import org.apache.royale.html.beads.IListView;
-       import 
org.apache.royale.jewel.supportClasses.datagrid.IDataGridColumnList;
-       import 
org.apache.royale.jewel.supportClasses.list.IListPresentationModel;
-       import org.apache.royale.utils.loadBeadFromValuesManager;
-
-    /**
-        *  Handles the adding of an itemRenderer in a List component once the 
corresponding datum has been added
-        *  from the IDataProviderModel.
-        *
-        *  @langversion 3.0
-        *  @playerversion Flash 10.2
-        *  @playerversion AIR 2.6
-        *  @productversion Royale 0.9.4
-        */
-       public class AddListItemRendererForArrayListData implements IBead
-       {
-               /**
-                * Constructor
-                *
-                *  @langversion 3.0
-                *  @playerversion Flash 10.2
-                *  @playerversion AIR 2.6
-                *  @productversion Royale 0.9.4
-                */
-               public function AddListItemRendererForArrayListData()
-               {
-               }
-
-        protected var labelField:String;
-               
-               protected var _strand:IStrand;
-               /**
-                * @copy org.apache.royale.core.IStrand
-                *
-                *  @langversion 3.0
-                *  @playerversion Flash 10.2
-                *  @playerversion AIR 2.6
-                *  @productversion Royale 0.9.4
-                */
-               public function set strand(value:IStrand):void
-               {
-                       _strand = value;
-                       
IEventDispatcher(value).addEventListener("initComplete", initComplete);
-               }
-
-               /**
-                *  finish setup
-                *
-                *  @langversion 3.0
-                *  @playerversion Flash 10.2
-                *  @playerversion AIR 2.6
-                *  @productversion Royale 0.9.4
-                */
-               protected function initComplete(event:Event):void
-               {
-                       setUp();
-               }
-
-               /**
-                * This method is called when List is composed to conform a 
DataGrid
-                * In that case DataGrid uses 
AddDataGridItemRendererForArrayListData,
-                * that add this bead to the each column List and calls this 
method at
-                * initialization time.
-                */
-               public function setUp():void
-               {
-                       
IEventDispatcher(_strand).removeEventListener("initComplete", initComplete);
-
-                       _dataProviderModel = 
_strand.getBeadByType(ISelectionModel) as ISelectionModel;
-                       labelField = _dataProviderModel.labelField;
-
-                       
dataProviderModel.addEventListener("dataProviderChanged", 
dataProviderChangeHandler);
-
-                       // invoke now in case "dataProviderChanged" has already 
been dispatched.
-                       dataProviderChangeHandler(null);
-               }
-
-               private var dp:IEventDispatcher;
-               /**
-                * @private
-                */
-               protected function dataProviderChangeHandler(event:Event):void
-               {
-                       if(dp)
-                       {
-                               
dp.removeEventListener(CollectionEvent.ITEM_ADDED, handleItemAdded);
-                       }
-                       dp = dataProviderModel.dataProvider as IEventDispatcher;
-                       if (!dp)
-                               return;
-
-                       // listen for individual items being added in the 
future.
-                       dp.addEventListener(CollectionEvent.ITEM_ADDED, 
handleItemAdded);
-               }
-
-               /**
-                *  Handles the itemAdded event by adding the item.
-                *
-                *  @langversion 3.0
-                *  @playerversion Flash 10.2
-                *  @playerversion AIR 2.6
-                *  @productversion Royale 0.9.4
-                *  @royaleignorecoercion 
org.apache.royale.core.IIndexedItemRenderer
-                *  @royaleignorecoercion 
org.apache.royale.events.IEventDispatcher
-         *  @royaleignorecoercion org.apache.royale.core.ISelectionModel
-                */
-               protected function handleItemAdded(event:CollectionEvent):void
-               {
-            var presentationModel:IListPresentationModel = 
_strand.getBeadByType(IListPresentationModel) as IListPresentationModel;
-            var ir:IIndexedItemRenderer = 
itemRendererFactory.createItemRenderer() as IIndexedItemRenderer;
-
-            fillRenderer(event.index, event.item, ir, presentationModel);
-
-                       // update the index values in the itemRenderers to 
correspond to their shifted positions.
-                       var n:int = itemRendererOwnerView.numItemRenderers;
-                       for (var i:int = event.index; i < n; i++)
-                       {
-                               ir = itemRendererOwnerView.getItemRendererAt(i) 
as IIndexedItemRenderer;
-                               ir.index = i;
-                       }
-
-                       if(!(_strand is IDataGridColumnList)) // only run this 
code on normal list (not not DataGrid column Lists)
-                       {
-                               //adjust the model's selectedIndex, if 
applicable
-                               if (event.index <= 
ISelectionModel(_dataProviderModel).selectedIndex) {
-                                       
ISelectionModel(_dataProviderModel).selectedIndex = 
ISelectionModel(_dataProviderModel).selectedIndex + 1;
-                               }
-
-                               (_strand as IEventDispatcher).dispatchEvent(new 
Event("layoutNeeded"));
-                       }
-               }
-
-               private var _dataProviderModel: IDataProviderModel;
-
-               /**
-                *  The org.apache.royale.core.IDataProviderModel that contains 
the
-                *  data source.
-                *
-                *  @langversion 3.0
-                *  @playerversion Flash 10.2
-                *  @playerversion AIR 2.6
-                *  @productversion Royale 0.9.4
-                */
-               public function get dataProviderModel(): IDataProviderModel
-               {
-                       if (_dataProviderModel == null) {
-                               _dataProviderModel = 
_strand.getBeadByType(IDataProviderModel) as IDataProviderModel;
-                       }
-                       return _dataProviderModel;
-               }
-
-               private var _itemRendererOwnerView: IItemRendererOwnerView;
-
-               /**
-                *  The org.apache.royale.core.IItemRendererOwnerView used
-                *  to generate instances of item renderers.
-                *
-                *  @langversion 3.0
-                *  @playerversion Flash 10.2
-                *  @playerversion AIR 2.6
-                *  @productversion Royale 0.9.4
-                */
-               public function get 
itemRendererOwnerView():IItemRendererOwnerView
-               {
-                       if (_itemRendererOwnerView == null) {
-                               var view:IListView = (_strand as 
IStrandWithModelView).view as IListView;
-                               _itemRendererOwnerView = view.dataGroup;
-                       }
-                       return _itemRendererOwnerView;
-               }
-
-        private var _itemRendererFactory:IItemRendererClassFactory;
-
-        /**
-         *  The org.apache.royale.core.IItemRendererClassFactory used
-         *  to generate instances of item renderers.
-         *
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion Royale 0.9.4
-         */
-        public function get itemRendererFactory():IItemRendererClassFactory
-        {
-            if(!_itemRendererFactory)
-                _itemRendererFactory = 
loadBeadFromValuesManager(IItemRendererClassFactory, 
"iItemRendererClassFactory", _strand) as IItemRendererClassFactory;
-
-            return _itemRendererFactory;
-        }
-
-        /**
-         * @private
-                *  @royaleignorecoercion 
org.apache.royale.core.ILabelFieldItemRenderer
-         */
-        protected function fillRenderer(index:int,
-                                        item:Object,
-                                        itemRenderer:IIndexedItemRenderer,
-                                        
presentationModel:IListPresentationModel):void
-        {
-            itemRendererOwnerView.addItemRendererAt(itemRenderer, index);
-
-            (itemRenderer as ILabelFieldItemRenderer).labelField = labelField;
-
-            if (presentationModel) {
-                // var style:SimpleCSSStyles = new SimpleCSSStyles();
-                // style.marginBottom = presentationModel.separatorThickness;
-                // UIBase(itemRenderer).style = style;
-                UIBase(itemRenderer).height = presentationModel.rowHeight;
-                //UIBase(itemRenderer).percentWidth = 100;
-                               if(itemRenderer is IAlignItemRenderer)
-                               {
-                                       (itemRenderer as 
IAlignItemRenderer).align = presentationModel.align;
-                               }
-            }
-
-            setData(itemRenderer, item, index);
-        }
-
-        /**
-         * @private
-         */
-        protected function setData(itemRenderer:IIndexedItemRenderer, 
data:Object, index:int):void
-        {
-            itemRenderer.index = index;
-            itemRenderer.data = data;
-        }
-       }
-}
diff --git 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/RemoveDataGridItemRendererForArrayListData.as
 
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/RemoveDataGridItemRendererForArrayListData.as
deleted file mode 100644
index d0a4a38..0000000
--- 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/RemoveDataGridItemRendererForArrayListData.as
+++ /dev/null
@@ -1,166 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  Licensed to the Apache Software Foundation (ASF) under one or more
-//  contributor license agreements.  See the NOTICE file distributed with
-//  this work for additional information regarding copyright ownership.
-//  The ASF licenses this file to You under the Apache License, Version 2.0
-//  (the "License"); you may not use this file except in compliance with
-//  the License.  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.jewel.beads.itemRenderers
-{
-       import org.apache.royale.core.IBead;
-       import org.apache.royale.core.IDataProviderModel;
-       import org.apache.royale.core.ISelectionModel;
-       import org.apache.royale.core.IStrand;
-       import org.apache.royale.core.UIBase;
-       import org.apache.royale.events.CollectionEvent;
-       import org.apache.royale.events.Event;
-       import org.apache.royale.events.IEventDispatcher;
-       import org.apache.royale.jewel.beads.views.DataGridView;
-       import 
org.apache.royale.jewel.supportClasses.datagrid.IDataGridColumnList;
-
-    /**
-        *  Handles the removal of an itemRenderer in a DataGrid component once 
the corresponding datum has been added
-        *  from the IDataProviderModel.
-        *
-        *  @langversion 3.0
-        *  @playerversion Flash 10.2
-        *  @playerversion AIR 2.6
-        *  @productversion Royale 0.9.7
-        */
-       public class RemoveDataGridItemRendererForArrayListData implements IBead
-       {
-               /**
-                * Constructor
-                *
-                *  @langversion 3.0
-                *  @playerversion Flash 10.2
-                *  @playerversion AIR 2.6
-                *  @productversion Royale 0.9.7
-                */
-               public function RemoveDataGridItemRendererForArrayListData()
-               {
-               }
-               
-               private var view:DataGridView;
-
-               protected var _strand:IStrand;
-               /**
-                * @copy org.apache.royale.core.IStrand
-                *
-                *  @langversion 3.0
-                *  @playerversion Flash 10.2
-                *  @playerversion AIR 2.6
-                *  @productversion Royale 0.9.7
-                */
-               public function set strand(value:IStrand):void
-               {
-                       _strand = value;
-                       
IEventDispatcher(value).addEventListener("initComplete", initComplete);
-                       
-                       view = UIBase(_strand).view as DataGridView;
-            for (var i:int=0; i < view.columnLists.length; i++)
-            {
-                var list:IDataGridColumnList = view.columnLists[i] as 
IDataGridColumnList;
-                               var 
removeItemBead:RemoveListItemRendererForArrayListData = new 
RemoveListItemRendererForArrayListData();
-                               list.addBead(removeItemBead);
-                               removeItemBead.setUp();
-            }
-               }
-
-               /**
-                *  finish setup
-                *
-                *  @langversion 3.0
-                *  @playerversion Flash 10.2
-                *  @playerversion AIR 2.6
-                *  @productversion Royale 0.9.7
-                */
-               protected function initComplete(event:Event):void
-               {
-                       
IEventDispatcher(_strand).removeEventListener("initComplete", initComplete);
-
-                       _dataProviderModel = 
_strand.getBeadByType(ISelectionModel) as ISelectionModel;
-                       
dataProviderModel.addEventListener("dataProviderChanged", 
dataProviderChangeHandler);
-
-                       // invoke now in case "dataProviderChanged" has already 
been dispatched.
-                       dataProviderChangeHandler(null);
-               }
-
-               private var dp:IEventDispatcher;
-               /**
-                * @private
-                */
-               protected function dataProviderChangeHandler(event:Event):void
-               {
-                       if(dp)
-                       {
-                               
dp.removeEventListener(CollectionEvent.ITEM_REMOVED, handleItemRemoved);
-                       }
-                       dp = dataProviderModel.dataProvider as IEventDispatcher;
-                       if (!dp)
-                               return;
-
-                       // listen for individual items being removed in the 
future.
-                       // dp.addEventListener(CollectionEvent.ITEM_REMOVED, 
handleItemRemoved);
-               }
-
-               /**
-                *  Handles the itemRemoved event by removing the item.
-                *  Since the removal is done for each column list we need to 
adjust index
-                *  at the end of all column removals
-                *
-                *  @langversion 3.0
-                *  @playerversion Flash 10.2
-                *  @playerversion AIR 2.6
-                *  @productversion Royale 0.9.7
-                *  @royaleignorecoercion 
org.apache.royale.core.ISelectableItemRenderer
-                *  @royaleignorecoercion 
org.apache.royale.events.IEventDispatcher
-                *  @royaleignorecoercion org.apache.royale.core.ISelectionModel
-                */
-               protected function handleItemRemoved(event:CollectionEvent):void
-               {
-                       //adjust the model's selectedIndex, if applicable
-                       if (event.index < 
ISelectionModel(_dataProviderModel).selectedIndex)
-                       {
-                               
ISelectionModel(_dataProviderModel).selectedIndex = 
ISelectionModel(_dataProviderModel).selectedIndex - 1;
-                       } 
-                       else if (event.index == 
ISelectionModel(_dataProviderModel).selectedIndex)
-                       {
-                               
ISelectionModel(_dataProviderModel).selectedIndex = -1;
-                       }
-
-                       (_strand as IEventDispatcher).dispatchEvent(new 
Event("layoutNeeded"));
-               }
-
-               private var _dataProviderModel: IDataProviderModel;
-
-               /**
-                *  The org.apache.royale.core.IDataProviderModel that contains 
the
-                *  data source.
-                *
-                *  @langversion 3.0
-                *  @playerversion Flash 10.2
-                *  @playerversion AIR 2.6
-                *  @productversion Royale 0.9.7
-                *  @royaleignorecoercion 
org.apache.royale.core.IDataProviderModel
-                */
-               public function get dataProviderModel(): IDataProviderModel
-               {
-                       if (_dataProviderModel == null) {
-                               _dataProviderModel = 
_strand.getBeadByType(IDataProviderModel) as IDataProviderModel;
-                       }
-                       return _dataProviderModel;
-               }
-       }
-}
diff --git 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/RemoveListItemRendererForArrayListData.as
 
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/RemoveListItemRendererForArrayListData.as
deleted file mode 100644
index c13b141..0000000
--- 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/RemoveListItemRendererForArrayListData.as
+++ /dev/null
@@ -1,201 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  Licensed to the Apache Software Foundation (ASF) under one or more
-//  contributor license agreements.  See the NOTICE file distributed with
-//  this work for additional information regarding copyright ownership.
-//  The ASF licenses this file to You under the Apache License, Version 2.0
-//  (the "License"); you may not use this file except in compliance with
-//  the License.  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.jewel.beads.itemRenderers
-{
-       import org.apache.royale.core.IBead;
-       import org.apache.royale.core.IDataProviderModel;
-       import org.apache.royale.core.IItemRendererOwnerView;
-       import org.apache.royale.core.IIndexedItemRenderer;
-       import org.apache.royale.core.ISelectionModel;
-       import org.apache.royale.core.IStrand;
-       import org.apache.royale.core.IStrandWithModelView;
-       import org.apache.royale.events.CollectionEvent;
-       import org.apache.royale.events.Event;
-       import org.apache.royale.events.IEventDispatcher;
-       import org.apache.royale.html.beads.IListView;
-       import 
org.apache.royale.jewel.supportClasses.datagrid.IDataGridColumnList;
-
-       /**
-        *  Handles the removal of an itemRenderer in a List component once the 
corresponding
-        *  datum has been removed from the IDataProviderModel.
-        *
-        *  @langversion 3.0
-        *  @playerversion Flash 10.2
-        *  @playerversion AIR 2.6
-        *  @productversion Royale 0.9.4
-        */
-       public class RemoveListItemRendererForArrayListData implements IBead
-       {
-               /**
-                *  Constructor
-                *
-                *  @langversion 3.0
-                *  @playerversion Flash 10.2
-                *  @playerversion AIR 2.6
-                *  @productversion Royale 0.9.4
-                */
-               public function RemoveListItemRendererForArrayListData()
-               {
-               }
-
-               private var _strand:IStrand;
-               /**
-                *  @copy org.apache.royale.core.IStrand
-                *
-                *  @langversion 3.0
-                *  @playerversion Flash 10.2
-                *  @playerversion AIR 2.6
-                *  @productversion Royale 0.9.4
-                */
-               public function set strand(value:IStrand):void
-               {
-                       _strand = value;
-                       
IEventDispatcher(value).addEventListener("initComplete", initComplete);
-               }
-
-               /**
-                *  finish setup
-                *
-                *  @langversion 3.0
-                *  @playerversion Flash 10.2
-                *  @playerversion AIR 2.6
-                *  @productversion Royale 0.9.4
-                */
-               protected function initComplete(event:Event):void
-               {
-                       setUp();
-               }
-               
-               /**
-                * This method is called when List is composed to conform a 
DataGrid
-                * In that case DataGrid uses 
RemoveDataGridItemRendererForArrayListData,
-                * that add this bead to the each column List and calls this 
method at
-                * initialization time.
-                */
-               public function setUp():void
-               {
-                       
IEventDispatcher(_strand).removeEventListener("initComplete", initComplete);
-
-                       _dataProviderModel = 
_strand.getBeadByType(ISelectionModel) as ISelectionModel;
-                       
dataProviderModel.addEventListener("dataProviderChanged", 
dataProviderChangeHandler);
-
-                       // invoke now in case "dataProviderChanged" has already 
been dispatched.
-                       dataProviderChangeHandler(null);
-               }
-
-               private var dp:IEventDispatcher;
-               /**
-                * @private
-                */
-               protected function dataProviderChangeHandler(event:Event):void
-               {
-                       if(dp)
-                       {
-                               
dp.removeEventListener(CollectionEvent.ITEM_REMOVED, handleItemRemoved);
-                       }
-                       dp = dataProviderModel.dataProvider as IEventDispatcher;
-                       if (!dp)
-                               return;
-
-                       // listen for individual items being removed in the 
future.
-                       dp.addEventListener(CollectionEvent.ITEM_REMOVED, 
handleItemRemoved);
-               }
-
-               /**
-                *  Handles the itemRemoved event by removing the item.
-                *
-                *  @langversion 3.0
-                *  @playerversion Flash 10.2
-                *  @playerversion AIR 2.6
-                *  @productversion Royale 0.9.4
-                *  @royaleignorecoercion 
org.apache.royale.core.IIndexedItemRenderer
-                *  @royaleignorecoercion 
org.apache.royale.events.IEventDispatcher
-                *  @royaleignorecoercion org.apache.royale.core.ISelectionModel
-                */
-               protected function handleItemRemoved(event:CollectionEvent):void
-               {
-                       var ir:IIndexedItemRenderer = 
itemRendererOwnerView.getItemRendererAt(event.index) as IIndexedItemRenderer;
-                       itemRendererOwnerView.removeItemRenderer(ir);
-
-                       // adjust the itemRenderers' index to adjust for the 
shift
-                       var n:int = itemRendererOwnerView.numItemRenderers;
-                       for (var i:int = event.index; i < n; i++)
-                       {
-                               ir = itemRendererOwnerView.getItemRendererAt(i) 
as IIndexedItemRenderer;
-                               ir.index = i;
-                       }
-
-                       if(!(_strand is IDataGridColumnList)) // only run this 
code on normal list (not not DataGrid column Lists)
-                       {
-                               //adjust the model's selectedIndex, if 
applicable
-                               if (event.index < 
ISelectionModel(_dataProviderModel).selectedIndex)
-                               {
-                                       
ISelectionModel(_dataProviderModel).selectedIndex = 
ISelectionModel(_dataProviderModel).selectedIndex - 1;
-                               } 
-                               else if (event.index == 
ISelectionModel(_dataProviderModel).selectedIndex)
-                               {
-                                       
ISelectionModel(_dataProviderModel).selectedIndex = -1;
-                               }
-                       
-                               (_strand as IEventDispatcher).dispatchEvent(new 
Event("layoutNeeded"));
-                       }
-               }
-
-               private var _dataProviderModel: IDataProviderModel;
-
-               /**
-                *  The org.apache.royale.core.IDataProviderModel that contains 
the
-                *  data source.
-                *
-                *  @langversion 3.0
-                *  @playerversion Flash 10.2
-                *  @playerversion AIR 2.6
-                *  @productversion Royale 0.9.4
-                *  @royaleignorecoercion 
org.apache.royale.core.IDataProviderModel
-                */
-               public function get dataProviderModel(): IDataProviderModel
-               {
-                       if (_dataProviderModel == null) {
-                               _dataProviderModel = 
_strand.getBeadByType(IDataProviderModel) as IDataProviderModel;
-                       }
-                       return _dataProviderModel;
-               }
-
-               private var _itemRendererOwnerView: IItemRendererOwnerView;
-
-               /**
-                *  The org.apache.royale.core.IItemRendererOwnerView used
-                *  to generate instances of item renderers.
-                *
-                *  @langversion 3.0
-                *  @playerversion Flash 10.2
-                *  @playerversion AIR 2.6
-                *  @productversion Royale 0.9.4
-                *  @royaleignorecoercion 
org.apache.royale.core.IStrandWithModelView
-                */
-               public function get 
itemRendererOwnerView():IItemRendererOwnerView
-               {
-                       if (_itemRendererOwnerView == null) {
-                               var view:IListView = (_strand as 
IStrandWithModelView).view as IListView;
-                               _itemRendererOwnerView = view.dataGroup;
-                       }
-                       return _itemRendererOwnerView;
-               }
-       }
-}
diff --git 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/UpdateDataGridItemRendererForArrayListData.as
 
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/UpdateDataGridItemRendererForArrayListData.as
deleted file mode 100644
index 9f6f697..0000000
--- 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/UpdateDataGridItemRendererForArrayListData.as
+++ /dev/null
@@ -1,73 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  Licensed to the Apache Software Foundation (ASF) under one or more
-//  contributor license agreements.  See the NOTICE file distributed with
-//  this work for additional information regarding copyright ownership.
-//  The ASF licenses this file to You under the Apache License, Version 2.0
-//  (the "License"); you may not use this file except in compliance with
-//  the License.  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.jewel.beads.itemRenderers
-{
-       import org.apache.royale.core.IBead;
-       import org.apache.royale.core.IStrand;
-       import org.apache.royale.core.UIBase;
-       import org.apache.royale.jewel.beads.views.DataGridView;
-       import 
org.apache.royale.jewel.supportClasses.datagrid.IDataGridColumnList;
-
-    /**
-        *  Handles the update of an itemRenderer in a DataGrid component.
-        *
-        *  @langversion 3.0
-        *  @playerversion Flash 10.2
-        *  @playerversion AIR 2.6
-        *  @productversion Royale 0.9.7
-        */
-       public class UpdateDataGridItemRendererForArrayListData implements IBead
-       {
-               /**
-                * Constructor
-                *
-                *  @langversion 3.0
-                *  @playerversion Flash 10.2
-                *  @playerversion AIR 2.6
-                *  @productversion Royale 0.9.7
-                */
-               public function UpdateDataGridItemRendererForArrayListData()
-               {
-               }
-               
-               private var view:DataGridView;
-
-               protected var _strand:IStrand;
-               /**
-                * @copy org.apache.royale.core.IStrand
-                *
-                *  @langversion 3.0
-                *  @playerversion Flash 10.2
-                *  @playerversion AIR 2.6
-                *  @productversion Royale 0.9.7
-                */
-               public function set strand(value:IStrand):void
-               {
-                       _strand = value;
-                       view = UIBase(_strand).view as DataGridView;
-            for (var i:int=0; i < view.columnLists.length; i++)
-            {
-                var list:IDataGridColumnList = view.columnLists[i] as 
IDataGridColumnList;
-                               var 
updateItemBead:UpdateListItemRendererForArrayListData = new 
UpdateListItemRendererForArrayListData();
-                               list.addBead(updateItemBead);
-                               updateItemBead.setUp();
-            }
-               }
-       }
-}
diff --git 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/UpdateListItemRendererForArrayListData.as
 
b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/UpdateListItemRendererForArrayListData.as
deleted file mode 100644
index 20864b4..0000000
--- 
a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/UpdateListItemRendererForArrayListData.as
+++ /dev/null
@@ -1,205 +0,0 @@
-////////////////////////////////////////////////////////////////////////////////
-//
-//  Licensed to the Apache Software Foundation (ASF) under one or more
-//  contributor license agreements.  See the NOTICE file distributed with
-//  this work for additional information regarding copyright ownership.
-//  The ASF licenses this file to You under the Apache License, Version 2.0
-//  (the "License"); you may not use this file except in compliance with
-//  the License.  You may obtain a copy of the License at
-//
-//      http://www.apache.org/licenses/LICENSE-2.0
-//
-//  Unless required by applicable law or agreed to in writing, software
-//  distributed under the License is distributed on an "AS IS" BASIS,
-//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  See the License for the specific language governing permissions and
-//  limitations under the License.
-//
-////////////////////////////////////////////////////////////////////////////////
-package org.apache.royale.jewel.beads.itemRenderers
-{
-       import org.apache.royale.core.IBead;
-       import org.apache.royale.core.IDataProviderModel;
-       import org.apache.royale.core.IItemRendererOwnerView;
-       import org.apache.royale.core.IIndexedItemRenderer;
-       import org.apache.royale.core.ISelectionModel;
-       import org.apache.royale.core.IStrand;
-       import org.apache.royale.core.IStrandWithModelView;
-       import org.apache.royale.events.CollectionEvent;
-       import org.apache.royale.events.Event;
-       import org.apache.royale.events.IEventDispatcher;
-       import org.apache.royale.html.beads.IListView;
-
-    /**
-        *  Handles the update of an itemRenderer in a List component.
-        *
-        *  @langversion 3.0
-        *  @playerversion Flash 10.2
-        *  @playerversion AIR 2.6
-        *  @productversion Royale 0.9.4
-        */
-       public class UpdateListItemRendererForArrayListData implements IBead
-       {
-               /**
-                *  Constructor
-                *
-                *  @langversion 3.0
-                *  @playerversion Flash 10.2
-                *  @playerversion AIR 2.6
-                *  @productversion Royale 0.9.4
-                */
-               public function UpdateListItemRendererForArrayListData()
-               {
-               }
-
-        protected var labelField:String;
-
-               protected var _strand:IStrand;
-               /**
-                *  @copy org.apache.royale.core.IStrand
-                *
-                *  @langversion 3.0
-                *  @playerversion Flash 10.2
-                *  @playerversion AIR 2.6
-                *  @productversion Royale 0.9.4
-                *  @royaleignorecoercion 
org.apache.royale.events.IEventDispatcher
-                */
-               public function set strand(value:IStrand):void
-               {
-                       _strand = value;
-                       
IEventDispatcher(value).addEventListener("initComplete", initComplete);
-               }
-
-               /**
-                *  finish setup
-                *
-                *  @langversion 3.0
-                *  @playerversion Flash 10.2
-                *  @playerversion AIR 2.6
-                *  @productversion Royale 0.9.4
-                *  @royaleignorecoercion 
org.apache.royale.events.IEventDispatcher
-                */
-               protected function initComplete(event:Event):void
-               {
-                       setUp();
-               }
-
-               /**
-                * This method is called when List is composed to conform a 
DataGrid
-                * In that case DataGrid uses 
UpdateDataGridItemRendererForArrayListData,
-                * that add this bead to the each column List and calls this 
method at
-                * initialization time.
-                */
-               public function setUp():void
-               {
-                       
IEventDispatcher(_strand).removeEventListener("initComplete", initComplete);
-                       
-                       _dataProviderModel = 
_strand.getBeadByType(ISelectionModel) as ISelectionModel;
-                       labelField = _dataProviderModel.labelField;
-
-                       
dataProviderModel.addEventListener("dataProviderChanged", 
dataProviderChangeHandler);
-
-                       // invoke now in case "dataProviderChanged" has already 
been dispatched.
-                       dataProviderChangeHandler(null);
-               }
-
-               private var dp:IEventDispatcher;
-               /**
-                * @private
-                * @royaleignorecoercion 
org.apache.royale.events.IEventDispatcher
-                */
-               protected function dataProviderChangeHandler(event:Event):void
-               {
-                       if(dp)
-                       {
-                               
dp.removeEventListener(CollectionEvent.ITEM_UPDATED, handleItemUpdated);
-                       }
-                       dp = dataProviderModel.dataProvider as IEventDispatcher;
-                       if (!dp)
-                               return;
-
-                       // listen for individual items being updated in the 
future.
-                       dp.addEventListener(CollectionEvent.ITEM_UPDATED, 
handleItemUpdated);
-               }
-
-               /**
-                *  Handles the itemUpdated event by updating the item.
-                *
-                *  @langversion 3.0
-                *  @playerversion Flash 10.2
-                *  @playerversion AIR 2.6
-                *  @productversion Royale 0.9.4
-                *  @royaleignorecoercion 
org.apache.royale.events.IEventDispatcher
-         *  @royaleignorecoercion org.apache.royale.core.ISelectionModel
-                */
-               protected function handleItemUpdated(event:CollectionEvent):void
-               {
-            var ir:IIndexedItemRenderer = 
itemRendererOwnerView.getItemRendererAt(event.index) as IIndexedItemRenderer;
-
-            setData(ir, event.item, event.index);
-
-            if (event.index == 
ISelectionModel(_dataProviderModel).selectedIndex) {
-                               //manually trigger a selection change, even if 
there was actually none.
-                               //This causes selection-based bindings to work
-                IEventDispatcher(_dataProviderModel).dispatchEvent(new 
Event('selectionChanged'));
-            }
-
-                       (_strand as IEventDispatcher).dispatchEvent(new 
Event("layoutNeeded"));
-               }
-
-               private var _dataProviderModel:IDataProviderModel;
-
-               /**
-                *  The org.apache.royale.core.IDataProviderModel that contains 
the
-                *  data source.
-                *
-                *  @langversion 3.0
-                *  @playerversion Flash 10.2
-                *  @playerversion AIR 2.6
-                *  @productversion Royale 0.9.4
-                */
-               public function get dataProviderModel():IDataProviderModel
-               {
-                       if (_dataProviderModel == null) {
-                               _dataProviderModel = 
_strand.getBeadByType(IDataProviderModel) as IDataProviderModel;
-                       }
-                       return _dataProviderModel;
-               }
-
-               private var _itemRendererOwnerView: IItemRendererOwnerView;
-
-               /**
-                *  The org.apache.royale.core.IItemRendererOwnerView used
-                *  to generate instances of item renderers.
-                *
-                *  @langversion 3.0
-                *  @playerversion Flash 10.2
-                *  @playerversion AIR 2.6
-                *  @productversion Royale 0.9.4
-                *  @royaleignorecoercion org.apache.royale.core.IUIBase
-                */
-               public function get 
itemRendererOwnerView():IItemRendererOwnerView
-               {
-                       if (_itemRendererOwnerView == null) {
-                               var view:IListView = (_strand as 
IStrandWithModelView).view as IListView;
-                               _itemRendererOwnerView = view.dataGroup;
-                       }
-                       return _itemRendererOwnerView;
-               }
-
-        /**
-         * @private
-         */
-        protected function setData(itemRenderer:IIndexedItemRenderer, 
data:Object, index:int):void
-        {
-            itemRenderer.index = index;
-                       var forceDataChangeEvent:Boolean = (itemRenderer.data 
== data);
-                       
-                       itemRenderer.data = data;
-                       
-                       if (forceDataChangeEvent) {
-                               itemRenderer.dispatchEvent(new 
Event('dataChange'));
-                       }
-        }
-       }
-}

Reply via email to