flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ha...@apache.org
Subject [9/9] git commit: [flex-asjs] [refs/heads/svg-rename] - Fixed up errors caused by renaming
Date Thu, 21 Jul 2016 21:48:53 GMT
Fixed up errors caused by renaming


Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/bce06f6c
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/bce06f6c
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/bce06f6c

Branch: refs/heads/svg-rename
Commit: bce06f6c41c10f27a55b5cb77ba65f9d7a1a98f9
Parents: 7d52952
Author: Harbs <harbs@in-tools.com>
Authored: Fri Jul 22 00:48:36 2016 +0300
Committer: Harbs <harbs@in-tools.com>
Committed: Fri Jul 22 00:48:36 2016 +0300

----------------------------------------------------------------------
 .../flex/org/apache/flex/graphics/GradientEntry.as  |  4 ++--
 .../src/main/flex/org/apache/flex/graphics/IFill.as |  6 +++---
 .../flex/org/apache/flex/graphics/IGraphicShape.as  | 16 ++++++++++++++++
 .../main/flex/org/apache/flex/graphics/IStroke.as   |  4 ++--
 .../flex/org/apache/flex/graphics/SolidColor.as     |  8 ++++----
 .../org/apache/flex/graphics/SolidColorStroke.as    |  6 +++---
 .../main/flex/org/apache/flex/svg/GraphicShape.as   |  5 ++++-
 .../flex/org/apache/flex/svg/GraphicsContainer.as   |  3 +++
 .../main/flex/org/apache/flex/svg/LinearGradient.as | 13 +++++++++----
 .../src/main/flex/org/apache/flex/svg/Text.as       |  4 +++-
 10 files changed, 49 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bce06f6c/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/GradientEntry.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/GradientEntry.as
b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/GradientEntry.as
index 62923d7..cf84e87 100644
--- a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/GradientEntry.as
+++ b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/GradientEntry.as
@@ -110,7 +110,7 @@ package org.apache.flex.graphics
 		/**
 		 * Begin drawing the fill on the given shape's graphic object
 		 */
