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/08/10 14:00:16 UTC

[royale-asjs] branch develop updated: jewel: remove unused beads

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 06db5e8  jewel: remove unused beads
06db5e8 is described below

commit 06db5e851e7e4756b87d7563af4a185ff817ac6f
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Mon Aug 10 16:00:01 2020 +0200

    jewel: remove unused beads
---
 .../Jewel/src/main/resources/jewel-manifest.xml    |   1 -
 .../beads/itemRenderers/DataFieldProviderBead.as   |  87 ---------
 .../DataItemRendererFactoryForArrayData.as         | 207 ---------------------
 .../Jewel/src/main/sass/components/_list.sass      |   3 -
 4 files changed, 298 deletions(-)

diff --git a/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml b/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
index fbf1f16..8cb029b 100644
--- a/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
+++ b/frameworks/projects/Jewel/src/main/resources/jewel-manifest.xml
@@ -238,7 +238,6 @@
     <component id="ScrollingViewport" class="org.apache.royale.jewel.supportClasses.scrollbar.ScrollingViewport"/>
     <component id="NoViewport" class="org.apache.royale.jewel.supportClasses.NoViewport"/>
 
-    <component id="DataItemRendererFactoryForArrayData" class="org.apache.royale.jewel.beads.itemRenderers.DataItemRendererFactoryForArrayData"/>
     <component id="VirtualDataItemRendererFactoryForCollectionView" class="org.apache.royale.jewel.beads.itemRenderers.VirtualDataItemRendererFactoryForCollectionView"/>
     <component id="DropDownListItemRendererFactoryForCollectionView" class="org.apache.royale.jewel.beads.itemRenderers.DropDownListItemRendererFactoryForCollectionView"/>
     <component id="TableItemRendererFactoryForCollectionView" class="org.apache.royale.jewel.beads.itemRenderers.TableItemRendererFactoryForCollectionView"/>
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DataFieldProviderBead.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DataFieldProviderBead.as
deleted file mode 100644
index f8abbb2..0000000
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DataFieldProviderBead.as
+++ /dev/null
@@ -1,87 +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;
-
-    /**
-     *  The DataFieldProviderBead class is a model that holds dataField used mostly
-	 *  in item renderers for retrieve some value from dataProvider items.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion Royale 0.9.4
-     */
-	public class DataFieldProviderBead implements IBead
-	{
-        /**
-         *  Constructor.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion Royale 0.9.4
-         */
-		public function DataFieldProviderBead()
-		{
-		}
-
-		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.4
-         */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-		}
-
-		private var _dataField:String = null;
-		
-        /**
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion Royale 0.9.4
-         */
-		public function get dataField():String
-		{
-			return _dataField;
-		}
-
-        /**
-         *  @private
-         */
-		public function set dataField(value:String):void
-		{
-			if (value != _dataField)
-			{
-                _dataField = value;
-			}
-		}
-	}
-}
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DataItemRendererFactoryForArrayData.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DataItemRendererFactoryForArrayData.as
deleted file mode 100644
index 05a4fde..0000000
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/itemRenderers/DataItemRendererFactoryForArrayData.as
+++ /dev/null
@@ -1,207 +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.IDataProviderItemRendererMapper;
-	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.IStrand;
-	import org.apache.royale.core.UIBase;
-	import org.apache.royale.events.Event;
-	import org.apache.royale.events.EventDispatcher;
-	import org.apache.royale.events.IEventDispatcher;
-	import org.apache.royale.events.ItemRendererEvent;
-	import org.apache.royale.html.beads.IListView;
-	import org.apache.royale.html.supportClasses.StyledDataItemRenderer;
-    import org.apache.royale.core.IOwnerViewItemRenderer;
-	import org.apache.royale.jewel.beads.itemRenderers.DataFieldProviderBead;
-	import org.apache.royale.jewel.supportClasses.list.IListPresentationModel;
-	import org.apache.royale.utils.loadBeadFromValuesManager;
-
-    [Event(name="itemRendererCreated",type="org.apache.royale.events.ItemRendererEvent")]
-	
-    /**
-     *  The DataItemRendererFactoryForArrayData class reads an
-     *  array of data and creates an item renderer for every
-     *  item in the array.  Other implementations of
-     *  IDataProviderItemRendererMapper map different data
-     *  structures or manage a virtual set of renderers.
-     *
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion Royale 0.9.4
-     */
-	public class DataItemRendererFactoryForArrayData extends EventDispatcher implements IBead, IDataProviderItemRendererMapper
-	{
-        /**
-         *  Constructor.
-         *
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion Royale 0.9.4
-         */
-		public function DataItemRendererFactoryForArrayData(target:Object=null)
-		{
-			super(target);
-		}
-
-		protected var dataProviderModel:IDataProviderModel;
-		protected var dataFieldProvider:DataFieldProviderBead;
-		
-		protected var labelField:String;
-        protected var dataField:String;
-
-		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.4
-		 *  @royaleignorecoercion org.apache.royale.events.IEventDispatcher
-         */
-		public function set strand(value:IStrand):void
-		{
-			_strand = value;
-			IEventDispatcher(value).addEventListener("initComplete",finishSetup);
-		}
-		
-		/**
-		 * @private
-		 * @royaleignorecoercion org.apache.royale.core.IDataProviderModel
-		 * @royaleignorecoercion org.apache.royale.core.IItemRendererClassFactory
-		 * @royaleignorecoercion org.apache.royale.html.beads.DataFieldProviderBead
-		 */
-		private function finishSetup(event:Event):void
-		{
-			dataProviderModel = _strand.getBeadByType(IDataProviderModel) as IDataProviderModel;
-			dataProviderModel.addEventListener("dataProviderChanged", dataProviderChangeHandler);
-			labelField = dataProviderModel.labelField;
-
-            dataFieldProvider = _strand.getBeadByType(DataFieldProviderBead) as DataFieldProviderBead;
-			if (dataFieldProvider)
-            {
-                dataField = dataFieldProvider.dataField;
-            }
-
-			// if the host component inherits from DataContainerBase, the itemRendererClassFactory will
-			// already have been loaded by DataContainerBase.addedToParent function.
-			if(!_itemRendererFactory)
-    			_itemRendererFactory = loadBeadFromValuesManager(IItemRendererClassFactory, "iItemRendererClassFactory", _strand) as IItemRendererClassFactory;
-			
-			dataProviderChangeHandler(null);
-		}
-		
-		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
-		 *  @royaleignorecoercion org.apache.royale.core.IItemRendererClassFactory
-         */
-		public function get itemRendererFactory():IItemRendererClassFactory
-		{
-			if(!_itemRendererFactory)
-    			_itemRendererFactory = loadBeadFromValuesManager(IItemRendererClassFactory, "iItemRendererClassFactory", _strand) as IItemRendererClassFactory;
-			
-			return _itemRendererFactory;
-		}
-		
-        /**
-         *  @private
-         */
-		public function set itemRendererFactory(value:IItemRendererClassFactory):void
-		{
-			_itemRendererFactory = value;
-		}
-		
-        /**
-         *  The org.apache.royale.core.IItemRendererOwnerView that will
-         *  parent the item renderers.
-         *
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion Royale 0.9.4
-		 *  @royaleignorecoercion Array
-		 *  @royaleignorecoercion org.apache.royale.core.IListView
-		 *  @royaleignorecoercion org.apache.royale.core.UIBase
-		 *  @royaleignorecoercion org.apache.royale.core.IIndexedItemRenderer
-		 *  @royaleignorecoercion org.apache.royale.html.supportClasses.StyledDataItemRenderer
-		 *  @royaleignorecoercion org.apache.royale.jewel.supportClasses.list.IListPresentationModel
-		 *  @royaleignorecoercion org.apache.royale.events.IEventDispatcher
-		 *  @royaleignorecoercion org.apache.royale.core.ILabelFieldItemRenderer
-         */
-		protected function dataProviderChangeHandler(event:Event):void
-		{
-			var dp:Array = dataProviderModel.dataProvider as Array;
-			if (!dp)
-				return;
-			
-			var listView:IListView = _strand.getBeadByType(IListView) as IListView;
-			var dataGroup:IItemRendererOwnerView = listView.dataGroup;
-			
-			dataGroup.removeAllItemRenderers();
-			
-			var presentationModel:IListPresentationModel = _strand.getBeadByType(IListPresentationModel) as IListPresentationModel;
-			
-			var n:int = dp.length;
-			for (var i:int = 0; i < n; i++)
-			{
-				var ir:IIndexedItemRenderer = itemRendererFactory.createItemRenderer() as IIndexedItemRenderer;
-                var dataItemRenderer:StyledDataItemRenderer = ir as StyledDataItemRenderer;
-
-				
-				ir.index = i;
-                (ir as ILabelFieldItemRenderer).labelField = labelField;
-                if (dataItemRenderer)
-                {
-                    dataItemRenderer.dataField = dataField;
-                }
-                if (ir is IOwnerViewItemRenderer)
-                    (ir as IOwnerViewItemRenderer).itemRendererOwnerView = dataGroup;
-
-				if (presentationModel) {
-					UIBase(ir).height = presentationModel.rowHeight;
-					// UIBase(ir).percentWidth = 100;
-				}
-				ir.data = dp[i];
-				dataGroup.addItemRenderer(ir, false);
-				var newEvent:ItemRendererEvent = new ItemRendererEvent(ItemRendererEvent.CREATED);
-				newEvent.itemRenderer = ir;
-				dispatchEvent(newEvent);
-			}
-			
-			IEventDispatcher(_strand).dispatchEvent(new Event("itemsCreated"));
-		}
-	}
-}
diff --git a/frameworks/projects/Jewel/src/main/sass/components/_list.sass b/frameworks/projects/Jewel/src/main/sass/components/_list.sass
index f92b744..db98b27 100644
--- a/frameworks/projects/Jewel/src/main/sass/components/_list.sass
+++ b/frameworks/projects/Jewel/src/main/sass/components/_list.sass
@@ -51,9 +51,6 @@ j|List
     IViewportModel: ClassReference("org.apache.royale.html.beads.models.ViewportModel")
     IBeadModel: ClassReference("org.apache.royale.jewel.beads.models.ArrayListSelectionModel")
     IDataProviderItemRendererMapper: ClassReference("org.apache.royale.html.beads.SelectionDataItemRendererFactoryForCollectionView")
-    //IBeadModel: ClassReference("org.apache.royale.html.beads.models.ArraySelectionModel")
-    //IDataProviderItemRendererMapper: ClassReference("org.apache.royale.html.beads.DataItemRendererFactoryForArrayData")
-
     
 @media -royale-swf	
     j|List