You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ha...@apache.org on 2016/07/28 12:06:02 UTC
[7/7] git commit: [flex-asjs] [refs/heads/refactor-sprite] - Merge
branch 'svg-rename' into refactor-sprite
Merge branch 'svg-rename' into refactor-sprite
* svg-rename:
Add to new beads to manifest files.
Moved transform classes that were not specific to graphics to core.
First working version on JS side.
First working version on JS side.
TransformBead working.
Conflicts:
frameworks/projects/Graphics/src/main/flex/GraphicsClasses.as
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/f30fd323
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/f30fd323
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/f30fd323
Branch: refs/heads/refactor-sprite
Commit: f30fd32349e0d97422faf5b96a3a16dc673e1ac0
Parents: 98822cb fa40021
Author: Harbs <ha...@in-tools.com>
Authored: Thu Jul 28 15:05:50 2016 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Thu Jul 28 15:05:50 2016 +0300
----------------------------------------------------------------------
.../projects/Core/src/main/flex/CoreClasses.as | 9 +-
.../flex/org/apache/flex/core/IBeadTransform.as | 45 +++++
.../flex/org/apache/flex/core/ITransformHost.as | 62 +++++++
.../org/apache/flex/core/ITransformModel.as | 47 +++++
.../flex/org/apache/flex/core/TransformModel.as | 29 +++
.../apache/flex/core/TransformRotateModel.as | 28 +++
.../Core/src/main/resources/basic-manifest.xml | 2 +
.../Graphics/src/main/flex/GraphicsClasses.as | 1 +
.../org/apache/flex/svg/GraphicContainer.as | 175 ++++++++++++++++---
.../flex/org/apache/flex/svg/TransformBead.as | 93 ++++++++++
.../src/main/resources/svg-manifest.xml | 3 +-
11 files changed, 468 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f30fd323/frameworks/projects/Core/src/main/flex/CoreClasses.as
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/f30fd323/frameworks/projects/Graphics/src/main/flex/GraphicsClasses.as
----------------------------------------------------------------------
diff --cc frameworks/projects/Graphics/src/main/flex/GraphicsClasses.as
index 916d6b4,55fccb5..fefcc10
--- a/frameworks/projects/Graphics/src/main/flex/GraphicsClasses.as
+++ b/frameworks/projects/Graphics/src/main/flex/GraphicsClasses.as
@@@ -39,14 -39,7 +39,15 @@@ internal class GraphicsClasse
import org.apache.flex.svg.Text; Text;
import org.apache.flex.svg.CompoundGraphic; CompoundGraphic;
import org.apache.flex.svg.LinearGradient; LinearGradient;
+ import org.apache.flex.graphics.CubicCurve; CubicCurve;
+ import org.apache.flex.graphics.LineStyle; LineStyle;
+ import org.apache.flex.graphics.LineTo; LineTo;
+ import org.apache.flex.graphics.MoveTo; MoveTo;
+ import org.apache.flex.graphics.PathBuilder; PathBuilder;
+ import org.apache.flex.graphics.QuadraticCurve; QuadraticCurve;
+ import org.apache.flex.svg.DOMWrapper; DOMWrapper;
+
+ import org.apache.flex.svg.TransformBead; TransformBead;
}
}