You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by yi...@apache.org on 2020/09/20 21:23:55 UTC
[royale-asjs] branch develop updated: Replacing flash.display
objects with existing Royale ones.
This is an automated email from the ASF dual-hosted git repository.
yishayw 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 6e5f812 Replacing flash.display objects with existing Royale ones.
6e5f812 is described below
commit 6e5f81226f8410e1bdcfc6d4a4cf455677ba0e52
Author: Yishay Weiss <yi...@yell.com>
AuthorDate: Sun Sep 20 22:20:15 2020 +0100
Replacing flash.display objects with existing Royale ones.
---
.../src/main/royale/mx/automation/IAutomationObject.as | 10 +++++-----
.../MXRoyale/src/main/royale/mx/controls/SWFLoader.as | 10 ++++------
.../MXRoyale/src/main/royale/mx/events/FlexMouseEvent.as | 3 +--
.../MXRoyale/src/main/royale/mx/graphics/BitmapFill.as | 14 +++++++-------
.../src/main/royale/spark/core/SpriteVisualElement.as | 3 +--
5 files changed, 18 insertions(+), 22 deletions(-)
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/automation/IAutomationObject.as b/frameworks/projects/MXRoyale/src/main/royale/mx/automation/IAutomationObject.as
index 94b883f..744e38d 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/automation/IAutomationObject.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/automation/IAutomationObject.as
@@ -20,8 +20,8 @@
package mx.automation
{
-import flash.display.DisplayObject;
-import flash.display.DisplayObjectContainer;
+import mx.core.UIComponent;
+import mx.core.UIComponent;
import org.apache.royale.events.Event;
import org.apache.royale.events.MouseEvent;
@@ -163,7 +163,7 @@ public interface IAutomationObject
* @playerversion AIR 1.1
* @productversion Flex 4
*/
- function get automationOwner():DisplayObjectContainer;
+ function get automationOwner():UIComponent;
/**
* The parent of this component for automation purposes.
@@ -177,7 +177,7 @@ public interface IAutomationObject
* @playerversion AIR 1.1
* @productversion Flex 4
*/
- function get automationParent():DisplayObjectContainer;
+ function get automationParent():UIComponent;
/**
* True if this component is enabled for automation, false
@@ -199,7 +199,7 @@ public interface IAutomationObject
* True if this component is visible for automation, false
* otherwise.
*
- * @see flash.display.DisplayObject#visible
+ * @see mx.core.UIComponent#visible
*
* @return <code>true</code> if this component is visible for automation,
* <code>false</code> otherwise.
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/SWFLoader.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/SWFLoader.as
index 3ba5766..ab00d0e 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/SWFLoader.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/SWFLoader.as
@@ -20,12 +20,10 @@
package mx.controls
{
-import flash.display.Bitmap;
-import flash.display.DisplayObject;
-import flash.display.DisplayObjectContainer;
+import mx.display.Bitmap;
+import mx.core.UIComponent;
import flash.display.Loader;
import flash.display.LoaderInfo;
-import flash.display.Sprite;
import org.apache.royale.events.Event;
import org.apache.royale.events.EventDispatcher;
import mx.events.HTTPStatusEvent;
@@ -487,7 +485,7 @@ public class SWFLoader extends UIComponent implements ISWFLoader
/**
* @private
*/
- private var mouseShield:Sprite;
+ private var mouseShield:UIComponent;
/**
* @private
@@ -2595,7 +2593,7 @@ public class SWFLoader extends UIComponent implements ISWFLoader
{
if (!mouseShield)
{
- mouseShield = new Sprite();
+ mouseShield = new UIComponent();
mouseShield.graphics.beginFill(0, 0);
mouseShield.graphics.drawRect(0, 0, 100, 100);
mouseShield.graphics.endFill();
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/events/FlexMouseEvent.as b/frameworks/projects/MXRoyale/src/main/royale/mx/events/FlexMouseEvent.as
index 0dc1139..156da47 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/events/FlexMouseEvent.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/events/FlexMouseEvent.as
@@ -20,7 +20,6 @@
package mx.events
{
-import flash.display.InteractiveObject;
import mx.core.UIComponent;
import org.apache.royale.events.Event;
import org.apache.royale.events.MouseEvent;
@@ -262,7 +261,7 @@ public class FlexMouseEvent extends org.apache.royale.events.MouseEvent
public function FlexMouseEvent(type:String, bubbles:Boolean = false,
cancelable:Boolean = false,
localX:Number = 0, localY:Number = 0,
- relatedObject:InteractiveObject = null,
+ relatedObject:UIComponent = null,
ctrlKey:Boolean = false,
altKey:Boolean = false,
shiftKey:Boolean = false,
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/graphics/BitmapFill.as b/frameworks/projects/MXRoyale/src/main/royale/mx/graphics/BitmapFill.as
index 631238a..e92ca4d 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/graphics/BitmapFill.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/graphics/BitmapFill.as
@@ -20,10 +20,10 @@
package mx.graphics
{
-import flash.display.Bitmap;
-import flash.display.BitmapData;
-import flash.display.DisplayObject;
-import flash.display.Graphics;
+import mx.display.Bitmap;
+import org.apache.royale.BitmapData;
+import mx.core.UIComponent;
+import mx.display.Graphics;
import org.apache.royale.events.Event;
import org.apache.royale.events.EventDispatcher;
import mx.events.IOErrorEvent;
@@ -46,9 +46,9 @@ import mx.utils.MatrixUtil;
* with a bitmap or other DisplayObject.
*
* @see mx.graphics.IFill
- * @see flash.display.Bitmap
- * @see flash.display.BitmapData
- * @see flash.display.DisplayObject
+ * @see mx.display.Bitmap
+ * @see org.apache.royale.BitmapData
+ * @see mx.core.UIComponent
*
* @langversion 3.0
* @playerversion Flash 9
diff --git a/frameworks/projects/SparkRoyale/src/main/royale/spark/core/SpriteVisualElement.as b/frameworks/projects/SparkRoyale/src/main/royale/spark/core/SpriteVisualElement.as
index 5a64e8f..656aca4 100644
--- a/frameworks/projects/SparkRoyale/src/main/royale/spark/core/SpriteVisualElement.as
+++ b/frameworks/projects/SparkRoyale/src/main/royale/spark/core/SpriteVisualElement.as
@@ -21,8 +21,7 @@ package spark.core
{
import flash.display.BlendMode;
-import flash.display.DisplayObject;
-import flash.display.DisplayObjectContainer;
+import mx.core.UIComponent;
import org.apache.royale.events.Event;
import org.apache.royale.events.IEventDispatcher;
import flash.geom.ColorTransform;