You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ca...@apache.org on 2020/07/28 15:20:12 UTC
[royale-asjs] branch develop updated: jewel-table: remove
deprecated classes
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 64349a3 jewel-table: remove deprecated classes
64349a3 is described below
commit 64349a3a1f25189b8be21d85097ef4610a9b2c74
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Tue Jul 28 17:19:59 2020 +0200
jewel-table: remove deprecated classes
---
.../Jewel/src/main/resources/jewel-manifest.xml | 10 +-
.../itemRenderers/AddTableRowForArrayListData.as | 241 ---------------------
.../RemoveTableRowForArrayListData.as | 171 ---------------
.../UpdateTableRowForArrayListData.as | 179 ---------------
4 files changed, 2 insertions(+), 599 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml b/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
index 133d756..4cdf43f 100644
--- a/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
+++ b/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
@@ -245,14 +245,8 @@
<component id="NoClassSelectorListSelectableItemRendererBead" class="org.apache.royale.jewel.beads.itemRenderers.NoClassSelectorListSelectableItemRendererBead"/>
<component id="NoHoverClassSelectorListSelectableItemRendererBead" class="org.apache.royale.jewel.beads.itemRenderers.NoHoverClassSelectorListSelectableItemRendererBead"/>
- <component id="RemoveAllDataGridItemRendererForArrayListData" class="org.apache.royale.jewel.beads.itemRenderers.RemoveAllDataGridItemRendererForArrayListData" />
-
- <!-- deprecated -->
- <component id="AddTableRowForArrayListData" class="org.apache.royale.jewel.beads.itemRenderers.AddTableRowForArrayListData" />
- <component id="RemoveTableRowForArrayListData" class="org.apache.royale.jewel.beads.itemRenderers.RemoveTableRowForArrayListData" />
- <component id="UpdateTableRowForArrayListData" class="org.apache.royale.jewel.beads.itemRenderers.UpdateTableRowForArrayListData" />
-
- <component id="RemoveAllItemRendererForArrayListData" class="org.apache.royale.jewel.beads.itemRenderers.RemoveAllItemRendererForArrayListData" />
+ <component id="RemoveAllDataGridItemRendererForArrayListData" class="org.apache.royale.jewel.beads.itemRenderers.RemoveAllDataGridItemRendererForArrayListData"/>
+ <component id="RemoveAllItemRendererForArrayListData" class="org.apache.royale.jewel.beads.itemRenderers.RemoveAllItemRendererForArrayListData"/>
<!-- <component id="JewelLabelViewBead" class="org.apache.royale.jewel.beads.views.JewelLabelViewBead"/> -->
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/AddTableRowForArrayListData.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/AddTableRowForArrayListData.as
deleted file mode 100644
index dc995b0..0000000
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/AddTableRowForArrayListData.as
+++ /dev/null
@@ -1,241 +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.IItemRendererClassFactory;
- import org.apache.royale.core.IItemRendererOwnerView;
- 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.beads.models.TableModel;
- import org.apache.royale.jewel.itemRenderers.TableItemRenderer;
- import org.apache.royale.jewel.supportClasses.list.IListPresentationModel;
- import org.apache.royale.jewel.supportClasses.table.TableColumn;
- import org.apache.royale.utils.loadBeadFromValuesManager;
-
- /**
- * 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
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- [Deprecated(message="Use CRUDTableItemRendererFactoryForCollectionView instead AddTableRowForArrayListData")]
- public class AddTableRowForArrayListData implements IBead
- {
- /**
- * Constructor
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- public function AddTableRowForArrayListData()
- {
- }
-
- 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);
- }
-
- protected var labelField:String;
-
- protected var model:TableModel;
-
- /**
- * finish setup
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- protected function initComplete(event:Event):void
- {
- IEventDispatcher(_strand).removeEventListener("initComplete", initComplete);
-
- model = _strand.getBeadByType(ISelectionModel) as TableModel;
- labelField = model.labelField;
-
- model.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 = model.dataProvider as IEventDispatcher;
- if (!dp)
- return;
-
- // listen for individual items being added in the future.
- dp.addEventListener(CollectionEvent.ITEM_ADDED, handleItemAdded);
- }
-
- /**
- * Handles the itemRemoved event by removing the item.
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- protected function handleItemAdded(event:CollectionEvent):void
- {
- var presentationModel:IListPresentationModel = _strand.getBeadByType(IListPresentationModel) as IListPresentationModel;
- var column:TableColumn;
- var ir:TableItemRenderer;
-
- var index:int = event.index * model.columns.length;
- for(var j:int = 0; j < model.columns.length; j++)
- {
- column = model.columns[j] as TableColumn;
-
- if(column.itemRenderer != null)
- {
- ir = column.itemRenderer.newInstance() as TableItemRenderer;
- } else
- {
- ir = itemRendererFactory.createItemRenderer() as TableItemRenderer;
- }
-
- labelField = column.dataField;
-
- ir.dataField = labelField;
- ir.rowIndex = event.index;
- ir.columnIndex = j;
-
- fillRenderer(index++, event.item, ir, presentationModel);
-
- if(column.align != "")
- {
- ir.align = column.align;
- }
- }
-
- // update the index values in the itemRenderers to correspond to their shifted positions.
- // adjust the itemRenderers' index to adjust for the shift
- var len:int = itemRendererOwnerView.numItemRenderers;
- for (var i:int = event.index; i < len; i++)
- {
- ir = itemRendererOwnerView.getItemRendererAt(i) as TableItemRenderer;
- ir.index = i;
- ir.rowIndex = i;
- }
-
- (_strand as IEventDispatcher).dispatchEvent(new Event("layoutNeeded"));
- }
-
- 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
- */
- protected function fillRenderer(index:int,
- item:Object,
- itemRenderer:TableItemRenderer,
- presentationModel:IListPresentationModel):void
- {
- itemRendererOwnerView.addItemRendererAt(itemRenderer, index);
-
- itemRenderer.labelField = labelField;
-
- if (presentationModel) {
- UIBase(itemRenderer).height = presentationModel.rowHeight;
- }
-
- setData(itemRenderer, item, index);
- }
-
- /**
- * @private
- */
- protected function setData(itemRenderer:TableItemRenderer, 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/RemoveTableRowForArrayListData.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/RemoveTableRowForArrayListData.as
deleted file mode 100644
index 934adbd..0000000
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/RemoveTableRowForArrayListData.as
+++ /dev/null
@@ -1,171 +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.IItemRendererOwnerView;
- 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.html.beads.IListView;
- import org.apache.royale.html.supportClasses.StyledDataItemRenderer;
- import org.apache.royale.jewel.beads.models.TableModel;
- import org.apache.royale.jewel.supportClasses.table.TableCell;
- import org.apache.royale.jewel.supportClasses.table.TableRow;
-
- /**
- * 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.4
- */
- [Deprecated(message="Use CRUDTableItemRendererFactoryForCollectionView instead RemoveTableRowForArrayListData")]
- public class RemoveTableRowForArrayListData implements IBead
- {
- /**
- * Constructor
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- public function RemoveTableRowForArrayListData()
- {
- }
-
- 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);
- }
-
- protected var labelField:String;
-
- protected var model:TableModel;
-
- /**
- * finish setup
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- protected function initComplete(event:Event):void
- {
- IEventDispatcher(_strand).removeEventListener("initComplete", initComplete);
-
- model = _strand.getBeadByType(ISelectionModel) as TableModel;
- labelField = model.labelField;
-
- model.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 = model.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
- */
- protected function handleItemRemoved(event:CollectionEvent):void
- {
- var ir:StyledDataItemRenderer;
- var cell:TableCell;
- var processedRow:TableRow = (itemRendererOwnerView as UIBase).getElementAt(event.index) as TableRow;
- while (processedRow.numElements > 0) {
- cell = processedRow.getElementAt(0) as TableCell;
- ir = cell.getElementAt(0) as StyledDataItemRenderer;
- itemRendererOwnerView.removeItemRenderer(ir);
- cell.removeElement(ir);
- processedRow.removeElement(cell);
- }
- (itemRendererOwnerView as UIBase).removeElement(processedRow);
-
- // adjust the itemRenderers' index to adjust for the shift
- var len:int = itemRendererOwnerView.numItemRenderers;
- for (var i:int = event.index; i < len; i++)
- {
- ir = itemRendererOwnerView.getItemRendererAt(i) as StyledDataItemRenderer;
- ir.index = i;
- ir.rowIndex = i;
- }
-
- (_strand as IEventDispatcher).dispatchEvent(new Event("layoutNeeded"));
- }
-
- 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 listView:IListView = _strand.getBeadByType(IListView) as IListView;
- _itemRendererOwnerView = listView.dataGroup;
- }
- return _itemRendererOwnerView;
- }
- }
-}
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/UpdateTableRowForArrayListData.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/UpdateTableRowForArrayListData.as
deleted file mode 100644
index eb89136..0000000
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/UpdateTableRowForArrayListData.as
+++ /dev/null
@@ -1,179 +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.IIndexedItemRenderer;
- import org.apache.royale.core.IItemRendererOwnerView;
- 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.html.beads.IListView;
- import org.apache.royale.jewel.beads.models.TableModel;
- import org.apache.royale.jewel.supportClasses.table.TableCell;
- import org.apache.royale.jewel.supportClasses.table.TableRow;
-
- /**
- * 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.4
- */
- [Deprecated(message="Use CRUDTableItemRendererFactoryForCollectionView instead UpdateTableRowForArrayListData")]
- public class UpdateTableRowForArrayListData implements IBead
- {
- /**
- * Constructor
- *
- * @langversion 3.0
- * @playerversion Flash 10.2
- * @playerversion AIR 2.6
- * @productversion Royale 0.9.4
- */
- public function UpdateTableRowForArrayListData()
- {
- }
-
- 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);
- }
-
- protected var labelField:String;
-
- protected var model:TableModel;
-
- /**
- * 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
- {
- IEventDispatcher(_strand).removeEventListener("initComplete", initComplete);
-
- model = _strand.getBeadByType(ISelectionModel) as TableModel;
- labelField = model.labelField;
-
- model.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 = model.dataProvider as IEventDispatcher;
- if (!dp)
- return;
-
- // listen for individual items being added 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.jewel.supportClasses.table.TableCell
- * @royaleignorecoercion org.apache.royale.jewel.supportClasses.table.TableRow
- * @royaleignorecoercion org.apache.royale.core.ISelectableItemRenderer
- * @royaleignorecoercion org.apache.royale.events.IEventDispatcher
- */
- protected function handleItemUpdated(event:CollectionEvent):void
- {
- var ir:IIndexedItemRenderer;
- var processedRow:TableRow = (itemRendererOwnerView as UIBase).getElementAt(event.index) as TableRow;
- var cell:TableCell;
- var n:int = processedRow.numElements;
-
- for (var i:int = 0; i < n; i++)
- {
- cell = processedRow.getElementAt(i) as TableCell;
- ir = cell.getElementAt(0) as IIndexedItemRenderer;
- setData(ir, event.item, event.index);
- }
-
- (_strand as IEventDispatcher).dispatchEvent(new Event("layoutNeeded"));
- }
-
- 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.html.beads.IListView
- */
- public function get itemRendererOwnerView():IItemRendererOwnerView
- {
- if (_itemRendererOwnerView == null) {
- var listView:IListView = _strand.getBeadByType(IListView) as IListView;
- _itemRendererOwnerView = listView.dataGroup;
- }
- return _itemRendererOwnerView;
- }
-
- /**
- * @private
- */
- protected function setData(itemRenderer:IIndexedItemRenderer, data:Object, index:int):void
- {
- itemRenderer.index = index;
- itemRenderer.data = data;
- }
- }
-}