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 ad82c50  mxmlitemrenderer: separate states to a new class 
MXMLStatesItemRenderer, and make StyledMXMLItemRenderer extend that class so 
Jewel renderers has state support by default
ad82c50 is described below

commit ad82c507123d63afc16d8a2695ecab68bdd133b2
Author: Carlos Rovira <[email protected]>
AuthorDate: Tue Jan 28 09:37:25 2020 +0100

    mxmlitemrenderer: separate states to a new class MXMLStatesItemRenderer, 
and make StyledMXMLItemRenderer extend that class so Jewel renderers has state 
support by default
---
 .../Basic/src/main/resources/basic-manifest.xml    |   1 +
 .../apache/royale/core/StyledMXMLItemRenderer.as   |   4 +-
 .../royale/html/supportClasses/MXMLItemRenderer.as | 137 +--------------------
 ...MLItemRenderer.as => MXMLStatesItemRenderer.as} |  55 ++-------
 4 files changed, 15 insertions(+), 182 deletions(-)

diff --git a/frameworks/projects/Basic/src/main/resources/basic-manifest.xml 
b/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
index 66974f4..c2b6196 100644
--- a/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
+++ b/frameworks/projects/Basic/src/main/resources/basic-manifest.xml
@@ -135,6 +135,7 @@
     <component id="DataItemRenderer" 
class="org.apache.royale.html.supportClasses.DataItemRenderer"/>
     <component id="MXMLBeadView" class="org.apache.royale.html.MXMLBeadView"/>
     <component id="MXMLItemRenderer" 
class="org.apache.royale.html.supportClasses.MXMLItemRenderer"/>
+    <component id="MXMLStatesItemRenderer" 
class="org.apache.royale.html.supportClasses.MXMLStatesItemRenderer"/>
     <component id="AlternatingBackgroundColorStringItemRenderer" 
class="org.apache.royale.html.supportClasses.AlternatingBackgroundColorStringItemRenderer"/>
     <component id="StringItemRenderer" 
class="org.apache.royale.html.supportClasses.StringItemRenderer"/>
     <component id="ColorItemRenderer" 
class="org.apache.royale.html.supportClasses.ColorItemRenderer"/>
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 f0c3ca7..b864e17 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
@@ -18,7 +18,7 @@
 
