You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ah...@apache.org on 2018/11/16 06:50:27 UTC

[royale-asjs] branch develop updated (d003330 -> f598245)

This is an automated email from the ASF dual-hosted git repository.

aharui pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git.


    from d003330  Added Progress closes #346
     new 56a8285  fail build if swf compc fails
     new bcf0144  instead of just , use more decoration so it is clear what you are trying to skip and so there aren't conflicts
     new 3ebc733  fail if swf comic fails
     new aeadd2e  more cleanup of
     new 2bb056a  mustella must also handle
     new 52f7576  fix localToGlobal
     new 1ba0d4d  more cleanup now that calls to super are checked for whether the member exists
     new 00eba2b  get more of MXTests working again
     new 4afecc1  need this file for fresh Maven builds
     new f598245  tweak numeric stepper size so mxtests pass

The 10 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 build.xml                                          |  1 -
 .../main/royale/org/apache/royale/core/UIBase.as   | 44 +++++------
 .../royale/html/accessories/TextPromptBead.as      |  4 +-
 .../royale/html/beads/BackgroundImageBead.as       |  2 +-
 .../org/apache/royale/html/beads/HScrollBarView.as |  8 +-
 .../org/apache/royale/html/beads/SpinnerView.as    |  4 +-
 .../apache/royale/html/beads/TextFieldViewBase.as  |  2 +-
 .../org/apache/royale/html/beads/VScrollBarView.as |  8 +-
 .../org/apache/royale/html/beads/WebBrowserView.as |  2 +-
 frameworks/projects/Jewel/build.xml                | 18 ++++-
 .../royale/org/apache/royale/jewel/TopAppBar.as    |  6 +-
 .../jewel/supportClasses/drawer/DrawerBase.as      |  6 +-
 frameworks/projects/MXRoyale/build.xml             | 19 ++++-
 .../MXRoyale/src/main/royale/mx/charts/Legend.as   | 18 ++---
 .../src/main/royale/mx/controls/MenuBar.as         |  2 +-
 .../mx/controls/beads/CSSImageAndTextButtonView.as |  2 +-
 .../main/royale/mx/controls/beads/CheckBoxView.as  |  6 +-
 .../royale/mx/controls/beads/NumericStepperView.as |  5 ++
 .../royale/mx/controls/beads/RadioButtonView.as    | 12 +--
 .../src/main/royale/mx/core/Application.as         |  2 +-
 .../src/main/royale/mx/core/UIComponent.as         | 87 +++++++++++++++-------
 .../src/main/royale/mx/events/MouseEvent.as        |  1 -
 frameworks/projects/SparkRoyale/build.xml          | 18 ++++-
 .../royale/spark/components/SkinnableContainer.as  |  4 +-
 .../spark/components/supportClasses/TextBase.as    |  4 +-
 .../src/main/royale/spark/skins/SparkSkin.as       |  4 +-
 mustella/src/main/royale/UnitTester.as             |  2 +
 27 files changed, 188 insertions(+), 103 deletions(-)


[royale-asjs] 04/10: more cleanup of

Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git

commit aeadd2ec4c4d6d47a01cc66aa17a1e460d771424
Author: Alex Harui <ah...@apache.org>
AuthorDate: Thu Nov 15 13:40:06 2018 -0800

    more cleanup of
---
 .../Jewel/src/main/royale/org/apache/royale/jewel/TopAppBar.as      | 6 +++---
 .../org/apache/royale/jewel/supportClasses/drawer/DrawerBase.as     | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/TopAppBar.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/TopAppBar.as
index 9d928da..a204ae4 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/TopAppBar.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/TopAppBar.as
@@ -184,13 +184,13 @@ package org.apache.royale.jewel
                 if (c is IUIBase)
                 {
                     if (c is IRenderedObject)
-                        $addChild(IRenderedObject(c).$displayObject);
+                        $sprite_addChild(IRenderedObject(c).$displayObject);
                     else
-                        $addChild(c as DisplayObject);                        
+                        $sprite_addChild(c as DisplayObject);                        
                     IUIBase(c).addedToParent();
                 }
                 else
