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/11 20:45:11 UTC

[royale-asjs] branch develop updated: basic: some clean of imports and fix docs and refactor ToolTipRemovalWhenItemRemoved bead to work with new IR refactor done recenlty

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 fb110d1  basic: some clean of imports and fix docs and refactor ToolTipRemovalWhenItemRemoved bead to work with new IR refactor done recenlty
fb110d1 is described below

commit fb110d109a4c802b08099d12cea002c2d6549d9a
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Wed Mar 11 21:45:01 2020 +0100

    basic: some clean of imports and fix docs and refactor ToolTipRemovalWhenItemRemoved bead to work with new IR refactor done recenlty
---
 .../apache/royale/core/StyledMXMLItemRenderer.as   |  6 ++--
 .../accessories/ToolTipRemovalWhenItemRemoved.as   | 37 ++++++++++++----------
 .../DataItemRendererFactoryForCollectionView.as    |  2 +-
 .../html/beads/IndexedItemRendererInitializer.as   | 11 ++++---
 .../royale/html/beads/ItemRendererFactoryBase.as   | 23 ++------------
 .../html/beads/ListItemRendererInitializer.as      | 15 +++------
 6 files changed, 37 insertions(+), 57 deletions(-)

diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/StyledMXMLItemRenderer.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/StyledMXMLItemRenderer.as
index b1cf951..43db82b 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/StyledMXMLItemRenderer.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/StyledMXMLItemRenderer.as
@@ -172,20 +172,18 @@ package org.apache.royale.core
         }
 
         private var _itemRendererOwnerView:IItemRendererOwnerView;
-        
         /**
-         *  The text of the renderer
+         *  The parent container for the itemRenderer instance.
          *  
          *  @langversion 3.0
          *  @playerversion Flash 10.2
          *  @playerversion AIR 2.6
-         *  @productversion Royale 0.9.4
+         *  @productversion Royale 0.9.7
          */
         public function get itemRendererOwnerView():IItemRendererOwnerView
         {
             return _itemRendererOwnerView;
         }