////////////////////////////////////////////////////////////////////////////////
 package org.apache.royale.core
 {
-    import org.apache.royale.html.supportClasses.MXMLItemRenderer;
+    import org.apache.royale.html.supportClasses.MXMLStatesItemRenderer;
     import org.apache.royale.utils.ClassSelectorList;
     import org.apache.royale.utils.IClassSelectorListSupport;
     import org.apache.royale.utils.IEmphasis;
@@ -32,7 +32,7 @@ package org.apache.royale.core
         *  @playerversion AIR 2.6
         *  @productversion Royale 0.9.3
         */
-       public class StyledMXMLItemRenderer extends MXMLItemRenderer implements 
IClassSelectorListSupport, IRuntimeSelectableItemRenderer, IEmphasis
+       public class StyledMXMLItemRenderer extends MXMLStatesItemRenderer 
implements IClassSelectorListSupport, IRuntimeSelectableItemRenderer, IEmphasis
        {
                /**
                 *  constructor.
diff --git 
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/MXMLItemRenderer.as
 
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/MXMLItemRenderer.as
index f149684..5457159 100644
--- 
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/MXMLItemRenderer.as
+++ 
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/MXMLItemRenderer.as
@@ -24,26 +24,7 @@ package org.apache.royale.html.supportClasses
        import org.apache.royale.core.ILayoutView;
        import org.apache.royale.core.IStrand;
        import org.apache.royale.events.Event;
-       import org.apache.royale.core.IStatesObject;
-       import org.apache.royale.events.ValueChangeEvent;
-       import org.apache.royale.utils.loadBeadFromValuesManager;
-       import org.apache.royale.core.IStatesImpl;
-       import org.apache.royale.core.IState;
-
-       /**
-     *  Indicates that the state change has completed.  All properties
-     *  that need to change have been changed, and all transitinos
-     *  that need to run have completed.  However, any deferred work
-     *  may not be completed, and the screen may not be updated until
-     *  code stops executing.
-     *  
-     *  @langversion 3.0
-     *  @playerversion Flash 10.2
-     *  @playerversion AIR 2.6
-     *  @productversion Royale 0.9.7
-     */
-    [Event(name="stateChangeComplete", type="org.apache.royale.events.Event")]
-
+    
        /**
         *  The MXMLItemRenderer class is the base class for itemRenderers that 
are MXML-based
         *  and provides support for a layout and a data object.
@@ -53,7 +34,7 @@ package org.apache.royale.html.supportClasses
         *  @playerversion AIR 2.6
         *  @productversion Royale 0.0
         */
-       public class MXMLItemRenderer extends DataItemRenderer implements 
ILayoutParent, ILayoutHost, IStrand, ILayoutView, IStatesObject
+       public class MXMLItemRenderer extends DataItemRenderer implements 
ILayoutParent, ILayoutHost, IStrand, ILayoutView
        {
                /**
                 *  constructor.
@@ -107,119 +88,5 @@ package org.apache.royale.html.supportClasses
                        
                }
 
-
-               private var _states:Array;
-        
-        /**
-         *  The array of view states. These should
-         *  be instances of org.apache.royale.states.State.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion Royale 0.9.7
-         */
-        public function get states():Array
-        {
-            return _states;
-        }
-
-        /**
-         *  @private
-         *  @royaleignorecoercion Class
-         *  @royaleignorecoercion org.apache.royale.core.IBead
-         */
-        public function set states(value:Array):void
-        {
-            _states = value;
-            _currentState = _states[0].name;
-            
-                       try{
-                       loadBeadFromValuesManager(IStatesImpl, "iStatesImpl", 
this);
-                       }
-                       //TODO:  Need to handle this case more gracefully
-                       catch(e:Error)
-                       {
-                COMPILE::SWF
-                {
-                    trace(e.message);                        
-                }
-                       }
-            
-        }
-        
-        /**
-         *  <code>true</code> if the array of states
-         *  contains a state with this name.
-         * 
-         *  @param state The state namem.
-         *  @return True if state in state array
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion Royale 0.9.7
-         */
-        public function hasState(state:String):Boolean
-        {
-            for each (var s:IState in _states)
-            {
-                if (s.name == state)
-                    return true;
-            }
-            return false;
-        }
-        
-               
-        private var _currentState:String;
-        
-        [Bindable("currentStateChange")]
-        /**
-         *  The name of the current state.
-         * 
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion Royale 0.9.7
-         */
-        public function get currentState():String
-        {
-            return _currentState;   
-        }
-
-        /**
-         *  @private
-         */
-        public function set currentState(value:String):void
-        {
-                       if (value == _currentState) return;
-            var event:ValueChangeEvent = new 
ValueChangeEvent("currentStateChange", false, false, _currentState, value)
-            _currentState = value;
-            dispatchEvent(event);
-        }
-        
-        private var _transitions:Array;
-        
-        /**
-         *  The array of transitions.
-         *  
-         *  @langversion 3.0
-         *  @playerversion Flash 10.2
-         *  @playerversion AIR 2.6
-         *  @productversion Royale 0.9.7
-         */
-        public function get transitions():Array
-        {
-            return _transitions;   
-        }
-        
-        /**
-         *  @private
-         */
-        public function set transitions(value:Array):void
-        {
-            _transitions = value;   
-        }
-
        }
 }
diff --git 
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/MXMLItemRenderer.as
 
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/MXMLStatesItemRenderer.as
similarity index 82%
copy from 
frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/MXMLItemRenderer.as
copy to 
frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/MXMLStatesItemRenderer.as
index f149684..ee33f94 100644
--- 
a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/MXMLItemRenderer.as
+++ 
b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/supportClasses/MXMLStatesItemRenderer.as
@@ -45,15 +45,14 @@ package org.apache.royale.html.supportClasses
     [Event(name="stateChangeComplete", type="org.apache.royale.events.Event")]
 
        /**
-        *  The MXMLItemRenderer class is the base class for itemRenderers that 
are MXML-based
-        *  and provides support for a layout and a data object.
+        *  The MXMLStatesItemRenderer class gives view states support for 
MXML-based item renderers.
         *
         *  @langversion 3.0
         *  @playerversion Flash 10.2
         *  @playerversion AIR 2.6
-        *  @productversion Royale 0.0
+        *  @productversion Royale 0.9.7
         */
-       public class MXMLItemRenderer extends DataItemRenderer implements 
ILayoutParent, ILayoutHost, IStrand, ILayoutView, IStatesObject
+       public class MXMLStatesItemRenderer extends MXMLItemRenderer implements 
IStatesObject
        {
                /**
                 *  constructor.
@@ -61,53 +60,19 @@ package org.apache.royale.html.supportClasses
                 *  @langversion 3.0
                 *  @playerversion Flash 10.2
                 *  @playerversion AIR 2.6
-                *  @productversion Royale 0.0
+                *  @productversion Royale 0.9.7
                 */
-               public function MXMLItemRenderer()
+               public function MXMLStatesItemRenderer()
                {
                        super();
-            typeNames = "MXMLItemRenderer";
-               }
-
-        [Bindable("dataChange")]
-        override public function set data(value:Object):void
-        {
-            if (value != data)
-            {
-                super.data = value;
-                dispatchEvent(new Event("dataChange"));
-            }
-        }
-
-               public function getLayoutHost():ILayoutHost
-               {
-                       return this;
-               }
-
-               public function get contentView():ILayoutView
-               {
-                       return this;
-               }
-
-               override public function adjustSize():void
-               {
-                       var layout:IBeadLayout = getBeadByType(IBeadLayout) as 
IBeadLayout;
-                       if (layout != null) {
-                               layout.layout();
-                       }
-               }
-               
-               public function beforeLayout():void
-               {
-                       
-               }
-               
-               public function afterLayout():void
-               {
-                       
+            typeNames = "MXMLStatesItemRenderer";
                }
 
 
+        /**
+         * IStatesObject 
+         */
+        
                private var _states:Array;
         
         /**

Reply via email to