Repository: flex-asjs Updated Branches: refs/heads/develop 69917e8e5 -> d21bb1b9d
Implemented IDrawable Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/d21bb1b9 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/d21bb1b9 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/d21bb1b9 Branch: refs/heads/develop Commit: d21bb1b9dae6f15118166cf89d37d01697642ef5 Parents: 69917e8 Author: Harbs <[email protected]> Authored: Sun Mar 5 16:07:21 2017 +0200 Committer: Harbs <[email protected]> Committed: Sun Mar 5 16:07:21 2017 +0200 ---------------------------------------------------------------------- .../HTML/src/main/flex/org/apache/flex/svg/Circle.as | 8 +++++++- .../HTML/src/main/flex/org/apache/flex/svg/Ellipse.as | 10 ++++++++-- .../HTML/src/main/flex/org/apache/flex/svg/Path.as | 8 +++++++- .../HTML/src/main/flex/org/apache/flex/svg/Rect.as | 8 +++++++- .../HTML/src/main/flex/org/apache/flex/svg/Text.as | 9 +++++++-- 5 files changed, 36 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d21bb1b9/frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/Circle.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/Circle.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/Circle.as index 8be9869..8f8876a 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/Circle.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/Circle.as @@ -15,6 +15,7 @@ package org.apache.flex.svg { import org.apache.flex.graphics.ICircle; + import org.apache.flex.graphics.IDrawable; COMPILE::SWF { @@ -27,7 +28,7 @@ package org.apache.flex.svg import org.apache.flex.core.WrappedHTMLElement; } - public class Circle extends GraphicShape implements ICircle + public class Circle extends GraphicShape implements ICircle, IDrawable { /** * constructor. @@ -114,6 +115,11 @@ package org.apache.flex.svg { drawCircle(0, 0, radius); } + + public function draw():void + { + drawImpl(); + } } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d21bb1b9/frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/Ellipse.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/Ellipse.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/Ellipse.as index e577177..2c25c61 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/Ellipse.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/Ellipse.as @@ -18,6 +18,7 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.svg { + import org.apache.flex.graphics.IDrawable; import org.apache.flex.graphics.IEllipse; COMPILE::SWF @@ -30,7 +31,7 @@ package org.apache.flex.svg import org.apache.flex.core.WrappedHTMLElement; } - public class Ellipse extends GraphicShape implements IEllipse + public class Ellipse extends GraphicShape implements IEllipse, IDrawable { /** * constructor. @@ -162,8 +163,13 @@ package org.apache.flex.svg override protected function drawImpl():void { - drawEllipse(0, 0); + drawEllipse(0, 0); } + + public function draw():void + { + drawImpl(); + } } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d21bb1b9/frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/Path.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/Path.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/Path.as index 53757b5..4134b55 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/Path.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/Path.as @@ -14,6 +14,7 @@ package org.apache.flex.svg { + import org.apache.flex.graphics.IDrawable; import org.apache.flex.graphics.IPath; import org.apache.flex.graphics.PathBuilder; @@ -30,7 +31,7 @@ package org.apache.flex.svg } - public class Path extends GraphicShape implements IPath + public class Path extends GraphicShape implements IPath, IDrawable { private var _data:String; @@ -129,5 +130,10 @@ package org.apache.flex.svg { drawStringPath(0, 0, data); } + + public function draw():void + { + drawImpl(); + } } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d21bb1b9/frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/Rect.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/Rect.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/Rect.as index 73acb8c..889f76d 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/Rect.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/Rect.as @@ -14,6 +14,7 @@ package org.apache.flex.svg { + import org.apache.flex.graphics.IDrawable; import org.apache.flex.graphics.IRect; COMPILE::SWF @@ -26,7 +27,7 @@ package org.apache.flex.svg import org.apache.flex.core.WrappedHTMLElement; } - public class Rect extends GraphicShape implements IRect + public class Rect extends GraphicShape implements IRect, IDrawable { /** * constructor. @@ -157,6 +158,11 @@ package org.apache.flex.svg { drawRect(0,0,width,height); } + + public function draw():void + { + drawImpl(); + } } } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/d21bb1b9/frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/Text.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/Text.as b/frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/Text.as index 926f0b3..ba03ccf 100644 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/Text.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/Text.as @@ -18,6 +18,7 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.svg { + import org.apache.flex.graphics.IDrawable; import org.apache.flex.graphics.IText; import org.apache.flex.graphics.SolidColor; @@ -42,7 +43,7 @@ package org.apache.flex.svg * // TODO (aharui) ignore imports of external linkage interfaces? * @flexjsignoreimport SVGLocatable */ - public class Text extends GraphicShape implements IText + public class Text extends GraphicShape implements IText, IDrawable { /** * constructor. @@ -149,11 +150,15 @@ package org.apache.flex.svg } } - COMPILE::JS override protected function drawImpl():void { drawText(text,x,y); } + public function draw():void + { + drawImpl(); + } + } }
