flex-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ha...@apache.org
Subject [01/21] git commit: [flex-asjs] [refs/heads/develop] - Initial rename of graphics classes
Date Mon, 25 Jul 2016 10:09:19 GMT
Repository: flex-asjs
Updated Branches:
  refs/heads/develop 8d72cc2c8 -> 9cd285227


http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7d529524/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
new file mode 100644
index 0000000..97438ee
--- /dev/null
+++ b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/LinearGradient.as
@@ -0,0 +1,123 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flex.svg
+{
+    COMPILE::SWF
+    {
+        import flash.display.GradientType;
+        import flash.display.InterpolationMethod;
+        import flash.display.SpreadMethod;
+        import flash.geom.Matrix;
+        import flash.geom.Point;
+        import flash.geom.Rectangle;            
+    }
+	
+	public class LinearGradient extends GradientBase implements IFill
+	{
+		COMPILE::SWF
+		private static var commonMatrix:Matrix = new Matrix();
+        
+		private var _scaleX:Number;
+		
+		/**
+		 *  The horizontal scale of the gradient transform, which defines the width of the (unrotated)
gradient
+		 */
+		public function get scaleX():Number
+		{
+			return _scaleX;
+		}
+		
+		public function set scaleX(value:Number):void
+		{
+			_scaleX = value;
+		}
+		
+        COMPILE::SWF
+		public function begin(s:GraphicShape,targetBounds:Rectangle, targetOrigin:Point):void
+		{
+			commonMatrix.identity();
+			commonMatrix.createGradientBox(targetBounds.width,targetBounds.height,toRad(this.rotation),targetOrigin.x,
targetOrigin.y);
+			
+			s.graphics.beginGradientFill(GradientType.LINEAR, colors, alphas, ratios,
+				commonMatrix, SpreadMethod.PAD, InterpolationMethod.RGB);
+			
+		}
+		
+        COMPILE::SWF
+		public function end(s:GraphicShape):void
+		{
+			s.graphics.endFill();
+		}
+        
+        /**
+         * addFillAttrib()
+         *
+         * @param value The GraphicShape object on which the fill must be added.
+         * @return {string}
+         * @flexjsignorecoercion Node
+         */
+        COMPILE::JS
+        public function addFillAttrib(value:GraphicShape):String 
+        {
+            //Create and add a linear gradient def
+            var svgNS:String = value.element.namespaceURI;
+            var grad:HTMLElement = document.createElementNS(svgNS, 'linearGradient') as HTMLElement;
+            var gradientId:String = this.newId;
+            grad.setAttribute('id', gradientId);
+            
+            //Set x1, y1, x2, y2 of gradient
+            grad.setAttribute('x1', '0%');
+            grad.setAttribute('y1', '0%');
+            grad.setAttribute('x2', '100%');
+            grad.setAttribute('y2', '0%');
+            
+            //Apply rotation to the gradient if rotation is a number
+            if (rotation)
+            {
+                grad.setAttribute('gradientTransform', 'rotate(' + rotation + ' 0.5 0.5)');
+            }
+            
+            //Process gradient entries and create a stop for each entry
+            var entries:Array = this.entries;
+            for (var i:int = 0; i < entries.length; i++)
+            {
+                var gradientEntry:GradientEntry = entries[i];
+                var stop:HTMLElement = document.createElementNS(svgNS, 'stop') as HTMLElement;
+                //Set Offset
+                stop.setAttribute('offset', String(gradientEntry.ratio * 100) + '%');
+                //Set Color
+                var color:String = Number(gradientEntry.color).toString(16);
+                if (color.length == 1) color = '00' + color;
+                if (color.length == 2) color = '00' + color;
+                if (color.length == 4) color = '00' + color;
+                stop.setAttribute('stop-color', '#' + String(color));
+                //Set Alpha
+                stop.setAttribute('stop-opacity', String(gradientEntry.alpha));
+                
+                grad.appendChild(stop);
+            }
+            
+            //Add defs element if not available already
+            //Add newly created gradient to defs element
+            var defs:Node = value.element.querySelector('defs') ||
+                value.element.insertBefore(document.createElementNS(svgNS, 'defs'), value.element.firstChild);
+            defs.appendChild(grad);
+            
+            //Return the fill attribute
+            return 'fill:url(#' + gradientId + ')';
+        }
+
+	}
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7d529524/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/Path.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/Path.as b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/Path.as
new file mode 100644
index 0000000..ac5d023
--- /dev/null
+++ b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/Path.as
@@ -0,0 +1,100 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flex.svg
+{
+    COMPILE::SWF
+    {
+        import flash.display.GraphicsPath;
+        import flash.geom.Point;
+        import flash.geom.Rectangle;
+        import org.apache.flex.graphics.utils.PathHelper;
+    }
+	COMPILE::JS
+    {
+        import org.apache.flex.core.WrappedHTMLElement;
+    }
+
+
+	public class Path extends GraphicShape
+	{
+
+		private var _data:String;
+
+		public function get data():String
+		{
+			return _data;
+		}
+
+		public function set data(value:String):void
+		{
+			_data = value;
+		}
+		
+		COMPILE::JS
+		private var _path:WrappedHTMLElement;
+
+		/**
+		 *  Draw the path.
+		 *  @param data A string containing a compact represention of the path segments.
+		 *  The value is a space-delimited string describing each path segment. Each
+	     *  segment entry has a single character which denotes the segment type and
+    	 *  two or more segment parameters.
+		 *
+		 *  If the segment command is upper-case, the parameters are absolute values.
+		 *  If the segment command is lower-case, the parameters are relative values.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 *  @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
+		 */
+		public function drawPath(xp:Number,yp:Number,data:String):void
+		{
+			COMPILE::SWF
+            {
+                graphics.clear();
+                applyStroke();
+                var bounds:Rectangle = PathHelper.getBounds(data);
+                this.width = bounds.width;
+                this.height = bounds.height;
+                beginFill(bounds,new Point(bounds.left + xp, bounds.top + yp) );
+                var graphicsPath:GraphicsPath = PathHelper.getSegments(data,xp,yp);
+                graphics.drawPath(graphicsPath.commands, graphicsPath.data);
+                endFill();
+            }
+            COMPILE::JS
+            {
+                if (data == null || data.length === 0) return;
+                var style:String = getStyleStr();
+				if (_path == null) {
+                	_path = document.createElementNS('http://www.w3.org/2000/svg', 'path') as
WrappedHTMLElement;
+					_path.flexjs_wrapper = this;
+					element.appendChild(_path);
+				}
+				_path.setAttribute('style', style);
+				_path.setAttribute('d', data);
+
+                resize(x, y, _path['getBBox']());
+
+            }
+		}
+
+		override protected function draw():void
+		{
+			drawPath(0, 0, data);
+		}
+	}
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7d529524/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/Rect.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/Rect.as b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/Rect.as
new file mode 100644
index 0000000..a3109b8
--- /dev/null
+++ b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/Rect.as
@@ -0,0 +1,90 @@
+/**
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.flex.svg
+{
+    COMPILE::SWF
+    {
+        import flash.display.CapsStyle;
+        import flash.display.JointStyle;
+        import flash.geom.Point;
+        import flash.geom.Rectangle;            
+    }
+    COMPILE::JS
+    {
+        import org.apache.flex.core.WrappedHTMLElement;
+    }
+
+	public class Rect extends GraphicShape
+	{
+		COMPILE::JS
+		private var _rect:WrappedHTMLElement;
+		
+		/**
+		 *  Draw the rectangle.
+		 *  @param xp The x position of the top-left corner of the rectangle.
+		 *  @param yp The y position of the top-left corner.
+		 *  @param width The width of the rectangle.
+		 *  @param height The height of the rectangle.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+         *  @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
+		 */
+		public function drawRect(xp:Number, yp:Number, width:Number, height:Number):void
+		{
+            COMPILE::SWF
+            {
+                graphics.clear();
+                applyStroke();
+                beginFill(new Rectangle(xp, yp, width, height), new Point(xp,yp));
+                graphics.drawRect(xp, yp, width, height);
+                endFill();                    
+            }
+            COMPILE::JS
+            {
+                var style:String = this.getStyleStr();
+				
+				if (_rect == null) {
+                	_rect = document.createElementNS('http://www.w3.org/2000/svg', 'rect') as
WrappedHTMLElement;
+                	_rect.flexjs_wrapper = this;
+					element.appendChild(_rect);
+				}
+                _rect.setAttribute('style', style);
+                if (stroke)
+                {
+					_rect.setAttribute('x', String(stroke.weight / 2) + 'px');
+					_rect.setAttribute('y', String(stroke.weight / 2) + 'px');
+                }
+                else
+                {
+					_rect.setAttribute('x', '0' + 'px');
+					_rect.setAttribute('y', '0' + 'px');
+                }
+				_rect.setAttribute('width', String(width) + 'px');
+				_rect.setAttribute('height', String(height) + 'px');
+                
+                resize(x, y, _rect['getBBox']());
+            }
+		}
+		
+		override protected function draw():void
+		{
+			drawRect(0,0,width,height);
+		}
+		
+	}
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7d529524/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
new file mode 100644
index 0000000..0bccf0f
--- /dev/null
+++ b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/Text.as
@@ -0,0 +1,147 @@
+////////////////////////////////////////////////////////////////////////////////
+//
+//  Licensed to the Apache Software Foundation (ASF) under one or more
+//  contributor license agreements.  See the NOTICE file distributed with
+//  this work for additional information regarding copyright ownership.
+//  The ASF licenses this file to You under the Apache License, Version 2.0
+//  (the "License"); you may not use this file except in compliance with
+//  the License.  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+////////////////////////////////////////////////////////////////////////////////
+package org.apache.flex.svg
+{
+    COMPILE::SWF
+    {
+        import flash.text.TextFieldType;        
+        import org.apache.flex.core.CSSTextField;            
+    }
+    COMPILE::JS
+    {
+        import org.apache.flex.core.WrappedHTMLElement;
+    }
+	
+	/**
+	 *  Draws a string of characters at a specific location using the stroke
+	 *  value of color and alpha.
+	 *
+	 *  @langversion 3.0
+	 *  @playerversion Flash 10.2
+	 *  @playerversion AIR 2.6
+	 *  @productversion FlexJS 0.0
+     *  // TODO (aharui) ignore imports of external linkage interfaces?
+     *  @flexjsignoreimport SVGLocatable
+	 */
+	public class Text extends GraphicShape
+	{
+		/**
+		 *  constructor.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+		public function Text()
+		{
+			super();
+			
+            COMPILE::SWF
+            {
+                _textField = new CSSTextField();
+                addChild(_textField);                    
+            }
+		}
+		
+
+        COMPILE::SWF
+		private var _textField:CSSTextField;
+		
+		COMPILE::JS
+		private var _text:WrappedHTMLElement;
+		
+		/**
+		 *  @copy org.apache.flex.core.ITextModel#textField
+		 *  
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+		 */
+        COMPILE::SWF
+		public function get textField() : CSSTextField
+		{
+			return _textField;
+		}
+		
+		/**
+		 *  Draws text at the given point.
+		 *  @param value The string to draw.
+		 *  @param xt The x position of the top-left corner of the rectangle.
+		 *  @param yt The y position of the top-left corner.
+		 *
+		 *  @langversion 3.0
+		 *  @playerversion Flash 10.2
+		 *  @playerversion AIR 2.6
+		 *  @productversion FlexJS 0.0
+         *  @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
+         *  @flexjsignorecoercion Text
+         *  @flexjsignorecoercion Node
+         *  @flexjsignorecoercion SVGLocatable
+		 */
+		public function drawText(value:String, xt:Number, yt:Number):void
+		{
+            COMPILE::SWF
+            {
+                textField.selectable = false;
+                textField.type = TextFieldType.DYNAMIC;
+                textField.mouseEnabled = false;
+                textField.autoSize = "left";
+                textField.text = value;
+                
+                var color:SolidColorStroke = stroke as SolidColorStroke;
+                if (color) {
+                    textField.textColor = color.color;
+                    textField.alpha = color.alpha;
+                }
+                
+                textField.x = xt;
+                textField.y = yt;                    
+            }
+            COMPILE::JS
+            {
+                var style:String = this.getStyleStr();
+				if (_text == null) {
+                	_text = document.createElementNS('http://www.w3.org/2000/svg', 'text') as
WrappedHTMLElement;
+                	_text.flexjs_wrapper = this;
+					element.appendChild(_text);
+				}
+				else {
+					_text.removeChild(_text.childNodes[0]);
+				}
+                _text.setAttribute('style', style);
+                _text.setAttribute('x', String(xt) + 'px');
+                _text.setAttribute('y', String(yt) + 'px');
+				var textNode:Text = document.createTextNode(value) as Text;
+				_text.appendChild(textNode as Node);
+                
+                resize(x, y, (_text as SVGLocatable).getBBox());
+
+            }
+		}
+        
+        COMPILE::JS
+        override protected function draw():void
+        {
+            
+        }
+
+	}
+}

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7d529524/frameworks/projects/Graphics/src/main/resources/basic-manifest.xml
----------------------------------------------------------------------
diff --git a/frameworks/projects/Graphics/src/main/resources/basic-manifest.xml b/frameworks/projects/Graphics/src/main/resources/basic-manifest.xml
index 2191691..e078011 100644
--- a/frameworks/projects/Graphics/src/main/resources/basic-manifest.xml
+++ b/frameworks/projects/Graphics/src/main/resources/basic-manifest.xml
@@ -21,14 +21,14 @@
 
 <componentPackage>
 
-	<component id="Circle" class="org.apache.flex.core.graphics.Circle" />
-	<component id="Ellipse" class="org.apache.flex.core.graphics.Ellipse" />
-	<component id="Path" class="org.apache.flex.core.graphics.Path" />
-	<component id="Rect" class="org.apache.flex.core.graphics.Rect" />
-	<component id="GraphicsContainer" class="org.apache.flex.core.graphics.GraphicsContainer"
/>
-    <component id="GradientEntry" class="org.apache.flex.core.graphics.GradientEntry"
/>
-    <component id="LinearGradient" class="org.apache.flex.core.graphics.LinearGradient"
/>
-    <component id="SolidColor" class="org.apache.flex.core.graphics.SolidColor" />
-    <component id="SolidColorStroke" class="org.apache.flex.core.graphics.SolidColorStroke"
/>
+	<component id="Circle" class="org.apache.flex.svg.Circle" />
+	<component id="Ellipse" class="org.apache.flex.svg.Ellipse" />
+	<component id="Path" class="org.apache.flex.svg.Path" />
+	<component id="Rect" class="org.apache.flex.svg.Rect" />
+	<component id="GraphicsContainer" class="org.apache.flex.svg.GraphicsContainer" />
+    <component id="GradientEntry" class="org.apache.flex.graphics.GradientEntry" />
+    <component id="LinearGradient" class="org.apache.flex.svg.LinearGradient" />
+    <component id="SolidColor" class="org.apache.flex.graphics.SolidColor" />
+    <component id="SolidColorStroke" class="org.apache.flex.graphics.SolidColorStroke"
/>
 
 </componentPackage>

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7d529524/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DataGridLinesBead.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DataGridLinesBead.as
b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DataGridLinesBead.as
index 92a3b99..16649de 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DataGridLinesBead.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DataGridLinesBead.as
@@ -26,10 +26,10 @@ package org.apache.flex.html.beads
 	import org.apache.flex.core.IParentIUIBase;
 	import org.apache.flex.core.IStrand;
 	import org.apache.flex.core.UIBase;
-	import org.apache.flex.core.graphics.GraphicsContainer;
-	import org.apache.flex.core.graphics.IStroke;
-	import org.apache.flex.core.graphics.SolidColor;
-	import org.apache.flex.core.graphics.SolidColorStroke;
+	import org.apache.flex.svg.GraphicsContainer;
+	import org.apache.flex.graphics.IStroke;
+	import org.apache.flex.graphics.SolidColor;
+	import org.apache.flex.graphics.SolidColorStroke;
 	import org.apache.flex.events.Event;
 	import org.apache.flex.events.IEventDispatcher;
 	import org.apache.flex.html.beads.models.DataGridPresentationModel;

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7d529524/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DecrementButtonView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DecrementButtonView.as
b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DecrementButtonView.as
index a546aaa..fd3ee2e 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DecrementButtonView.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DecrementButtonView.as
@@ -22,10 +22,10 @@ package org.apache.flex.html.beads
 	import org.apache.flex.core.IBeadView;
 	import org.apache.flex.core.IStrand;
 	import org.apache.flex.core.UIBase;
-	import org.apache.flex.core.graphics.Path;
-	import org.apache.flex.core.graphics.Rect;
-	import org.apache.flex.core.graphics.SolidColor;
-	import org.apache.flex.core.graphics.SolidColorStroke;
+	import org.apache.flex.svg.Path;
+	import org.apache.flex.svg.Rect;
+	import org.apache.flex.graphics.SolidColor;
+	import org.apache.flex.graphics.SolidColorStroke;
 	import org.apache.flex.events.Event;
 
 	public class DecrementButtonView extends BeadViewBase implements IBeadView

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7d529524/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/IncrementButtonView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/IncrementButtonView.as
b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/IncrementButtonView.as
index 343d460..8f27064 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/IncrementButtonView.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/IncrementButtonView.as
@@ -22,10 +22,10 @@ package org.apache.flex.html.beads
 	import org.apache.flex.core.IBeadView;
 	import org.apache.flex.core.IStrand;
 	import org.apache.flex.core.UIBase;
-	import org.apache.flex.core.graphics.Path;
-	import org.apache.flex.core.graphics.Rect;
-	import org.apache.flex.core.graphics.SolidColor;
-	import org.apache.flex.core.graphics.SolidColorStroke;
+	import org.apache.flex.svg.Path;
+	import org.apache.flex.svg.Rect;
+	import org.apache.flex.graphics.SolidColor;
+	import org.apache.flex.graphics.SolidColorStroke;
 	import org.apache.flex.events.Event;
 
 	public class IncrementButtonView extends BeadViewBase implements IBeadView

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7d529524/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/RangeStepperView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/RangeStepperView.as
b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/RangeStepperView.as
index 49ef5d1..a05b913 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/RangeStepperView.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/RangeStepperView.as
@@ -22,8 +22,8 @@ package org.apache.flex.html.beads
 	import org.apache.flex.core.IBeadView;
 	import org.apache.flex.core.IStrand;
 	import org.apache.flex.core.UIBase;
-	import org.apache.flex.core.graphics.Rect;
-	import org.apache.flex.core.graphics.SolidColorStroke;
+	import org.apache.flex.svg.Rect;
+	import org.apache.flex.graphics.SolidColorStroke;
 	import org.apache.flex.events.Event;
 	import org.apache.flex.events.IEventDispatcher;
 	import org.apache.flex.html.ImageButton;

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7d529524/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/GraphicsItemRenderer.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/GraphicsItemRenderer.as
b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/GraphicsItemRenderer.as
index 2a343fa..8d3d4df 100644
--- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/GraphicsItemRenderer.as
+++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/GraphicsItemRenderer.as
@@ -20,7 +20,7 @@ package org.apache.flex.html.supportClasses
 {
 	import org.apache.flex.core.ISelectableItemRenderer;
 	import org.apache.flex.core.ValuesManager;
-	import org.apache.flex.core.graphics.GraphicsContainer;
+	import org.apache.flex.svg.GraphicsContainer;
 	import org.apache.flex.events.Event;
 	import org.apache.flex.utils.MXMLDataInterpreter;
 	

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7d529524/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/ToggleSwitchView.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/ToggleSwitchView.as
b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/ToggleSwitchView.as
index bceee17..92de534 100644
--- a/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/ToggleSwitchView.as
+++ b/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/beads/ToggleSwitchView.as
@@ -23,9 +23,9 @@ package org.apache.flex.mobile.beads
 	import org.apache.flex.core.IToggleButtonModel;
 	import org.apache.flex.core.IUIBase;
 	import org.apache.flex.core.UIBase;
-	import org.apache.flex.core.graphics.Rect;
-	import org.apache.flex.core.graphics.SolidColor;
-	import org.apache.flex.core.graphics.SolidColorStroke;
+	import org.apache.flex.svg.Rect;
+	import org.apache.flex.graphics.SolidColor;
+	import org.apache.flex.graphics.SolidColorStroke;
 	import org.apache.flex.events.Event;
 	
 	/**

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7d529524/manualtests/FlexJSTest_SVG/src/GraphicsView.mxml
----------------------------------------------------------------------
diff --git a/manualtests/FlexJSTest_SVG/src/GraphicsView.mxml b/manualtests/FlexJSTest_SVG/src/GraphicsView.mxml
index 7428331..7d05889 100644
--- a/manualtests/FlexJSTest_SVG/src/GraphicsView.mxml
+++ b/manualtests/FlexJSTest_SVG/src/GraphicsView.mxml
@@ -24,15 +24,15 @@ limitations under the License.
 			   >
     <fx:Script>
         <![CDATA[            
-			import org.apache.flex.core.graphics.Circle;
-			import org.apache.flex.core.graphics.Ellipse;
-			import org.apache.flex.core.graphics.GradientEntry;
-			import org.apache.flex.core.graphics.GraphicsContainer;
-			import org.apache.flex.core.graphics.LinearGradient;
-			import org.apache.flex.core.graphics.Path;
-			import org.apache.flex.core.graphics.Rect;
-			import org.apache.flex.core.graphics.SolidColor;
-			import org.apache.flex.core.graphics.SolidColorStroke;
+			import org.apache.flex.svg.Circle;
+			import org.apache.flex.svg.Ellipse;
+			import org.apache.flex.graphics.GradientEntry;
+			import org.apache.flex.svg.GraphicsContainer;
+			import org.apache.flex.svg.LinearGradient;
+			import org.apache.flex.svg.Path;
+			import org.apache.flex.svg.Rect;
+			import org.apache.flex.graphics.SolidColor;
+			import org.apache.flex.graphics.SolidColorStroke;
 			import org.apache.flex.events.Event;
 
 			protected function viewbase1_initCompleteHandler(event:org.apache.flex.events.Event):void

http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/7d529524/manualtests/FlexJSTest_SVG/src/SkinsView.mxml
----------------------------------------------------------------------
diff --git a/manualtests/FlexJSTest_SVG/src/SkinsView.mxml b/manualtests/FlexJSTest_SVG/src/SkinsView.mxml
index 85ace4e..15a4400 100644
--- a/manualtests/FlexJSTest_SVG/src/SkinsView.mxml
+++ b/manualtests/FlexJSTest_SVG/src/SkinsView.mxml
@@ -22,8 +22,8 @@ limitations under the License.
 				initComplete="viewbase1_initCompleteHandler(event)" >
 	<fx:Script>
 		<![CDATA[
-			import org.apache.flex.core.graphics.Rect;
-			import org.apache.flex.core.graphics.SolidColor;
+			import org.apache.flex.svg.Rect;
+			import org.apache.flex.graphics.SolidColor;
 			import org.apache.flex.events.Event;
 			import org.apache.flex.events.MouseEvent;
 			


Mime
View raw message