-        
         public function set itemRendererOwnerView(value:IItemRendererOwnerView):void
         {
             _itemRendererOwnerView = value;
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/accessories/ToolTipRemovalWhenItemRemoved.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/accessories/ToolTipRemovalWhenItemRemoved.as
index 3ef69d6..ad0c337 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/accessories/ToolTipRemovalWhenItemRemoved.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/accessories/ToolTipRemovalWhenItemRemoved.as
@@ -18,12 +18,12 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.html.accessories
 {
-	import org.apache.royale.core.IBead;
+	import org.apache.royale.core.Bead;
 	import org.apache.royale.core.IBeadView;
 	import org.apache.royale.core.IOwnerViewItemRenderer;
-	import org.apache.royale.core.IItemRendererOwnerView;
-	import org.apache.royale.core.IToolTipBead;
 	import org.apache.royale.core.IStrand;
+	import org.apache.royale.core.IToolTipBead;
+	import org.apache.royale.events.Event;
 	import org.apache.royale.events.IEventDispatcher;
 	import org.apache.royale.events.ItemRemovedEvent;
 
@@ -36,7 +36,7 @@ package org.apache.royale.html.accessories
      *  @playerversion AIR 2.6
      *  @productversion Royale 0.9.7
      */
-	public class ToolTipRemovalWhenItemRemoved implements IBead
+	public class ToolTipRemovalWhenItemRemoved extends Bead
 	{
         /**
          *  Constructor.
@@ -46,9 +46,9 @@ package org.apache.royale.html.accessories
          *  @playerversion AIR 2.6
          *  @productversion Royale 0.9.7
          */
-		public function ToolTipRemovalWhenItemRemoved()
-		{
-		}
+        public function ToolTipRemovalWhenItemRemoved()
+        {
+        }
 
         /**
          *  listen to "itemRemoved" event dispatched from the List
@@ -60,22 +60,27 @@ package org.apache.royale.html.accessories
          *  @playerversion AIR 2.6
          *  @productversion Royale 0.9.7
          */
-		public function set strand(value:IStrand):void
-		{
-            var eventDispatcher:IEventDispatcher = ((value as IOwnerViewItemRenderer).itemRendererOwnerView as IBeadView).host as IEventDispatcher;
-            eventDispatcher.addEventListener("itemRemoved", handleItemRemoved);
+        override public function set strand(value:IStrand):void
+        {
+			super.strand = value;
+			listenOnStrand("rendererInitizalized", rendererInitizalizedHandler);
 		}
 
+		protected function rendererInitizalizedHandler(event:Event):void
+		{
+			var eventDispatcher:IEventDispatcher = ((_strand as IOwnerViewItemRenderer).itemRendererOwnerView as IBeadView).host as IEventDispatcher;
+			eventDispatcher.addEventListener("itemRemoved", handleItemRemoved);
+        }
+		
         protected function handleItemRemoved(event:ItemRemovedEvent):void
         {
-                _tooltip.removeTip();
+            _tooltip.removeTip();
         }
 
         private var _tooltip:IToolTipBead;
         public function set tooltip(value:IToolTipBead):void
-            {
-                    _tooltip = value;
-            }
-		
+		{
+			_tooltip = value;
+		}
 	}
 }
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 da20166..3e6596b 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
@@ -28,7 +28,7 @@ package org.apache.royale.html.beads
 	import org.apache.royale.events.IEventDispatcher;
 	import org.apache.royale.html.beads.IListView;
 	import org.apache.royale.utils.sendStrandEvent;
-
+ 
 	
 	/**
 	 * This class creates itemRenderer instances from the data contained within an ICollectionView
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/IndexedItemRendererInitializer.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/IndexedItemRendererInitializer.as
index 24920a2..df4b029 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/IndexedItemRendererInitializer.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/IndexedItemRendererInitializer.as
@@ -25,15 +25,17 @@ package org.apache.royale.html.beads
 	import org.apache.royale.core.IItemRenderer;
 	import org.apache.royale.core.ILabelFieldItemRenderer;
 	import org.apache.royale.core.IStrand;
+	import org.apache.royale.utils.sendEvent;
+	import org.apache.royale.events.IEventDispatcher;
 
 	/**
-	 *  The ListItemRendererInitializer class initializes item renderers
+	 *  The IndexedItemRendererInitializer class initializes item renderers
 	 *  in list classes.
 	 *  
 	 *  @langversion 3.0
 	 *  @playerversion Flash 10.2
 	 *  @playerversion AIR 2.6
-	 *  @productversion Royale 0.0
+	 *  @productversion Royale 0.9.7
 	 */
 	public class IndexedItemRendererInitializer extends Bead implements IIndexedItemRendererInitializer
 	{
@@ -43,7 +45,7 @@ package org.apache.royale.html.beads
 		 *  @langversion 3.0
 		 *  @playerversion Flash 10.2
 		 *  @playerversion AIR 2.6
-		 *  @productversion Royale 0.0
+		 *  @productversion Royale 0.9.7
 		 */
 		public function IndexedItemRendererInitializer()
 		{
@@ -58,7 +60,7 @@ package org.apache.royale.html.beads
 		 *  @langversion 3.0
 		 *  @playerversion Flash 10.2
 		 *  @playerversion AIR 2.6
-		 *  @productversion Royale 0.0
+		 *  @productversion Royale 0.9.7
 		 * @royaleignorecoercion org.apache.royale.core.IDataProviderModel
 		 */
 		override public function set strand(value:IStrand):void
@@ -89,6 +91,7 @@ package org.apache.royale.html.beads
 		{
 			ir.index = index;
 			initializeItemRenderer(ir, data);
+			sendEvent(_strand as IEventDispatcher, "rendererInitizalized");
 		}
 		
 		protected function setupVisualsForItemRenderer(ir:IIndexedItemRenderer):void
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ItemRendererFactoryBase.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ItemRendererFactoryBase.as
index 74d63e6..2b327ea 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ItemRendererFactoryBase.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ItemRendererFactoryBase.as
@@ -19,34 +19,15 @@
 package org.apache.royale.html.beads
 {
 	import org.apache.royale.core.IBead;
-	import org.apache.royale.core.IChild;
-	import org.apache.royale.core.IDataProviderItemRendererMapper;
 	import org.apache.royale.core.IDataProviderModel;
-    import org.apache.royale.core.IItemRendererInitializer;
-    import org.apache.royale.core.IIndexedItemRendererInitializer;
-    import org.apache.royale.core.IItemRenderer;
-    import org.apache.royale.core.IIndexedItemRenderer;
 	import org.apache.royale.core.IItemRendererClassFactory;
+	import org.apache.royale.core.IItemRendererInitializer;
 	import org.apache.royale.core.IItemRendererOwnerView;
-	import org.apache.royale.core.ILayoutHost;
-	import org.apache.royale.core.IListPresentationModel;
-	import org.apache.royale.core.IParentIUIBase;
-	import org.apache.royale.core.ISelectableItemRenderer;
 	import org.apache.royale.core.IStrand;
-	import org.apache.royale.core.IStrandWithModelView;
-	import org.apache.royale.core.IUIBase;
-	import org.apache.royale.core.SimpleCSSStyles;
-	import org.apache.royale.core.UIBase;
-	import org.apache.royale.core.ValuesManager;
 	import org.apache.royale.events.Event;
 	import org.apache.royale.events.EventDispatcher;
 	import org.apache.royale.events.IEventDispatcher;
-	import org.apache.royale.html.List;
-	import org.apache.royale.html.beads.IListView;
-	import org.apache.royale.html.supportClasses.DataItemRenderer;
 	import org.apache.royale.utils.loadBeadFromValuesManager;
-	import org.apache.royale.utils.sendEvent;
-	import org.apache.royale.utils.sendStrandEvent;
 
     /**
      *  The DataItemRendererFactoryBase class is a base class
@@ -88,7 +69,7 @@ package org.apache.royale.html.beads
          */
 		public function set strand(value:IStrand):void
 		{
-			_strand = value;
+			_strand = value; 
 			IEventDispatcher(value).addEventListener("initComplete", finishSetup);
 		}
 		
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ListItemRendererInitializer.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ListItemRendererInitializer.as
index d487628..920ee78 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ListItemRendererInitializer.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/ListItemRendererInitializer.as
@@ -18,18 +18,11 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.html.beads
 {	
-	import org.apache.royale.core.IItemRendererOwnerView;
-	
-	import org.apache.royale.core.Bead;
-	import org.apache.royale.core.IDataProviderModel;
 	import org.apache.royale.core.IIndexedItemRenderer;
 	import org.apache.royale.core.IIndexedItemRendererInitializer;
-	import org.apache.royale.core.IItemRenderer;
-	import org.apache.royale.core.ILabelFieldItemRenderer;
 	import org.apache.royale.html.IListPresentationModel;
 	import org.apache.royale.core.IStrand;
 	import org.apache.royale.core.IStrandWithPresentationModel;
-	import org.apache.royale.core.IUIBase;
 	import org.apache.royale.core.SimpleCSSStyles;
 	import org.apache.royale.core.UIBase;
 
@@ -40,7 +33,7 @@ package org.apache.royale.html.beads
 	 *  @langversion 3.0
 	 *  @playerversion Flash 10.2
 	 *  @playerversion AIR 2.6
-	 *  @productversion Royale 0.0
+	 *  @productversion Royale 0.9.7
 	 */
 	public class ListItemRendererInitializer extends IndexedItemRendererInitializer implements IIndexedItemRendererInitializer
 	{
@@ -50,9 +43,9 @@ package org.apache.royale.html.beads
 		 *  @langversion 3.0
 		 *  @playerversion Flash 10.2
 		 *  @playerversion AIR 2.6
-		 *  @productversion Royale 0.0
+		 *  @productversion Royale 0.9.7
 		 */
-		public function ListItemRendererInitializer()
+		public function ListItemRendererInitializer() 
 		{
 		}
 		
@@ -64,7 +57,7 @@ package org.apache.royale.html.beads
 		 *  @langversion 3.0
 		 *  @playerversion Flash 10.2
 		 *  @playerversion AIR 2.6
-		 *  @productversion Royale 0.0
+		 *  @productversion Royale 0.9.7
 		 *  @royaleignorecoercion HTMLInputElement
 		 *  @royaleignorecoercion org.apache.royale.core.IStrandWithPresentationModel
 		 */