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 7288a5c remove model beads that are no longer needed 7288a5c is described below commit 7288a5c378b3ee1541ffd9d9528bdbfedbccc1e6 Author: Carlos Rovira <carlosrov...@apache.org> AuthorDate: Tue Aug 7 13:19:25 2018 +0200 remove model beads that are no longer needed --- .../projects/Jewel/src/main/resources/defaults.css | 4 +- .../projects/Jewel/src/main/royale/JewelClasses.as | 2 - .../beads/models/SingleSelectionArrayListModel.as | 91 -------- .../models/SingleSelectionCollectionViewModel.as | 248 --------------------- .../Jewel/src/main/sass/components/_list.sass | 4 +- 5 files changed, 4 insertions(+), 345 deletions(-) diff --git a/frameworks/projects/Jewel/src/main/resources/defaults.css b/frameworks/projects/Jewel/src/main/resources/defaults.css index 1ee8388..a3120ed 100644 --- a/frameworks/projects/Jewel/src/main/resources/defaults.css +++ b/frameworks/projects/Jewel/src/main/resources/defaults.css @@ -2601,7 +2601,7 @@ j|List { IItemRenderer: ClassReference("org.apache.royale.jewel.itemRenderers.ListItemRenderer"); IViewport: ClassReference("org.apache.royale.jewel.supportClasses.scrollbar.ScrollingViewport"); IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel"); - IBeadModel: ClassReference("org.apache.royale.jewel.beads.models.SingleSelectionArrayListModel"); + IBeadModel: ClassReference("org.apache.royale.jewel.beads.models.ArrayListSelectionModel"); IDataProviderItemRendererMapper: ClassReference("org.apache.royale.jewel.beads.itemRenderers.DataItemRendererFactoryForCollectionView"); } @@ -2613,7 +2613,7 @@ j|Navigation { IItemRenderer: ClassReference("org.apache.royale.jewel.itemRenderers.NavigationLinkItemRenderer"); IViewport: ClassReference("org.apache.royale.jewel.supportClasses.scrollbar.ScrollingViewport"); IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel"); - IBeadModel: ClassReference("org.apache.royale.jewel.beads.models.SingleSelectionArrayListModel"); + IBeadModel: ClassReference("org.apache.royale.jewel.beads.models.ArrayListSelectionModel"); IDataProviderItemRendererMapper: ClassReference("org.apache.royale.jewel.beads.itemRenderers.DataItemRendererFactoryForCollectionView"); } diff --git a/frameworks/projects/Jewel/src/main/royale/JewelClasses.as b/frameworks/projects/Jewel/src/main/royale/JewelClasses.as index 63cf467..6d5bc64 100644 --- a/frameworks/projects/Jewel/src/main/royale/JewelClasses.as +++ b/frameworks/projects/Jewel/src/main/royale/JewelClasses.as @@ -52,8 +52,6 @@ package import org.apache.royale.jewel.supportClasses.datechooser.DateChooserTable; DateChooserTable; import org.apache.royale.jewel.beads.views.TableView; TableView; - import org.apache.royale.jewel.beads.models.SingleSelectionCollectionViewModel; SingleSelectionCollectionViewModel; - import org.apache.royale.jewel.beads.models.SingleSelectionArrayListModel; SingleSelectionArrayListModel; import org.apache.royale.jewel.supportClasses.scrollbar.ScrollingViewport; ScrollingViewport; COMPILE::SWF diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/SingleSelectionArrayListModel.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/SingleSelectionArrayListModel.as deleted file mode 100644 index 9089200..0000000 --- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/SingleSelectionArrayListModel.as +++ /dev/null @@ -1,91 +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.models -{ - import org.apache.royale.collections.ICollectionView; - import org.apache.royale.collections.ArrayList; - import org.apache.royale.events.Event; - - /** - * The SingleSelectionCollectionViewModel class is a selection model for - * a dataProvider that is an ICollectionView. It assumes that items - * can be fetched from the dataProvider using dataProvider.getItemAt(index). - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion Royale 0.9.3 - */ - public class SingleSelectionArrayListModel extends SingleSelectionCollectionViewModel - { - /** - * Constructor. - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion Royale 0.9 - */ - public function SingleSelectionArrayListModel() - { - - } - - private var _dataProvider:ICollectionView; - - [Bindable("dataProviderChanged")] - /** - * @copy org.apache.royale.core.ISelectionModel#dataProvider - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion Royale 0.9 - */ - override public function get dataProvider():Object - { - return _dataProvider; - } - - /** - * @private - * @royaleignorecoercion org.apache.royale.collections.ICollectionView - */ - override public function set dataProvider(value:Object):void - { - if (value == _dataProvider) return; - - if (value is Array) - _dataProvider = new ArrayList(value as Array); - else - _dataProvider = value as ICollectionView; - - if(!_dataProvider || _selectedIndex >= _dataProvider.length) - _selectedIndex = -1; - - _selectedItem = _selectedIndex == -1 ? null : _dataProvider.getItemAt(_selectedIndex); - - dispatchEvent(new Event("dataProviderChanged")); - } - - private var _selectedIndex:int = -1; - private var _selectedItem:Object; - - } -} diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/SingleSelectionCollectionViewModel.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/SingleSelectionCollectionViewModel.as deleted file mode 100644 index fa73080..0000000 --- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/models/SingleSelectionCollectionViewModel.as +++ /dev/null @@ -1,248 +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.models -{ - import org.apache.royale.collections.ICollectionView; - import org.apache.royale.core.IRollOverModel; - import org.apache.royale.core.ISelectionModel; - import org.apache.royale.core.IStrand; - import org.apache.royale.events.Event; - import org.apache.royale.events.EventDispatcher; - - /** - * The SingleSelectionCollectionViewModel class is a selection model for - * a dataProvider that is an ICollectionView. It assumes that items - * can be fetched from the dataProvider using dataProvider.getItemAt(index). - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion Royale 0.9 - */ - public class SingleSelectionCollectionViewModel extends EventDispatcher implements ISelectionModel, IRollOverModel - { - /** - * Constructor. - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion Royale 0.9 - */ - public function SingleSelectionCollectionViewModel() - { - } - - private var _strand:IStrand; - - /** - * @copy org.apache.royale.core.IBead#strand - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion Royale 0.9 - */ - public function set strand(value:IStrand):void - { - _strand = value; - } - - private var _dataProvider:ICollectionView; - - [Bindable("dataProviderChanged")] - /** - * @copy org.apache.royale.core.ISelectionModel#dataProvider - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion Royale 0.9 - */ - public function get dataProvider():Object - { - return _dataProvider; - } - - /** - * @private - * @royaleignorecoercion org.apache.royale.collections.ICollectionView - */ - public function set dataProvider(value:Object):void - { - if (value == _dataProvider) return; - - _dataProvider = value as ICollectionView; - if(!_dataProvider || _selectedIndex >= _dataProvider.length) - _selectedIndex = -1; - - _selectedItem = _selectedIndex == -1 ? null : _dataProvider.getItemAt(_selectedIndex); - - dispatchEvent(new Event("dataProviderChanged")); - } - - private var _selectedIndex:int = -1; - private var _rollOverIndex:int = -1; - private var _labelField:String = null; - - /** - * @copy org.apache.royale.core.ISelectionModel#labelField - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion Royale 0.9 - */ - public function get labelField():String - { - return _labelField; - } - - /** - * @private - */ - public function set labelField(value:String):void - { - if (value != _labelField) { - _labelField = value; - dispatchEvent(new Event("labelFieldChanged")); - } - } - - /** - * @copy org.apache.royale.core.ISelectionModel#selectedIndex - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion Royale 0.9 - */ - public function get selectedIndex():int - { - return _selectedIndex; - } - - /** - * @private - */ - public function set selectedIndex(value:int):void - { - if (value == _selectedIndex) return; - - _selectedIndex = value; - _selectedItem = (value == -1 || _dataProvider == null) ? null : (value < _dataProvider.length) ? _dataProvider.getItemAt(value) : null; - dispatchEvent(new Event("selectedIndexChanged")); - } - - /** - * @copy org.apache.royale.core.IRollOverModel#rollOverIndex - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion Royale 0.9 - */ - public function get rollOverIndex():int - { - return _rollOverIndex; - } - - /** - * @private - */ - public function set rollOverIndex(value:int):void - { - if (value != _rollOverIndex) { - _rollOverIndex = value; - dispatchEvent(new Event("rollOverIndexChanged")); - } - } - - private var _selectedItem:Object; - - /** - * @copy org.apache.royale.core.ISelectionModel#selectedItem - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion Royale 0.9 - */ - public function get selectedItem():Object - { - return _selectedItem; - } - - /** - * @private - */ - public function set selectedItem(value:Object):void - { - if (value == _selectedItem) return; - - _selectedItem = value; - var n:int = _dataProvider.length; - for (var i:int = 0; i < n; i++) - { - if (_dataProvider.getItemAt(i) == value) - { - _selectedIndex = i; - break; - } - } - dispatchEvent(new Event("selectedItemChanged")); - dispatchEvent(new Event("selectedIndexChanged")); - } - - private var _selectedString:String; - - /** - * An alternative to selectedItem for strongly typing the - * the selectedItem if the Array is an Array of Strings. - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion Royale 0.9 - */ - public function get selectedString():String - { - return String(_selectedItem); - } - - /** - * @private - */ - public function set selectedString(value:String):void - { - _selectedString = value; - var n:int = _dataProvider.length; - for (var i:int = 0; i < n; i++) - { - if (String(_dataProvider.getItemAt(i)) == value) - { - _selectedIndex = i; - break; - } - } - dispatchEvent(new Event("selectedItemChanged")); - dispatchEvent(new Event("selectedIndexChanged")); - } - } -} diff --git a/frameworks/projects/Jewel/src/main/sass/components/_list.sass b/frameworks/projects/Jewel/src/main/sass/components/_list.sass index 7885d1a..12ce3f7 100644 --- a/frameworks/projects/Jewel/src/main/sass/components/_list.sass +++ b/frameworks/projects/Jewel/src/main/sass/components/_list.sass @@ -32,7 +32,7 @@ j|List IItemRenderer: ClassReference("org.apache.royale.jewel.itemRenderers.ListItemRenderer") IViewport: ClassReference("org.apache.royale.jewel.supportClasses.scrollbar.ScrollingViewport") IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel") - IBeadModel: ClassReference("org.apache.royale.jewel.beads.models.SingleSelectionArrayListModel") + IBeadModel: ClassReference("org.apache.royale.jewel.beads.models.ArrayListSelectionModel") IDataProviderItemRendererMapper: ClassReference("org.apache.royale.jewel.beads.itemRenderers.DataItemRendererFactoryForCollectionView") //IBeadModel: ClassReference("org.apache.royale.html.beads.models.ArraySelectionModel") //IDataProviderItemRendererMapper: ClassReference("org.apache.royale.html.beads.DataItemRendererFactoryForArrayData") @@ -46,7 +46,7 @@ j|Navigation IItemRenderer: ClassReference("org.apache.royale.jewel.itemRenderers.NavigationLinkItemRenderer") IViewport: ClassReference("org.apache.royale.jewel.supportClasses.scrollbar.ScrollingViewport") IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel") - IBeadModel: ClassReference("org.apache.royale.jewel.beads.models.SingleSelectionArrayListModel") + IBeadModel: ClassReference("org.apache.royale.jewel.beads.models.ArrayListSelectionModel") IDataProviderItemRendererMapper: ClassReference("org.apache.royale.jewel.beads.itemRenderers.DataItemRendererFactoryForCollectionView") // IDataProviderItemRendererMapper: ClassReference("org.apache.royale.html.beads.DataItemRendererFactoryForArrayData")