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 b3452ed preparing to fix remove and update in table component b3452ed is described below commit b3452edcb476ab538f72de3da34770d5b4ac35fa Author: Carlos Rovira <carlosrov...@apache.org> AuthorDate: Tue Aug 28 20:44:56 2018 +0200 preparing to fix remove and update in table component --- .../JewelExample/src/main/royale/ListPlayGround.mxml | 2 ++ .../JewelExample/src/main/royale/TablePlayGround.mxml | 13 ++++++++----- .../Jewel/src/main/resources/jewel-manifest.xml | 6 +++++- .../AddTableItemRendererForArrayListData.as | 10 +++++----- .../RemoveAllItemRendererForArrayListData.as | 10 +++++----- .../RemoveListItemRendererForArrayListData.as | 12 ++++++------ ...a.as => RemoveTableItemRendererForArrayListData.as} | 18 +++++++++--------- .../UpdateListItemRendererForArrayListData.as | 14 +++++++------- ...a.as => UpdateTableItemRendererForArrayListData.as} | 14 +++++++------- 9 files changed, 54 insertions(+), 45 deletions(-) diff --git a/examples/royale/JewelExample/src/main/royale/ListPlayGround.mxml b/examples/royale/JewelExample/src/main/royale/ListPlayGround.mxml index a55f912..eea0870 100644 --- a/examples/royale/JewelExample/src/main/royale/ListPlayGround.mxml +++ b/examples/royale/JewelExample/src/main/royale/ListPlayGround.mxml @@ -72,6 +72,7 @@ limitations under the License. public function removeItemAt():void { (iconList.dataProvider as ArrayList).removeItemAt(0); + // listModel.iconListData.removeItemAt(0); } public function updateFirstItem():void @@ -80,6 +81,7 @@ limitations under the License. item.label = "What??"; item.icon = MaterialIconType.ACCESSIBILITY; (iconList.dataProvider as ArrayList).itemUpdated(item); + // listModel.iconListData.itemUpdated(item); } public function removeAllData():void diff --git a/examples/royale/JewelExample/src/main/royale/TablePlayGround.mxml b/examples/royale/JewelExample/src/main/royale/TablePlayGround.mxml index 2a57edd..05b9d9e 100644 --- a/examples/royale/JewelExample/src/main/royale/TablePlayGround.mxml +++ b/examples/royale/JewelExample/src/main/royale/TablePlayGround.mxml @@ -192,8 +192,8 @@ limitations under the License. <j:TableColumn dataField="year" label="Release Year" align="right" columnLabelAlign="right"/> <j:beads> <j:AddTableItemRendererForArrayListData/> - <!-- <j:RemoveTableItemRendererForArrayListData/> - <j:UpdateTableItemRendererForArrayListData/> --> + <j:RemoveTableItemRendererForArrayListData/> + <j:UpdateTableItemRendererForArrayListData/> <j:RemoveAllItemRendererForArrayListData/> </j:beads> </j:Table> @@ -240,14 +240,17 @@ limitations under the License. public function removeItemAt():void { - tablesModel.guitarrists.removeItemAt(0); + (table.dataProvider as ArrayList).removeAll(); + // tablesModel.guitarrists.removeItemAt(0); } public function updateFirstItem():void { - var item:Object = tablesModel.guitarrists.getItemAt(0); + var item:Object = (table.dataProvider as ArrayList).getItemAt(0); item.guitarrist = "Mango"; - tablesModel.guitarrists.itemUpdated(item); + item.year = 2001; + (table.dataProvider as ArrayList).itemUpdated(item); + // tablesModel.guitarrists.itemUpdated(item); } public function removeAllData():void diff --git a/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml b/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml index 4b61bce..b3b1090 100644 --- a/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml +++ b/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml @@ -126,9 +126,13 @@ <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="RemoveAllItemRendererForArrayListData" class="org.apache.royale.jewel.beads.itemRenderers.RemoveAllItemRendererForArrayListData" /> <component id="AddTableItemRendererForArrayListData" class="org.apache.royale.jewel.beads.itemRenderers.AddTableItemRendererForArrayListData" /> + <component id="RemoveTableItemRendererForArrayListData" class="org.apache.royale.jewel.beads.itemRenderers.RemoveTableItemRendererForArrayListData" /> + <component id="UpdateTableItemRendererForArrayListData" class="org.apache.royale.jewel.beads.itemRenderers.UpdateTableItemRendererForArrayListData" /> + + <component id="RemoveAllItemRendererForArrayListData" class="org.apache.royale.jewel.beads.itemRenderers.RemoveAllItemRendererForArrayListData" /> + <!-- <component id="JewelLabelViewBead" class="org.apache.royale.jewel.beads.views.JewelLabelViewBead"/> --> </componentPackage> diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/AddTableItemRendererForArrayListData.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/AddTableItemRendererForArrayListData.as index 35edbb8..1b489c5 100644 --- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/AddTableItemRendererForArrayListData.as +++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/AddTableItemRendererForArrayListData.as @@ -41,8 +41,8 @@ package org.apache.royale.jewel.beads.itemRenderers import org.apache.royale.collections.ICollectionView; /** - * Handles the adding of an itemRenderer in a Table component once the corresponding datum has been added - * from the IDataProviderModel. + * Handles the adding of an itemRenderer in a Table component once the corresponding datum has been added + * from the IDataProviderModel. * * @langversion 3.0 * @playerversion Flash 10.2 @@ -52,7 +52,7 @@ package org.apache.royale.jewel.beads.itemRenderers public class AddTableItemRendererForArrayListData implements IBead { /** - * Constructor + * Constructor * * @langversion 3.0 * @playerversion Flash 10.2 @@ -68,7 +68,7 @@ package org.apache.royale.jewel.beads.itemRenderers protected var labelField:String; /** - * @copy org.apache.royale.core.IStrand + * @copy org.apache.royale.core.IStrand * * @langversion 3.0 * @playerversion Flash 10.2 @@ -121,7 +121,7 @@ package org.apache.royale.jewel.beads.itemRenderers } /** - * Handles the itemRemoved event by removing the item. + * Handles the itemRemoved event by removing the item. * * @langversion 3.0 * @playerversion Flash 10.2 diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/RemoveAllItemRendererForArrayListData.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/RemoveAllItemRendererForArrayListData.as index 3a852f8..8128dee 100644 --- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/RemoveAllItemRendererForArrayListData.as +++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/RemoveAllItemRendererForArrayListData.as @@ -29,8 +29,8 @@ package org.apache.royale.jewel.beads.itemRenderers import org.apache.royale.events.IEventDispatcher; /** - * Handles the removal of all itemRenderers once the all items has been removed - * from the IDataProviderModel. This works the same for List and Table components + * Handles the removal of all itemRenderers once the all items has been removed + * from the IDataProviderModel. This works the same for List and Table components * * @langversion 3.0 * @playerversion Flash 10.2 @@ -40,7 +40,7 @@ package org.apache.royale.jewel.beads.itemRenderers public class RemoveAllItemRendererForArrayListData implements IBead { /** - * Constructor + * Constructor * * @langversion 3.0 * @playerversion Flash 10.2 @@ -54,7 +54,7 @@ package org.apache.royale.jewel.beads.itemRenderers private var _strand:IStrand; /** - * @copy org.apache.royale.core.IStrand + * @copy org.apache.royale.core.IStrand * * @langversion 3.0 * @playerversion Flash 10.2 @@ -105,7 +105,7 @@ package org.apache.royale.jewel.beads.itemRenderers } /** - * Handles the itemRemoved event by removing the item. + * Handles the itemRemoved event by removing the item. * * @langversion 3.0 * @playerversion Flash 10.2 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 index 21146db..9c280d7 100644 --- 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 @@ -31,8 +31,8 @@ package org.apache.royale.jewel.beads.itemRenderers import org.apache.royale.events.IEventDispatcher; /** - * Handles the removal of an itemRenderer once the corresponding datum has been removed - * from the IDataProviderModel. + * 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 @@ -42,7 +42,7 @@ package org.apache.royale.jewel.beads.itemRenderers public class RemoveListItemRendererForArrayListData implements IBead { /** - * Constructor + * Constructor * * @langversion 3.0 * @playerversion Flash 10.2 @@ -56,7 +56,7 @@ package org.apache.royale.jewel.beads.itemRenderers private var _strand:IStrand; /** - * @copy org.apache.royale.core.IStrand + * @copy org.apache.royale.core.IStrand * * @langversion 3.0 * @playerversion Flash 10.2 @@ -97,12 +97,12 @@ package org.apache.royale.jewel.beads.itemRenderers if (!dp) return; - // listen for individual items being added in the future. + // listen for individual items being removed in the future. dp.addEventListener(CollectionEvent.ITEM_REMOVED, handleItemRemoved); } /** - * Handles the itemRemoved event by removing the item. + * Handles the itemRemoved event by removing the item. * * @langversion 3.0 * @playerversion Flash 10.2 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/RemoveTableItemRendererForArrayListData.as similarity index 90% copy from frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/RemoveListItemRendererForArrayListData.as copy to frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/RemoveTableItemRendererForArrayListData.as index 21146db..837d1df 100644 --- 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/RemoveTableItemRendererForArrayListData.as @@ -31,32 +31,32 @@ package org.apache.royale.jewel.beads.itemRenderers import org.apache.royale.events.IEventDispatcher; /** - * Handles the removal of an itemRenderer once the corresponding datum has been removed - * from the IDataProviderModel. + * Handles the removal of an itemRenderer in a Table 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.3 */ - public class RemoveListItemRendererForArrayListData implements IBead + public class RemoveTableItemRendererForArrayListData implements IBead { /** - * Constructor + * Constructor * * @langversion 3.0 * @playerversion Flash 10.2 * @playerversion AIR 2.6 * @productversion Royale 0.9.3 */ - public function RemoveListItemRendererForArrayListData() + public function RemoveTableItemRendererForArrayListData() { } private var _strand:IStrand; /** - * @copy org.apache.royale.core.IStrand + * @copy org.apache.royale.core.IStrand * * @langversion 3.0 * @playerversion Flash 10.2 @@ -89,7 +89,7 @@ package org.apache.royale.jewel.beads.itemRenderers } /** - * @private + * @private */ protected function dataProviderChangeHandler(event:Event):void { @@ -97,12 +97,12 @@ package org.apache.royale.jewel.beads.itemRenderers if (!dp) return; - // listen for individual items being added in the future. + // listen for individual items being removed in the future. dp.addEventListener(CollectionEvent.ITEM_REMOVED, handleItemRemoved); } /** - * Handles the itemRemoved event by removing the item. + * Handles the itemRemoved event by removing the item. * * @langversion 3.0 * @playerversion Flash 10.2 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 index cf7fda2..53a7f0b 100644 --- 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 @@ -30,8 +30,8 @@ package org.apache.royale.jewel.beads.itemRenderers import org.apache.royale.events.IEventDispatcher; /** - * Handles the update of an itemRenderer once the corresponding datum has been updated - * from the IDataProviderModel. + * Handles the update of an itemRenderer in a List component once the corresponding + * datum has been updated from the IDataProviderModel. * * @langversion 3.0 * @playerversion Flash 10.2 @@ -41,7 +41,7 @@ package org.apache.royale.jewel.beads.itemRenderers public class UpdateListItemRendererForArrayListData implements IBead { /** - * Constructor + * Constructor * * @langversion 3.0 * @playerversion Flash 10.2 @@ -57,7 +57,7 @@ package org.apache.royale.jewel.beads.itemRenderers protected var labelField:String; /** - * @copy org.apache.royale.core.IStrand + * @copy org.apache.royale.core.IStrand * * @langversion 3.0 * @playerversion Flash 10.2 @@ -92,7 +92,7 @@ package org.apache.royale.jewel.beads.itemRenderers } /** - * @private + * @private */ protected function dataProviderChangeHandler(event:Event):void { @@ -100,12 +100,12 @@ package org.apache.royale.jewel.beads.itemRenderers if (!dp) return; - // listen for individual items being added in the future. + // listen for individual items being updated in the future. dp.addEventListener(CollectionEvent.ITEM_UPDATED, handleItemUpdated); } /** - * Handles the itemUpdated event by updating the item. + * Handles the itemUpdated event by updating the item. * * @langversion 3.0 * @playerversion Flash 10.2 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/UpdateTableItemRendererForArrayListData.as similarity index 92% copy from frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/UpdateListItemRendererForArrayListData.as copy to frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/UpdateTableItemRendererForArrayListData.as index cf7fda2..c6eb3ee 100644 --- 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/UpdateTableItemRendererForArrayListData.as @@ -30,25 +30,25 @@ package org.apache.royale.jewel.beads.itemRenderers import org.apache.royale.events.IEventDispatcher; /** - * Handles the update of an itemRenderer once the corresponding datum has been updated - * from the IDataProviderModel. + * Handles the update of an itemRenderer in a Table component once the corresponding + * datum has been updated from the IDataProviderModel. * * @langversion 3.0 * @playerversion Flash 10.2 * @playerversion AIR 2.6 * @productversion Royale 0.9.3 */ - public class UpdateListItemRendererForArrayListData implements IBead + public class UpdateTableItemRendererForArrayListData implements IBead { /** - * Constructor + * Constructor * * @langversion 3.0 * @playerversion Flash 10.2 * @playerversion AIR 2.6 * @productversion Royale 0.9.3 */ - public function UpdateListItemRendererForArrayListData() + public function UpdateTableItemRendererForArrayListData() { } @@ -57,7 +57,7 @@ package org.apache.royale.jewel.beads.itemRenderers protected var labelField:String; /** - * @copy org.apache.royale.core.IStrand + * @copy org.apache.royale.core.IStrand * * @langversion 3.0 * @playerversion Flash 10.2 @@ -105,7 +105,7 @@ package org.apache.royale.jewel.beads.itemRenderers } /** - * Handles the itemUpdated event by updating the item. + * Handles the itemUpdated event by updating the item. * * @langversion 3.0 * @playerversion Flash 10.2