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/10/29 17:41:53 UTC
[royale-asjs] 03/10: clean compile after merging develop branch
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 6e4390f51febca105a7f4bd25147a5f35a147c88
Author: Alex Harui <ah...@apache.org>
AuthorDate: Wed Oct 24 13:16:37 2018 -0700
clean compile after merging develop branch
---
.../MXRoyale/src/main/royale/mx/controls/LinkBar.as | 2 +-
.../MXRoyale/src/main/royale/mx/graphics/LinearGradient.as | 11 +++++++++++
.../MXRoyale/src/main/royale/mx/graphics/SolidColor.as | 13 ++++++++++++-
.../src/main/royale/mx/graphics/SolidColorStroke.as | 11 +++++++++++
.../SparkRoyale/src/main/royale/spark/collections/Sort.as | 8 ++++++++
.../src/main/royale/spark/collections/SortField.as | 9 ++++++++-
.../main/royale/spark/components/supportClasses/TextBase.as | 9 +++------
7 files changed, 54 insertions(+), 9 deletions(-)
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/LinkBar.as b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/LinkBar.as
index 93513e3..7a1dee6 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/controls/LinkBar.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/controls/LinkBar.as
@@ -27,7 +27,7 @@ import mx.core.ClassFactory;
import mx.core.EdgeMetrics;
import mx.core.IFlexDisplayObject;
import mx.core.mx_internal;
-import mx.events.ChildExistenceChangedEvent;
+//import mx.events.ChildExistenceChangedEvent;
import mx.events.FlexEvent;
import mx.events.ItemClickEvent;
import mx.styles.ISimpleStyleClient;
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/graphics/LinearGradient.as b/frameworks/projects/MXRoyale/src/main/royale/mx/graphics/LinearGradient.as
index 9e6ca9b..f3ab501 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/graphics/LinearGradient.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/graphics/LinearGradient.as
@@ -40,6 +40,17 @@ public class LinearGradient implements IFill
{
}
+ private var _rotation:Number;
+
+ public function get rotation():Number
+ {
+ return _rotation;
+ }
+ public function set rotation(value:Number):void
+ {
+ _rotation = value;
+ }
+
private var _entries:Array;
public function get entries():Array
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/graphics/SolidColor.as b/frameworks/projects/MXRoyale/src/main/royale/mx/graphics/SolidColor.as
index fe5dce6..f8ba794 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/graphics/SolidColor.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/graphics/SolidColor.as
@@ -38,6 +38,17 @@ package mx.graphics
{
}
+ private var _alpha:Number;
+
+ public function get alpha():Number
+ {
+ return _alpha;
+ }
+ public function set alpha(value:Number):void
+ {
+ _alpha = value;
+ }
+
private var _color:Number;
public function get color():Number
@@ -48,6 +59,6 @@ package mx.graphics
{
_color = value;
}
-
+
}
}
diff --git a/frameworks/projects/MXRoyale/src/main/royale/mx/graphics/SolidColorStroke.as b/frameworks/projects/MXRoyale/src/main/royale/mx/graphics/SolidColorStroke.as
index 47a8510..29de512 100644
--- a/frameworks/projects/MXRoyale/src/main/royale/mx/graphics/SolidColorStroke.as
+++ b/frameworks/projects/MXRoyale/src/main/royale/mx/graphics/SolidColorStroke.as
@@ -59,6 +59,17 @@ package mx.graphics
_color = value;
}
+ private var _alpha:Number;
+
+ public function get alpha():Number
+ {
+ return _alpha;
+ }
+ public function set alpha(value:Number):void
+ {
+ _alpha = value;
+ }
+
//----------------------------------
// caps
//----------------------------------
diff --git a/frameworks/projects/SparkRoyale/src/main/royale/spark/collections/Sort.as b/frameworks/projects/SparkRoyale/src/main/royale/spark/collections/Sort.as
index e696a0f..e5a13fa 100644
--- a/frameworks/projects/SparkRoyale/src/main/royale/spark/collections/Sort.as
+++ b/frameworks/projects/SparkRoyale/src/main/royale/spark/collections/Sort.as
@@ -200,6 +200,14 @@ package spark.collections
// include "../core/Version.as";
// include "AdvancedStyleClientImplementation.as";
+ public function get styleName():Object
+ {
+ return null;
+ }
+ public function set styleName(value:Object):void
+ {
+ }
+
//--------------------------------------------------------------------------
//
// Class constants
diff --git a/frameworks/projects/SparkRoyale/src/main/royale/spark/collections/SortField.as b/frameworks/projects/SparkRoyale/src/main/royale/spark/collections/SortField.as
index abd9b7a..e753585 100644
--- a/frameworks/projects/SparkRoyale/src/main/royale/spark/collections/SortField.as
+++ b/frameworks/projects/SparkRoyale/src/main/royale/spark/collections/SortField.as
@@ -166,7 +166,14 @@ package spark.collections
{
// include "../core/Version.as";
// include "AdvancedStyleClientImplementation.as";
-
+ public function get styleName():Object
+ {
+ return null;
+ }
+ public function set styleName(value:Object):void
+ {
+ }
+
//--------------------------------------------------------------------------
//
// Constructor
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 54791e3..a938750 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
@@ -21,10 +21,6 @@ package spark.components.supportClasses
{
import org.apache.royale.geom.Rectangle;
-COMPILE::SWF
-{
- import flash.display.DisplayObject;
-}
/*
import flash.display.Graphics;
import flash.display.Shape;
@@ -40,6 +36,7 @@ import spark.core.IDisplayText;
import spark.utils.TextUtil;
*/
+import mx.core.IUIComponent;
import mx.core.UIComponent;
import mx.core.mx_internal;
import mx.events.FlexEvent;
@@ -973,7 +970,7 @@ public class TextBase extends UIComponent
// Add new TextLine accounting for our background Shape.
COMPILE::SWF
{
- $addChildAt(textLine as DisplayObject, 1);
+ $addChildAt(textLine as IUIComponent, 1);
}
COMPILE::JS
{
@@ -1003,7 +1000,7 @@ public class TextBase extends UIComponent
{
COMPILE::SWF
{
- UIComponent(textLine.parent).$removeChild(textLine as DisplayObject);
+ UIComponent(textLine.parent).$removeChild(textLine as IUIComponent);
}
COMPILE::JS
{