-                    $addChild(c as DisplayObject);
+                    $sprite_addChild(c as DisplayObject);
             }
             COMPILE::JS
             {
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/drawer/DrawerBase.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/drawer/DrawerBase.as
index 9161a34..be09ec8 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/drawer/DrawerBase.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/supportClasses/drawer/DrawerBase.as
@@ -119,13 +119,13 @@ package org.apache.royale.jewel.supportClasses.drawer
                 if (c is IUIBase)
                 {
                     if (c is IRenderedObject)
-                        $addChild(IRenderedObject(c).$displayObject);
+                        $sprite_addChild(IRenderedObject(c).$displayObject);
                     else
-                        $addChild(c as DisplayObject);                        
+                        $sprite_addChild(c as DisplayObject);                        
                     IUIBase(c).addedToParent();
                 }
                 else
-                    $addChild(c as DisplayObject);
+                    $sprite_addChild(c as DisplayObject);
             }
             COMPILE::JS
             {


[royale-asjs] 03/10: fail if swf comic fails

Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git

commit 3ebc7337980e3af9a62a5a797b0875cea2f73a8f
Author: Alex Harui <ah...@apache.org>
AuthorDate: Thu Nov 15 13:39:23 2018 -0800

    fail if swf comic fails
---
 frameworks/projects/Jewel/build.xml | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/frameworks/projects/Jewel/build.xml b/frameworks/projects/Jewel/build.xml
index 5ad2877..dba5aaa 100644
--- a/frameworks/projects/Jewel/build.xml
+++ b/frameworks/projects/Jewel/build.xml
@@ -75,12 +75,18 @@
     </target>
     
     <target name="compile" description="Compiles .as files into .swc" if="env.AIR_HOME">
+        <!-- use antcall so that resultproperty can be used in other projects and
+         they don't collide when being run one after the other -->
+        <antcall target="compile-swf" />
+    </target>
+    
+    <target name="compile-swf">
         <echo message="Compiling libs/${ant.project.name}.swc"/>
         <echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
         <echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
         <echo message="ROYALE_COMPILER_HOME: ${ROYALE_COMPILER_HOME}"/>
         
-        <java jar="${ROYALE_COMPILER_HOME}/lib/compc.jar" fork="true" >
+        <java jar="${ROYALE_COMPILER_HOME}/lib/compc.jar" fork="true" resultproperty="compcoutput">
             <jvmarg value="-Xmx384m" />
             <jvmarg value="-Dsun.io.useCanonCaches=false" />
             <jvmarg value="-Droyalelib=${ROYALE_HOME}/frameworks" />
@@ -94,6 +100,16 @@
             <arg value="-js-load-config=${ROYALE_HOME}/frameworks/js-config.xml" />
             <arg value="-js-load-config+=${basedir}/../../js/projects/${ant.project.name}JS/src/main/config/compile-js-config.xml" />
         </java>
+        <fail>
+            <condition>
+                <not>
+                    <or>
+                        <equals arg1="${compcoutput}" arg2="0" />
+                        <equals arg1="${compcoutput}" arg2="2" />
+                    </or>
+                </not>
+            </condition>
+        </fail>
     </target>
     
     <target name="check-compiler" depends="check-compiler-home,check-transpiler-home">


[royale-asjs] 08/10: get more of MXTests working again

Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git

commit 00eba2b94c79dca20ea284d4972b5e90816ee1ae
Author: Alex Harui <ah...@apache.org>
AuthorDate: Thu Nov 15 15:41:04 2018 -0800

    get more of MXTests working again
---
 frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as b/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as
index aefa0cc..d74074a 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as
@@ -1613,7 +1613,8 @@ COMPILE::JS
             var child:IFlexModule = getChildAt(i) as IFlexModule;
             if (!child)
                 continue;
-            
+            if (child == this)
+                continue;  // in the browser, some child HTMLElements reference the main component
             if (child.moduleFactory == null || child.moduleFactory == _moduleFactory)
             {
                 child.moduleFactory = factory;


[royale-asjs] 09/10: need this file for fresh Maven builds

Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git

commit 4afecc1fc7dd8493cf71d8038cbb60679e817da8
Author: Alex Harui <ah...@apache.org>
AuthorDate: Thu Nov 15 15:42:47 2018 -0800

    need this file for fresh Maven builds
---
 build.xml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/build.xml b/build.xml
index 1d16510..bb7b64c 100644
--- a/build.xml
+++ b/build.xml
@@ -838,7 +838,6 @@ limitations under the License.
                 <exclude name=".DS_Store"/>
                 <exclude name="**/.DS_Store"/>
                 <exclude name=".git/**"/>
-                <exclude name=".mvn/**"/>
                 <exclude name="in/**"/>
                 <exclude name="out/**"/>
                 <exclude name="**/out/**"/>


[royale-asjs] 10/10: tweak numeric stepper size so mxtests pass

Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git

commit f59824526df3eed85b26aa8fcedba3fa52bc6b78
Author: Alex Harui <ah...@apache.org>
AuthorDate: Thu Nov 15 22:49:58 2018 -0800

    tweak numeric stepper size so mxtests pass
---
 .../MXRoyale/src/main/royale/mx/controls/beads/NumericStepperView.as | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/NumericStepperView.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/NumericStepperView.as
index 5d06baf..f120124 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/NumericStepperView.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/NumericStepperView.as
@@ -18,6 +18,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 package mx.controls.beads
 {	
+    import mx.core.UIComponent;
+    
     import org.apache.royale.core.IStrand;
     import org.apache.royale.html.beads.NumericStepperView;
 	
@@ -30,6 +32,8 @@ package mx.controls.beads
      *  @playerversion Flash 10.2
      *  @playerversion AIR 2.6
      *  @productversion Royale 0.0
+     * 
+     *  @royaleignorecoercion mx.core.UIComponent
      */
 	public class NumericStepperView extends org.apache.royale.html.beads.NumericStepperView
 	{
@@ -43,6 +47,7 @@ package mx.controls.beads
             COMPILE::JS
             {
                 input.width = 44; // should be same as SWF after we adjust defaults for spinner
+                (value as UIComponent).measuredWidth = 60;
             }
         }
 	}


[royale-asjs] 01/10: fail build if swf compc fails

Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git

commit 56a82854779df050d4701b44add8400f6ac9c39e
Author: Alex Harui <ah...@apache.org>
AuthorDate: Thu Nov 15 11:23:52 2018 -0800

    fail build if swf compc fails
---
 frameworks/projects/MXRoyale/build.xml    | 19 ++++++++++++++++++-
 frameworks/projects/SparkRoyale/build.xml | 18 +++++++++++++++++-
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/frameworks/projects/MXRoyale/build.xml b/frameworks/projects/MXRoyale/build.xml
index 7ee03bf..2a6228a 100644
--- a/frameworks/projects/MXRoyale/build.xml
+++ b/frameworks/projects/MXRoyale/build.xml
@@ -75,12 +75,19 @@
     </target>
     
     <target name="compile" description="Compiles .as files into .swc" if="env.AIR_HOME">
+        <!-- use antcall so that resultproperty can be used in other projects and
+             they don't collide when being run one after the other -->
+        <antcall target="compile-swf" />
+    </target>
+    
+    <target name="compile-swf">
         <echo message="Compiling libs/${ant.project.name}.swc"/>
         <echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
         <echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
         <echo message="ROYALE_COMPILER_HOME: ${ROYALE_COMPILER_HOME}"/>
         
-        <java jar="${ROYALE_COMPILER_HOME}/lib/compc.jar" fork="true" >
+        <java jar="${ROYALE_COMPILER_HOME}/lib/compc.jar" fork="true"
+            resultproperty="compcoutput">
             <jvmarg value="-Xmx384m" />
             <jvmarg value="-Dsun.io.useCanonCaches=false" />
             <jvmarg value="-Droyalelib=${ROYALE_HOME}/frameworks" />
@@ -100,6 +107,16 @@
             <arg value="-js-load-config=${ROYALE_HOME}/frameworks/js-config.xml" />
             <arg value="-js-load-config+=${basedir}/../../js/projects/${ant.project.name}JS/src/main/config/compile-js-config.xml" />
         </java>
+        <fail>
+            <condition>
+                <not>
+                    <or>
+                        <equals arg1="${compcoutput}" arg2="0" />
+                        <equals arg1="${compcoutput}" arg2="2" />
+                    </or>
+                </not>
+            </condition>
+        </fail>
     </target>
     
     <target name="check-compiler" depends="check-compiler-home,check-transpiler-home">
diff --git a/frameworks/projects/SparkRoyale/build.xml b/frameworks/projects/SparkRoyale/build.xml
index 03640ad..1f404dd 100644
--- a/frameworks/projects/SparkRoyale/build.xml
+++ b/frameworks/projects/SparkRoyale/build.xml
@@ -75,12 +75,18 @@
     </target>
     
     <target name="compile" description="Compiles .as files into .swc" if="env.AIR_HOME">
+        <!-- use antcall so that resultproperty can be used in other projects and
+         they don't collide when being run one after the other -->
+        <antcall target="compile-swf" />
+    </target>
+    
+    <target name="compile-swf">
         <echo message="Compiling libs/${ant.project.name}.swc"/>
         <echo message="ROYALE_HOME: ${ROYALE_HOME}"/>
         <echo message="ROYALE_SWF_COMPILER_HOME: ${ROYALE_SWF_COMPILER_HOME}"/>
         <echo message="ROYALE_COMPILER_HOME: ${ROYALE_COMPILER_HOME}"/>
         
-        <java jar="${ROYALE_COMPILER_HOME}/lib/compc.jar" fork="true" >
+        <java jar="${ROYALE_COMPILER_HOME}/lib/compc.jar" fork="true" resultproperty="compcoutput">
             <jvmarg value="-Xmx384m" />
             <jvmarg value="-Dsun.io.useCanonCaches=false" />
             <jvmarg value="-Droyalelib=${ROYALE_HOME}/frameworks" />
@@ -98,6 +104,16 @@
             <arg value="-js-load-config=${ROYALE_HOME}/frameworks/js-config.xml" />
             <arg value="-js-load-config+=${basedir}/../../js/projects/${ant.project.name}JS/src/main/config/compile-js-config.xml" />
         </java>
+        <fail>
+            <condition>
+                <not>
+                    <or>
+                        <equals arg1="${compcoutput}" arg2="0" />
+                        <equals arg1="${compcoutput}" arg2="2" />
+                    </or>
+                </not>
+            </condition>
+        </fail>
     </target>
     
     <target name="check-compiler" depends="check-compiler-home,check-transpiler-home">


[royale-asjs] 05/10: mustella must also handle

Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git

commit 2bb056a867d0d865387d32a5ff033051a924a273
Author: Alex Harui <ah...@apache.org>
AuthorDate: Thu Nov 15 13:40:40 2018 -0800

    mustella must also handle
---
 mustella/src/main/royale/UnitTester.as | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/mustella/src/main/royale/UnitTester.as b/mustella/src/main/royale/UnitTester.as
index 3a138f2..8d03ff3 100644
--- a/mustella/src/main/royale/UnitTester.as
+++ b/mustella/src/main/royale/UnitTester.as
@@ -1153,6 +1153,8 @@ public class UnitTester extends EventDispatcher
 							var child:DisplayObject;
                             if ("$getChildAt" in doc)
                                 child = doc["$getChildAt"](i);
+                            else if ("$sprite_getChildAt" in doc)
+                                child = doc["$sprite_getChildAt"](i);
                             else
                                 child = doc.getChildAt(i);
 							if (swfLoaders[doc] && child is flash.display.Loader)


[royale-asjs] 02/10: instead of just , use more decoration so it is clear what you are trying to skip and so there aren't conflicts

Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git

commit bcf01445a141e4877148177a5f4934694cda8d1f
Author: Alex Harui <ah...@apache.org>
AuthorDate: Thu Nov 15 11:24:43 2018 -0800

    instead of just , use more decoration so it is clear what you are trying to skip and so there aren't conflicts
---
 .../main/royale/org/apache/royale/core/UIBase.as   | 44 ++++++-------
 .../royale/html/accessories/TextPromptBead.as      |  4 +-
 .../royale/html/beads/BackgroundImageBead.as       |  2 +-
 .../org/apache/royale/html/beads/HScrollBarView.as |  8 +--
 .../org/apache/royale/html/beads/SpinnerView.as    |  4 +-
 .../apache/royale/html/beads/TextFieldViewBase.as  |  2 +-
 .../org/apache/royale/html/beads/VScrollBarView.as |  8 +--
 .../org/apache/royale/html/beads/WebBrowserView.as |  2 +-
 .../MXRoyale/src/main/royale/mx/charts/Legend.as   | 14 ++--
 .../src/main/royale/mx/controls/MenuBar.as         |  2 +-
 .../mx/controls/beads/CSSImageAndTextButtonView.as |  2 +-
 .../main/royale/mx/controls/beads/CheckBoxView.as  |  6 +-
 .../royale/mx/controls/beads/RadioButtonView.as    | 12 ++--
 .../src/main/royale/mx/core/Application.as         |  2 +-
 .../src/main/royale/mx/core/UIComponent.as         | 74 ++++++++++++++--------
 .../spark/components/supportClasses/TextBase.as    |  4 +-
 16 files changed, 105 insertions(+), 85 deletions(-)

diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/UIBase.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/UIBase.as
index 457173f..d200589 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/UIBase.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/core/UIBase.as
@@ -1249,13 +1249,13 @@ package org.apache.royale.core
                 if (c is IUIBase)
                 {
                     if (c is IRenderedObject)
-                        $addChild(IRenderedObject(c).$displayObject);
+                        $sprite_addChild(IRenderedObject(c).$displayObject);
                     else
-                        $addChild(c as DisplayObject);                        
+                        $sprite_addChild(c as DisplayObject);                        
                     IUIBase(c).addedToParent();
                 }
                 else
-                    $addChild(c as DisplayObject);
+                    $sprite_addChild(c as DisplayObject);
             }
             COMPILE::JS
             {
@@ -1280,13 +1280,13 @@ package org.apache.royale.core
                 if (c is IUIBase)
                 {
                     if (c is IRenderedObject)
-                        $addChildAt(IUIBase(c).$displayObject, index);
+                        $sprite_addChildAt(IUIBase(c).$displayObject, index);
                     else
-                        $addChildAt(c as DisplayObject, index);
+                        $sprite_addChildAt(c as DisplayObject, index);
                     IUIBase(c).addedToParent();
                 }
                 else
-                    $addChildAt(c as DisplayObject, index);
+                    $sprite_addChildAt(c as DisplayObject, index);
             }
             COMPILE::JS
             {
@@ -1314,7 +1314,7 @@ package org.apache.royale.core
         {
             COMPILE::SWF
             {
-                return $getChildAt(index) as IChild;
+                return $sprite_getChildAt(index) as IChild;
             }
             COMPILE::JS
             {
@@ -1340,9 +1340,9 @@ package org.apache.royale.core
             COMPILE::SWF
             {
                 if (c is IRenderedObject)
-                    return $getChildIndex(IRenderedObject(c).$displayObject);
+                    return $sprite_getChildIndex(IRenderedObject(c).$displayObject);
                 else
-                    return $getChildIndex(c as DisplayObject);
+                    return $sprite_getChildIndex(c as DisplayObject);
             }
             COMPILE::JS
             {
@@ -1371,9 +1371,9 @@ package org.apache.royale.core
             COMPILE::SWF
             {
                 if (c is IRenderedObject)
-                    $removeChild(IRenderedObject(c).$displayObject);
+                    $sprite_removeChild(IRenderedObject(c).$displayObject);
                 else
-                    $removeChild(c as DisplayObject);
+                    $sprite_removeChild(c as DisplayObject);
             }
             COMPILE::JS
             {
@@ -1393,7 +1393,7 @@ package org.apache.royale.core
         {
             COMPILE::SWF
             {
-                return $numChildren;
+                return $sprite_numChildren;
             }
             COMPILE::JS
             {
@@ -1640,52 +1640,52 @@ package org.apache.royale.core
         }
         
         COMPILE::SWF
-        public function $addChild(child:DisplayObject):DisplayObject
+        public function $sprite_addChild(child:DisplayObject):DisplayObject
         {
             return super.addChild(child);
         }
         COMPILE::SWF
-        public function $addChildAt(child:DisplayObject, index:int):DisplayObject
+        public function $sprite_addChildAt(child:DisplayObject, index:int):DisplayObject
         {
             return super.addChildAt(child, index);
         }
         COMPILE::SWF
-        public function $removeChildAt(index:int):DisplayObject
+        public function $sprite_removeChildAt(index:int):DisplayObject
         {
             return super.removeChildAt(index);
         }
         COMPILE::SWF
-        public function $removeChild(child:DisplayObject):DisplayObject
+        public function $sprite_removeChild(child:DisplayObject):DisplayObject
         {
             return super.removeChild(child);
         }
         COMPILE::SWF
-        public function $getChildAt(index:int):DisplayObject
+        public function $sprite_getChildAt(index:int):DisplayObject
         {
             return super.getChildAt(index);
         }
         COMPILE::SWF
-        public function $setChildIndex(index:int):void
+        public function $sprite_setChildIndex(index:int):void
         {
             super.setChildIndex(index);
         }
         COMPILE::SWF
-        public function $getChildIndex(child:DisplayObject):int
+        public function $sprite_getChildIndex(child:DisplayObject):int
         {
             return super.getChildIndex(child);
         }
         COMPILE::SWF
-        public function $getChildByName(name:String):DisplayObject
+        public function $sprite_getChildByName(name:String):DisplayObject
         {
             return super.getChildByName(name);
         }
         COMPILE::SWF
-        public function get $numChildren():int
+        public function get $sprite_numChildren():int
         {
             return super.numChildren;
         }
         COMPILE::SWF
-        public function get $parent():DisplayObjectContainer
+        public function get $sprite_parent():DisplayObjectContainer
         {
             return super.parent;
         }
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/accessories/TextPromptBead.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/accessories/TextPromptBead.as
index a36bc3b..2865d37 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/accessories/TextPromptBead.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/accessories/TextPromptBead.as
@@ -135,11 +135,11 @@ package org.apache.royale.html.accessories
 			var model:Object = UIBase(_strand).model;
 			
 			if (model.text != null && model.text.length > 0 ) {
-				if (promptAdded) UIBase(_strand).$removeChild(promptField);
+				if (promptAdded) UIBase(_strand).$sprite_removeChild(promptField);
 				promptAdded = false;
 			}
 			else {
-				if (!promptAdded) UIBase(_strand).$addChild(promptField);
+				if (!promptAdded) UIBase(_strand).$sprite_addChild(promptField);
 				promptField.text = prompt;
 				promptAdded = true;
                 promptField.x = 2;
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/BackgroundImageBead.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/BackgroundImageBead.as
index da1108c..80771a9 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/BackgroundImageBead.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/BackgroundImageBead.as
@@ -96,7 +96,7 @@ package org.apache.royale.html.beads
 					
 					bitmap = Bitmap(LoaderInfo(e.target).content);
 					
-					host.$addChildAt(bitmap,0);
+					host.$sprite_addChildAt(bitmap,0);
 					
 					if (isNaN(host.explicitWidth) && isNaN(host.percentWidth))
 						host.setWidth(loader.content.width);
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/HScrollBarView.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/HScrollBarView.as
index 77cd622..1a51845 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/HScrollBarView.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/HScrollBarView.as
@@ -86,10 +86,10 @@ package org.apache.royale.html.beads
 			_thumb = new Button();				
 			Button(_thumb).addBead(new HScrollBarThumbView());
             
-            UIBase(value).$addChild(_decrement);
-            UIBase(value).$addChild(_increment);
-            UIBase(value).$addChild(_track);
-            UIBase(value).$addChild(_thumb);
+            UIBase(value).$sprite_addChild(_decrement);
+            UIBase(value).$sprite_addChild(_increment);
+            UIBase(value).$sprite_addChild(_track);
+            UIBase(value).$sprite_addChild(_thumb);
             
             IEventDispatcher(_strand).addEventListener("widthChanged", changeHandler);
 
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/SpinnerView.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/SpinnerView.as
index 83b5bd3..a4290c4 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/SpinnerView.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/SpinnerView.as
@@ -102,8 +102,8 @@ COMPILE::JS {
 				Button(_decrement).x = 0;
 				Button(_decrement).y = Button(_increment).height;
 
-				UIBase(_strand).$addChild(_decrement);
-				UIBase(_strand).$addChild(_increment);
+				UIBase(_strand).$sprite_addChild(_decrement);
+				UIBase(_strand).$sprite_addChild(_increment);
 				rangeModel = _strand.getBeadByType(IBeadModel) as IRangeModel;
 			}
 			IEventDispatcher(value).addEventListener("widthChanged",sizeChangeHandler);
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/TextFieldViewBase.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/TextFieldViewBase.as
index 7712589..f5bfa2b 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/TextFieldViewBase.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/TextFieldViewBase.as
@@ -94,7 +94,7 @@ package org.apache.royale.html.beads
             IEventDispatcher(_strand).addEventListener("widthChanged", widthChangeHandler);
             IEventDispatcher(_strand).addEventListener("heightChanged", heightChangeHandler);
             IEventDispatcher(_strand).addEventListener("sizeChanged", sizeChangeHandler);
-			UIBase(value).$addChild(_textField);
+			UIBase(value).$sprite_addChild(_textField);
 
             var ilc:ILayoutChild = host as ILayoutChild;
             autoHeight = ilc.isHeightSizedToContent();
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/VScrollBarView.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/VScrollBarView.as
index 8aa9b8e..75e713a 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/VScrollBarView.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/VScrollBarView.as
@@ -106,10 +106,10 @@ package org.apache.royale.html.beads
 			_thumb = new Button();				
 			Button(_thumb).addBead(new VScrollBarThumbView());
             
-            UIBase(value).$addChild(_decrement);
-            UIBase(value).$addChild(_increment);
-            UIBase(value).$addChild(_track);
-            UIBase(value).$addChild(_thumb);
+            UIBase(value).$sprite_addChild(_decrement);
+            UIBase(value).$sprite_addChild(_increment);
+            UIBase(value).$sprite_addChild(_track);
+            UIBase(value).$sprite_addChild(_thumb);
             
             IEventDispatcher(_strand).addEventListener("heightChanged", changeHandler);
             
diff --git a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/WebBrowserView.as b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/WebBrowserView.as
index e84ec78..84869b6 100644
--- a/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/WebBrowserView.as
+++ b/frameworks/projects/Basic/src/main/royale/org/apache/royale/html/beads/WebBrowserView.as
@@ -94,7 +94,7 @@ package org.apache.royale.html.beads
 			loader.y = 0;
 			loader.width = host.width;
 			loader.height = host.height;
-			(host as UIBase).$addChild(loader);
+			(host as UIBase).$sprite_addChild(loader);
 		}
 
 		/**
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/charts/Legend.as b/frameworks/projects/MXRoyale/src/main/royale/mx/charts/Legend.as
index a671ed3..8073186 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/charts/Legend.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/charts/Legend.as
@@ -1321,7 +1321,7 @@ package mx.charts
          *  so you can count on it to reflect what is happening at the player level.
          */
         COMPILE::JS
-        mx_internal final function get $numChildren():int
+        mx_internal final function get $sprite_numChildren():int
         {
             return super.numChildren;
         }
@@ -2870,7 +2870,7 @@ package mx.charts
             if (contentPane)
                 contentPane.addChildAt(child, index);
             else
-                $addChildAt(child, _firstChildIndex + index);
+                $uibase_addChildAt(child, _firstChildIndex + index);
             
             childAdded(child);
             
@@ -2937,7 +2937,7 @@ package mx.charts
             if (contentPane)
                 contentPane.removeChild(child);
             else
-                $removeChild(child);
+                $uibase_removeChild(child);
             
             childRemoved(child);
             
@@ -4852,7 +4852,7 @@ package mx.charts
                 _firstChildIndex++;
             
             super.addingChild(child);
-            $addChild(child);
+            $uibase_addChild(child);
             super.childAdded(child);
             
             dispatchEvent(new Event("childrenChanged"));
@@ -4880,7 +4880,7 @@ package mx.charts
             }
             
             super.addingChild(child);
-            $addChildAt(child, index);
+            $uibase_addChildAt(child, index);
             super.childAdded(child);
             
             dispatchEvent(new Event("childrenChanged"));
@@ -4912,7 +4912,7 @@ package mx.charts
             var child:IUIComponent = super.getChildAt(index);
             
             super.removingChild(child);
-            $removeChildAt(index);
+            $uibase_removeChildAt(index);
             super.childRemoved(child);
             
             if (_firstChildIndex < index &&
@@ -6687,7 +6687,7 @@ class LegendRawChildrenList implements IChildList
      */
     public function get numChildren():int
     {
-        return owner.$numChildren;
+        return owner.$sprite_numChildren;
     }
     
     //--------------------------------------------------------------------------
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/MenuBar.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/MenuBar.as
index 5a990ce..823ab1e 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/MenuBar.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/MenuBar.as
@@ -941,7 +941,7 @@ public class MenuBar extends UIComponent implements IFocusManagerComponent, ICon
         var arr:Array = [];
         COMPILE::SWF
         {
-            var itemHolder:UIBase = $getChildAt(0) as UIBase;
+            var itemHolder:UIBase = $sprite_getChildAt(0) as UIBase;
         }
         COMPILE::JS
         {
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/CSSImageAndTextButtonView.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/CSSImageAndTextButtonView.as
index 7759b57..ece98e5 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/CSSImageAndTextButtonView.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/CSSImageAndTextButtonView.as
@@ -119,7 +119,7 @@ package mx.controls.beads
             upTextField.parentHandlesPadding = true;
             downTextField.parentHandlesPadding = true;
             overTextField.parentHandlesPadding = true;
-            UIBase(value).$addChild(upSprite);
+            UIBase(value).$sprite_addChild(upSprite);
             /* TODO switch sprites on mouse state 
 			SimpleButton(value).downState = downSprite;
 			SimpleButton(value).overState = overSprite;
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/CheckBoxView.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/CheckBoxView.as
index 227cb36..49f7c5c 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/CheckBoxView.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/CheckBoxView.as
@@ -129,7 +129,7 @@ package mx.controls.beads
 			hitArea.graphics.drawRect(0,0,upSprite.width, upSprite.height);
 			hitArea.graphics.endFill();
 			
-            UIBase(value).$addChild(upSprite);
+            UIBase(value).$sprite_addChild(upSprite);
             /* TODO switch sprites on mouse state 
 			SimpleButton(value).downState = downSprite;
 			SimpleButton(value).overState = overSprite;
@@ -233,7 +233,7 @@ package mx.controls.beads
 			layoutControl();
 			
 			if( value ) {
-                UIBase(_strand).$addChild(upAndSelectedSprite);
+                UIBase(_strand).$sprite_addChild(upAndSelectedSprite);
                 upAndSelectedSprite.visible = true;
                 upSprite.visible = false;
                 /* TODO switch sprites on mouse state 
@@ -241,7 +241,7 @@ package mx.controls.beads
 				SimpleButton(_strand).overState = overAndSelectedSprite;
 				*/
 			} else {
-                UIBase(_strand).$addChild(upSprite);
+                UIBase(_strand).$sprite_addChild(upSprite);
                 upAndSelectedSprite.visible = false;
                 upSprite.visible = true;
                 /* TODO switch sprites on mouse state 
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/RadioButtonView.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/RadioButtonView.as
index 0c3fbf2..2486d21 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/RadioButtonView.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/beads/RadioButtonView.as
@@ -130,12 +130,12 @@ package mx.controls.beads
 			
 			layoutControl();
 			
-            UIBase(value).$addChild(upSprite);
-            UIBase(value).$addChild(downSprite);
-            UIBase(value).$addChild(overSprite);
-            UIBase(value).$addChild(upAndSelectedSprite);
-            UIBase(value).$addChild(downAndSelectedSprite);
-            UIBase(value).$addChild(overAndSelectedSprite);
+            UIBase(value).$sprite_addChild(upSprite);
+            UIBase(value).$sprite_addChild(downSprite);
+            UIBase(value).$sprite_addChild(overSprite);
+            UIBase(value).$sprite_addChild(upAndSelectedSprite);
+            UIBase(value).$sprite_addChild(downAndSelectedSprite);
+            UIBase(value).$sprite_addChild(overAndSelectedSprite);
             host = Sprite(value);
             host.mouseEnabled = true;
             host.buttonMode = true;
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/core/Application.as b/frameworks/projects/MXRoyale/src/main/royale/mx/core/Application.as
index 49416df..7139394 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/core/Application.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/core/Application.as
@@ -343,7 +343,7 @@ public class Application extends Container implements IStrand, IParent, IEventDi
     [SWFOverride(returns="flash.display.DisplayObjectContainer")]
     override public function get parent():IParent
     {
-        var p:* = $parent;
+        var p:* = $sprite_parent;
         return p;
     }
     }
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as b/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as
index f637555..80bce98 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as
@@ -26,7 +26,6 @@ import flash.display.BlendMode;
 import flash.display.DisplayObject;
 import flash.display.DisplayObjectContainer;
 import flash.display.GradientType;
-import flash.display.Graphics;
 import flash.display.InteractiveObject;
 import flash.display.Loader;
 import flash.display.Shader;
@@ -40,6 +39,10 @@ import flash.events.IEventDispatcher;
 
 import mx.controls.beads.ToolTipBead;
 import mx.core.mx_internal;
+COMPILE::SWF
+{
+import flash.display.Graphics;
+}
 import mx.display.Graphics;
 import mx.events.EffectEvent;
 import mx.events.FlexEvent;
@@ -602,18 +605,40 @@ public class UIComponent extends UIBase
 	//----------------------------------
     //  graphics copied from Sprite
     //----------------------------------
-		private var _graphics:Graphics;
+		private var _graphics:mx.display.Graphics;
 
-        [SWFOverride(returns="flash.display.Graphics"))]
-        COMPILE::SWF 
-        { override }
+        COMPILE::SWF
+        override public function get graphics():flash.display.Graphics
+        {
+            // in SWF, beads that are compiled against UIBase
+            // outside of the emulation components will call
+            // this expecting flash.display.Graphics.
+            // Calls from within the emulation components should
+            // resolve to royalegraphics below.
+            // this override for SWF must be here in order
+            // for the compiler to know which calls to map to
+            // royalegraphics.  Emulation Components should resolve
+            // calls to UIComponent.graphics and non-Emulation
+            // Components should resolve to Sprite.graphics
+            return super.graphics;        
+        }
+        
+        COMPILE::JS
 		public function get graphics():Graphics
 		{
             if (_graphics == null)
                 _graphics = new mx.display.Graphics(this);
 			return _graphics;
 		}
-        
+
+        // the compiler will resolve access to graphics with royalegraphics
+        public function get royalegraphics():mx.display.Graphics
+        {
+            if (_graphics == null)
+                _graphics = new mx.display.Graphics(this);
+            return _graphics;
+        }            
+            
     COMPILE::JS{
 	private var _mask:UIComponent;
 		 public function set mask(value:UIComponent):void
@@ -3087,13 +3112,12 @@ COMPILE::JS
         return addElement(child) as IUIComponent;
     }
     
-    [SWFOverride(params="flash.display.DisplayObject", altparams="mx.core.UIComponent", returns="flash.display.DisplayObject"))]
-    COMPILE::SWF 
-    { override }
-    public function $addChild(child:IUIComponent):IUIComponent
+    
+    public function $uibase_addChild(child:IUIComponent):IUIComponent
     {
         // this should avoid calls to addingChild/childAdded
-        return super.addElement(child) as IUIComponent;
+        var ret:IUIComponent = super.addElement(child) as IUIComponent;
+        return ret;
     }
 
     /**
@@ -3109,16 +3133,16 @@ COMPILE::JS
         return addElementAt(child, index) as IUIComponent;
     }
     
-    [SWFOverride(params="flash.display.DisplayObject,int", altparams="mx.core.UIComponent,int", returns="flash.display.DisplayObject"))]
-    COMPILE::SWF 
-    { override }
-    public function $addChildAt(child:IUIComponent,
+    public function $uibase_addChildAt(child:IUIComponent,
                                index:int):IUIComponent
     {
+        var ret:IUIComponent;
         // this should avoid calls to addingChild/childAdded
         if (index >= super.numElements)
-            return super.addElement(child) as IUIComponent;
-        return super.addElementAt(child, index) as IUIComponent;
+            ret = super.addElement(child) as IUIComponent;
+        else
+            ret = super.addElementAt(child, index) as IUIComponent;
+        return ret;
     }
 
     /**
@@ -3133,13 +3157,11 @@ COMPILE::JS
         return removeElement(child) as IUIComponent;
     }
     
-    [SWFOverride(params="flash.display.DisplayObject", altparams="mx.core.UIComponent", returns="flash.display.DisplayObject"))]
-    COMPILE::SWF 
-    { override }
-    public function $removeChild(child:IUIComponent):IUIComponent
+    public function $uibase_removeChild(child:IUIComponent):IUIComponent
     {
         // this should probably call the removingChild/childRemoved
-        return super.removeElement(child) as IUIComponent;
+        var ret:IUIComponent = super.removeElement(child) as IUIComponent;
+        return ret;
     }
     
     COMPILE::JS
@@ -3160,12 +3182,10 @@ COMPILE::JS
         return removeElement(getElementAt(index)) as IUIComponent;
     }
     
-    [SWFOverride(returns="flash.display.DisplayObject"))]
-    COMPILE::SWF 
-    { override }
-    public function $removeChildAt(index:int):IUIComponent
+    public function $uibase_removeChildAt(index:int):IUIComponent
     {
-        return super.removeElement(getElementAt(index)) as IUIComponent;
+        var ret:IUIComponent = super.removeElement(getElementAt(index)) as IUIComponent;
+        return ret;
     }
 
     /**
diff --git a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/supportClasses/TextBase.as b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/supportClasses/TextBase.as
index a938750..23f1b52 100644
--- a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/supportClasses/TextBase.as
+++ b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/supportClasses/TextBase.as
@@ -970,7 +970,7 @@ public class TextBase extends UIComponent
             // Add new TextLine accounting for our background Shape.
             COMPILE::SWF
             {
-                $addChildAt(textLine as IUIComponent, 1);
+                $uibase_addChildAt(textLine as IUIComponent, 1);
             }
             COMPILE::JS
             {
@@ -1000,7 +1000,7 @@ public class TextBase extends UIComponent
             {
                 COMPILE::SWF
                 {
-                    UIComponent(textLine.parent).$removeChild(textLine as IUIComponent);                        
+                    UIComponent(textLine.parent).$uibase_removeChild(textLine as IUIComponent);                        
                 }
                 COMPILE::JS
                 {


[royale-asjs] 07/10: more cleanup now that calls to super are checked for whether the member exists

Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git

commit 1ba0d4d68c416162c11dc41d822c602a0d0d5b08
Author: Alex Harui <ah...@apache.org>
AuthorDate: Thu Nov 15 13:42:38 2018 -0800

    more cleanup now that calls to super are checked for whether the member exists
---
 frameworks/projects/MXRoyale/src/main/royale/mx/charts/Legend.as      | 4 ++--
 frameworks/projects/MXRoyale/src/main/royale/mx/events/MouseEvent.as  | 1 -
 .../src/main/royale/spark/components/SkinnableContainer.as            | 4 ++--
 .../projects/SparkRoyale/src/main/royale/spark/skins/SparkSkin.as     | 4 ++--
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/charts/Legend.as b/frameworks/projects/MXRoyale/src/main/royale/mx/charts/Legend.as
index 8073186..be6d5b8 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/charts/Legend.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/charts/Legend.as
@@ -3505,7 +3505,7 @@ package mx.charts
                     null :
                     changedStyles;
                 
-                super.notifyStyleChangeInChildren(styleProp, true);
+                //super.notifyStyleChangeInChildren(styleProp, true);
                 
                 changedStyles = null;
             }
@@ -5004,7 +5004,7 @@ package mx.charts
          */
         mx_internal function rawChildren_getObjectsUnderPoint(pt:Point):Array
         {
-            return super.getObjectsUnderPoint(pt);
+            return null; //super.getObjectsUnderPoint(pt);
         }
         
         /**
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/events/MouseEvent.as b/frameworks/projects/MXRoyale/src/main/royale/mx/events/MouseEvent.as
index 9b7fdce..4047ceb 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/events/MouseEvent.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/events/MouseEvent.as
@@ -84,7 +84,6 @@ public class MouseEvent extends org.apache.royale.events.MouseEvent
 		}
 		public function updateAfterEvent():void
 		{
-			super.updateAfterEvent();
 		}
 	}
 	
diff --git a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/SkinnableContainer.as b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/SkinnableContainer.as
index a311eaf..421d8f7 100644
--- a/frameworks/projects/SparkRoyale/src/main/royale/spark/components/SkinnableContainer.as
+++ b/frameworks/projects/SparkRoyale/src/main/royale/spark/components/SkinnableContainer.as
@@ -1132,9 +1132,9 @@ public class SkinnableContainer extends SkinnableComponent implements IContainer
      */
      /* override */ protected function partRemoved(partName:String, instance:Object):void
     {
-        super.partRemoved(partName, instance);
+         /* super.partRemoved(partName, instance);
 
-       /*  if (instance == contentGroup)
+         if (instance == contentGroup)
         {
             contentGroup.removeEventListener(
                 ElementExistenceEvent.ELEMENT_ADD, contentGroup_elementAddedHandler);
diff --git a/frameworks/projects/SparkRoyale/src/main/royale/spark/skins/SparkSkin.as b/frameworks/projects/SparkRoyale/src/main/royale/spark/skins/SparkSkin.as
index 55cf465..007839a 100644
--- a/frameworks/projects/SparkRoyale/src/main/royale/spark/skins/SparkSkin.as
+++ b/frameworks/projects/SparkRoyale/src/main/royale/spark/skins/SparkSkin.as
@@ -165,7 +165,7 @@ public class SparkSkin extends Skin
 	
     /*override*/ public function beginHighlightBitmapCapture():Boolean
     {
-        var needRedraw:Boolean = super.beginHighlightBitmapCapture();
+        var needRedraw:Boolean// = super.beginHighlightBitmapCapture();
 
         // If we have a mostly-transparent content background, temporarily bump
         // up the contentBackgroundAlpha so the captured bitmap includes an opaque
@@ -190,7 +190,7 @@ public class SparkSkin extends Skin
 	
     /*override*/ public function endHighlightBitmapCapture():Boolean
     {
-        var needRedraw:Boolean = super.endHighlightBitmapCapture();
+        var needRedraw:Boolean// = super.endHighlightBitmapCapture();
 
         /*if (!isNaN(oldContentBackgroundAlpha))
         {


[royale-asjs] 06/10: fix localToGlobal

Posted by ah...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

aharui pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git

commit 52f757675adb00b61697cf86c3d00fb221fd344b
Author: Alex Harui <ah...@apache.org>
AuthorDate: Thu Nov 15 13:41:41 2018 -0800

    fix localToGlobal
---
 .../projects/MXRoyale/src/main/royale/mx/core/UIComponent.as   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as b/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as
index 80bce98..aefa0cc 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/core/UIComponent.as
@@ -3531,6 +3531,11 @@ COMPILE::JS
     { override }
     public function localToGlobal(value:Point):Point
     {
+        COMPILE::SWF
+        {
+            var o:Object = super.localToGlobal(value);
+            return new org.apache.royale.geom.Point(o.x, o.y);
+        }
         return PointUtils.localToGlobal(value, this);
     }
     
@@ -3547,6 +3552,11 @@ COMPILE::JS
     { override }
     public function globalToLocal(value:Point):Point
     {
+        COMPILE::SWF
+        {
+            var o:Object = super.globalToLocal(value);
+            return new org.apache.royale.geom.Point(o.x, o.y);
+        }
         return PointUtils.globalToLocal(value, this);
     }