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/03/13 12:12:45 UTC

[royale-asjs] branch develop updated: basic: some simplifications for the relation between DataItemRendererFactoryForCollectionView and DataItemRendererFactoryBase

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 077f404  basic: some simplifications for the relation between DataItemRendererFactoryForCollectionView and DataItemRendererFactoryBase
077f404 is described below

commit 077f4040d61d8bb608c85b8ea47b9b23f587a6ca
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Fri Mar 13 13:12:32 2020 +0100

    basic: some simplifications for the relation between DataItemRendererFactoryForCollectionView and DataItemRendererFactoryBase
---
 .../royale/html/beads/DataItemRendererFactoryBase.as       |  7 ++++++-
 .../html/beads/DataItemRendererFactoryForCollectionView.as | 14 ++++++++------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryBase.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryBase.as
index b213992..fc0758f 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryBase.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryBase.as
@@ -50,6 +50,11 @@ package org.apache.royale.html.beads
 		{
 			super(target);
 		}
+
+		/**
+		 * the dataProvider
+		 */
+		protected var dp:Object;
 						
 		/**
 		 *  This Factory deletes all renderers, and generates a renderer
@@ -72,7 +77,7 @@ package org.apache.royale.html.beads
 			
 			removeAllItemRenderers(dataGroup);
 			
-			var dp:Object = dataProviderModel.dataProvider;
+			dp = dataProviderModel.dataProvider;
 			if (!dp)
 				return;
 			
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryForCollectionView.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryForCollectionView.as
index 42ae674..1acd539 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryForCollectionView.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/DataItemRendererFactoryForCollectionView.as
@@ -40,7 +40,11 @@ package org.apache.royale.html.beads
 			super(target);
 		}
 		
-		private var dped:IEventDispatcher;
+		/**
+		 * the dataProvider as a dispatcher
+		 */
+		protected var dped:IEventDispatcher;
+
 		/**
 		 * @private
 		 * @royaleignorecoercion org.apache.royale.collections.ICollectionView
@@ -52,7 +56,6 @@ package org.apache.royale.html.beads
 		{
 			if (!dataProviderModel)
 				return;
-			dp = dataProviderModel.dataProvider as ICollectionView;
 			
 			super.dataProviderChangeHandler(event);
 			
@@ -90,11 +93,12 @@ package org.apache.royale.html.beads
 			var dataGroup:IItemRendererOwnerView = view.dataGroup;
 			
 			var ir:IIndexedItemRenderer = itemRendererFactory.createItemRenderer() as IIndexedItemRenderer;
-			dataGroup.addItemRendererAt(ir, event.index);
 
 			var data:Object = event.item;
 			(itemRendererInitializer as IIndexedItemRendererInitializer).initializeIndexedItemRenderer(ir, data, event.index);
-			ir.data = data;				
+			ir.data = data;
+							
+			dataGroup.addItemRendererAt(ir, event.index);
 			
 			// update the index values in the itemRenderers to correspond to their shifted positions.
 			var n:int = dataGroup.numItemRenderers;
@@ -113,8 +117,6 @@ package org.apache.royale.html.beads
 			sendStrandEvent(_strand,"layoutNeeded");
 		}
 		
-		private var dp:ICollectionView;
-		
 		/**
 		 * @private
 		 * @royaleignorecoercion org.apache.royale.collections.ICollectionView