-		public function begin(s:GraphicShape):void
+		public function begin(s:IGraphicShape):void
 		{
             COMPILE::SWF
             {
@@ -121,7 +121,7 @@ package org.apache.flex.graphics
 		/**
 		 * End the fill
 		 */
-		public function end(s:GraphicShape):void
+		public function end(s:IGraphicShape):void
 		{
             COMPILE::SWF
             {

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bce06f6c/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/IFill.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/IFill.as
b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/IFill.as
index 2f94130..b223431 100644
--- a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/IFill.as
+++ b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/IFill.as
@@ -23,10 +23,10 @@ package org.apache.flex.graphics
 	public interface IFill
 	{
         COMPILE::SWF
-		function begin(s:GraphicShape,targetBounds:Rectangle, targetOrigin:Point):void;
+		function begin(s:IGraphicShape,targetBounds:Rectangle, targetOrigin:Point):void;
         COMPILE::SWF
-		function end(s:GraphicShape):void;
+		function end(s:IGraphicShape):void;
         COMPILE::JS
-        function addFillAttrib(s:GraphicShape):String;
+        function addFillAttrib(s:IGraphicShape):String;
 	}
 }

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bce06f6c/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/IGraphicShape.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/IGraphicShape.as
b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/IGraphicShape.as
new file mode 100644
index 0000000..4bc250f
--- /dev/null
+++ b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/IGraphicShape.as
@@ -0,0 +1,16 @@
+package org.apache.flex.graphics
+{
+	import org.apache.flex.core.IUIBase;
+
+	COMPILE::SWF
+	{
+		import flash.display.Graphics;
+	}
+
+	public interface IGraphicShape extends IUIBase
+	{
+		COMPILE::SWF
+		function get graphics():Graphics;
+		
+	}
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bce06f6c/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/IStroke.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/IStroke.as
b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/IStroke.as
index b02f74e..9fc7e0e 100644
--- a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/IStroke.as
+++ b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/IStroke.as
@@ -17,13 +17,13 @@ package org.apache.flex.graphics
 	public interface IStroke
 	{
         COMPILE::SWF
-		function apply(s:GraphicShape):void;
+		function apply(s:IGraphicShape):void;
         
         COMPILE::JS
         function get weight():Number;
         
         COMPILE::JS
-        function addStrokeAttrib(s:GraphicShape):String;
+        function addStrokeAttrib(s:IGraphicShape):String;
 
 	}
 }

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bce06f6c/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/SolidColor.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/SolidColor.as
b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/SolidColor.as
index 819d5c0..cde2d30 100644
--- a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/SolidColor.as
+++ b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/SolidColor.as
@@ -106,13 +106,13 @@ package org.apache.flex.graphics
 		}
 		
         COMPILE::SWF
-		public function begin(s:GraphicShape,targetBounds:Rectangle,targetOrigin:Point):void
+		public function begin(s:IGraphicShape,targetBounds:Rectangle,targetOrigin:Point):void
 		{
 			s.graphics.beginFill(color,alpha);
 		}
 		
         COMPILE::SWF
-		public function end(s:GraphicShape):void
+		public function end(s:IGraphicShape):void
 		{
 			s.graphics.endFill();
 		}
@@ -120,11 +120,11 @@ package org.apache.flex.graphics
         /**
          * addFillAttrib()
          *
-         * @param value The GraphicShape object on which the fill must be added.
+         * @param value The IGraphicShape object on which the fill must be added.
          * @return {string}
          */
         COMPILE::JS
-        public function addFillAttrib(value:GraphicShape):String
+        public function addFillAttrib(value:IGraphicShape):String
         {
             var color:String = Number(this.color).toString(16);
             if (color.length == 1) color = '00' + color;

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bce06f6c/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/SolidColorStroke.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/SolidColorStroke.as
b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/SolidColorStroke.as
index 065d711..9a5e56b 100644
--- a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/SolidColorStroke.as
+++ b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/SolidColorStroke.as
@@ -104,7 +104,7 @@ package org.apache.flex.graphics
 		}
 		
         COMPILE::SWF
-		public function apply(s:GraphicShape):void
+		public function apply(s:IGraphicShape):void
 		{
 			s.graphics.lineStyle(weight,color,alpha,false,"normal",CapsStyle.SQUARE,JointStyle.MITER);
 		}
@@ -112,11 +112,11 @@ package org.apache.flex.graphics
         /**
          * addStrokeAttrib()
          * 
-         * @param value The GraphicShape object on which the stroke must be added.
+         * @param value The IGraphicShape object on which the stroke must be added.
          * @return {string}
          */
         COMPILE::JS
-        public function addStrokeAttrib(value:GraphicShape):String
+        public function addStrokeAttrib(value:IGraphicShape):String
         {
             var strokeColor:String = Number(color).toString(16);
             if (strokeColor.length == 1) strokeColor = '00' + strokeColor;

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bce06f6c/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/GraphicShape.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/GraphicShape.as
b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/GraphicShape.as
index 026ba93..8d14b67 100644
--- a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/GraphicShape.as
+++ b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/GraphicShape.as
@@ -25,8 +25,11 @@ package org.apache.flex.svg
     }
 
 	import org.apache.flex.core.UIBase;
+	import org.apache.flex.graphics.IFill;
+	import org.apache.flex.graphics.IStroke;
+	import org.apache.flex.graphics.IGraphicShape;
 
-	public class GraphicShape extends UIBase
+	public class GraphicShape extends UIBase implements IGraphicShape
 	{
 		private var _fill:IFill;
 		private var _stroke:IStroke;

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bce06f6c/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/GraphicsContainer.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/GraphicsContainer.as
b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/GraphicsContainer.as
index 90f33fb..97c60d0 100644
--- a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/GraphicsContainer.as
+++ b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/GraphicsContainer.as
@@ -14,6 +14,9 @@
 
 package org.apache.flex.svg
 {
+	import org.apache.flex.graphics.SolidColor;
+	import org.apache.flex.graphics.SolidColorStroke;
+
     COMPILE::SWF
     {
         import flash.display.GraphicsPath;

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bce06f6c/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/LinearGradient.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/LinearGradient.as
b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/LinearGradient.as
index 97438ee..619ae26 100644
--- a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/LinearGradient.as
+++ b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/LinearGradient.as
@@ -14,6 +14,11 @@
 
 package org.apache.flex.svg
 {
+	import org.apache.flex.graphics.GradientBase;
+	import org.apache.flex.graphics.GradientEntry;
+	import org.apache.flex.graphics.IFill;
+	import org.apache.flex.graphics.IGraphicShape;
+
     COMPILE::SWF
     {
         import flash.display.GradientType;
@@ -45,7 +50,7 @@ package org.apache.flex.svg
 		}
 		
         COMPILE::SWF
-		public function begin(s:GraphicShape,targetBounds:Rectangle, targetOrigin:Point):void
+		public function begin(s:IGraphicShape,targetBounds:Rectangle, targetOrigin:Point):void
 		{
 			commonMatrix.identity();
 			commonMatrix.createGradientBox(targetBounds.width,targetBounds.height,toRad(this.rotation),targetOrigin.x,
targetOrigin.y);
@@ -56,7 +61,7 @@ package org.apache.flex.svg
 		}
 		
         COMPILE::SWF
-		public function end(s:GraphicShape):void
+		public function end(s:IGraphicShape):void
 		{
 			s.graphics.endFill();
 		}
@@ -64,12 +69,12 @@ package org.apache.flex.svg
         /**
          * addFillAttrib()
          *
-         * @param value The GraphicShape object on which the fill must be added.
+         * @param value The IGraphicShape object on which the fill must be added.
          * @return {string}
          * @flexjsignorecoercion Node
          */
         COMPILE::JS
-        public function addFillAttrib(value:GraphicShape):String 
+        public function addFillAttrib(value:IGraphicShape):String 
         {
             //Create and add a linear gradient def
             var svgNS:String = value.element.namespaceURI;

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/bce06f6c/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/Text.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/Text.as b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/Text.as
index 0bccf0f..06a4514 100644
--- a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/Text.as
+++ b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/Text.as
@@ -18,6 +18,8 @@
 ////////////////////////////////////////////////////////////////////////////////
 package org.apache.flex.svg
 {
+	import org.apache.flex.graphics.SolidColor;
+
     COMPILE::SWF
     {
         import flash.text.TextFieldType;        
@@ -106,7 +108,7 @@ package org.apache.flex.svg
                 textField.autoSize = "left";
                 textField.text = value;
                 
-                var color:SolidColorStroke = stroke as SolidColorStroke;
+                var color:SolidColor = fill as SolidColor;
                 if (color) {
                     textField.textColor = color.color;
                     textField.alpha = color.alpha;


Mime
View raw message