Moved transform classes that were not specific to graphics to core.
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/54fd2b4d Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/54fd2b4d Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/54fd2b4d Branch: refs/heads/develop Commit: 54fd2b4d89fc539a80ee8136f1e45b958868c1f8 Parents: 054a000 Author: yishayw <yishayj...@hotmail.com> Authored: Thu Jul 28 11:45:23 2016 +0300 Committer: yishayw <yishayj...@hotmail.com> Committed: Thu Jul 28 11:45:23 2016 +0300 ---------------------------------------------------------------------- .../projects/Core/src/main/flex/CoreClasses.as | 8 ++- .../flex/org/apache/flex/core/IBeadTransform.as | 45 ++++++++++++++ .../flex/org/apache/flex/core/ITransformHost.as | 62 +++++++++++++++++++ .../flex/org/apache/flex/core/TransformModel.as | 29 +++++++++ .../apache/flex/core/TransformRotateModel.as | 28 +++++++++ .../Graphics/src/main/flex/GraphicsClasses.as | 2 - .../org/apache/flex/graphics/IBeadTransform.as | 46 -------------- .../org/apache/flex/graphics/ITransformHost.as | 64 -------------------- .../org/apache/flex/graphics/TransformModel.as | 31 ---------- .../flex/graphics/TransformRotateModel.as | 28 --------- .../org/apache/flex/svg/GraphicContainer.as | 2 +- .../flex/org/apache/flex/svg/TransformBead.as | 4 +- 12 files changed, 173 insertions(+), 176 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/54fd2b4d/frameworks/projects/Core/src/main/flex/CoreClasses.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/CoreClasses.as b/frameworks/projects/Core/src/main/flex/CoreClasses.as index 2fa67a5..72e9230 100644 --- a/frameworks/projects/Core/src/main/flex/CoreClasses.as +++ b/frameworks/projects/Core/src/main/flex/CoreClasses.as @@ -40,7 +40,8 @@ internal class CoreClasses import org.apache.flex.core.IAlertModel; IAlertModel; import org.apache.flex.core.IBead; IBead; import org.apache.flex.core.IBeadController; IBeadController; - import org.apache.flex.core.IBeadLayout; IBeadLayout; + import org.apache.flex.core.IBeadLayout; IBeadLayout; + import org.apache.flex.core.IBeadTransform; IBeadTransform; import org.apache.flex.core.IBeadModel; IBeadModel; import org.apache.flex.core.IBeadView; IBeadView; COMPILE::SWF @@ -68,6 +69,7 @@ internal class CoreClasses import org.apache.flex.core.IPopUp; IPopUp; import org.apache.flex.core.IRangeModel; IRangeModel; import org.apache.flex.core.ITransformModel; ITransformModel; + import org.apache.flex.core.ITransformHost; ITransformHost; import org.apache.flex.core.IRollOverModel; IRollOverModel; COMPILE::SWF { @@ -147,7 +149,9 @@ internal class CoreClasses import org.apache.flex.core.IDataGridModel; IDataGridModel; import org.apache.flex.core.IDataGridPresentationModel; IDataGridPresentationModel; import org.apache.flex.core.IDateChooserModel; IDateChooserModel; - import org.apache.flex.core.ParentDocumentBead; ParentDocumentBead; + import org.apache.flex.core.ParentDocumentBead; ParentDocumentBead; + import org.apache.flex.core.TransformModel; TransformModel; + import org.apache.flex.core.TransformRotateModel; TransformRotateModel; import org.apache.flex.utils.CSSUtils; CSSUtils; import org.apache.flex.utils.Proxy; Proxy; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/54fd2b4d/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IBeadTransform.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IBeadTransform.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IBeadTransform.as new file mode 100644 index 0000000..41e52e4 --- /dev/null +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IBeadTransform.as @@ -0,0 +1,45 @@ +//////////////////////////////////////////////////////////////////////////////// +// +// 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.core +{ + + /** + * The IBeadTransform interface is the basic interface for the + * container views that transform drawable objects that implement ITransformHost + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public interface IBeadTransform extends IBead + { + + /** + * Transform the ITransformHost. The implementor of this method should + * have concrete knowledge of ITransformHost implementor. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + function transform():void; + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/54fd2b4d/frameworks/projects/Core/src/main/flex/org/apache/flex/core/ITransformHost.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/ITransformHost.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/ITransformHost.as new file mode 100644 index 0000000..3553cc3 --- /dev/null +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/ITransformHost.as @@ -0,0 +1,62 @@ +//////////////////////////////////////////////////////////////////////////////// +// +// 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.core +{ + + + + /** + * The ITransformHost interface is the basic interface for the + * container views that have an IBeadTransform. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public interface ITransformHost extends IStrand + { + /** + * Each ITransformHost has an element that is actually added to + * the platform's display list DOM. It may not be the actual + * component itself. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + COMPILE::SWF + function get transformElement():IFlexJSElement; + + /** + * Each ITransformHost has an element that is actually added to + * the platform's display list DOM. It may not be the actual + * component itself. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + COMPILE::JS + function get transformElement():org.apache.flex.core.WrappedHTMLElement; + + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/54fd2b4d/frameworks/projects/Core/src/main/flex/org/apache/flex/core/TransformModel.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/TransformModel.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/TransformModel.as new file mode 100644 index 0000000..6f0df64 --- /dev/null +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/TransformModel.as @@ -0,0 +1,29 @@ +package org.apache.flex.core +{ + import org.apache.flex.events.Event; + import org.apache.flex.events.EventDispatcher; + import org.apache.flex.geom.Matrix; + + public class TransformModel extends EventDispatcher implements ITransformModel + { + private var _matrix:Matrix; + + public function TransformModel() + { + } + + public function get matrix():Matrix + { + return _matrix; + } + + public function set matrix(value:Matrix):void + { + _matrix = value; + dispatchEvent(new Event(Event.CHANGE)); + } + + public function set strand(value:IStrand):void {} + + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/54fd2b4d/frameworks/projects/Core/src/main/flex/org/apache/flex/core/TransformRotateModel.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/TransformRotateModel.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/TransformRotateModel.as new file mode 100644 index 0000000..b08c767 --- /dev/null +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/TransformRotateModel.as @@ -0,0 +1,28 @@ +package org.apache.flex.core +{ + import org.apache.flex.geom.Matrix; + + + public class TransformRotateModel extends TransformModel + { + private var _angle:Number; + + public function TransformRotateModel() + { + } + + public function get angle():Number + { + return _angle; + } + + public function set angle(value:Number):void + { + _angle = value; + var radians:Number = value * Math.PI/180; + matrix = new Matrix(Math.cos(radians), Math.sin(radians), -Math.sin(radians), Math.cos(radians)); + } + + + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/54fd2b4d/frameworks/projects/Graphics/src/main/flex/GraphicsClasses.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Graphics/src/main/flex/GraphicsClasses.as b/frameworks/projects/Graphics/src/main/flex/GraphicsClasses.as index 17a1349..55fccb5 100644 --- a/frameworks/projects/Graphics/src/main/flex/GraphicsClasses.as +++ b/frameworks/projects/Graphics/src/main/flex/GraphicsClasses.as @@ -39,8 +39,6 @@ internal class GraphicsClasses 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.TransformModel; TransformModel; - import org.apache.flex.graphics.TransformRotateModel; TransformRotateModel; import org.apache.flex.svg.TransformBead; TransformBead; } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/54fd2b4d/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/IBeadTransform.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/IBeadTransform.as b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/IBeadTransform.as deleted file mode 100644 index 1a8f61c..0000000 --- a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/IBeadTransform.as +++ /dev/null @@ -1,46 +0,0 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// 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.graphics -{ - import org.apache.flex.core.IBead; - - /** - * The IBeadTransform interface is the basic interface for the - * container views that transform drawable objects that implement ITransformHost - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - public interface IBeadTransform extends IBead - { - - /** - * Transform the ITransformHost. The implementor of this method should - * have concrete knowledge of ITransformHost implementor. - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - function transform():void; - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/54fd2b4d/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/ITransformHost.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/ITransformHost.as b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/ITransformHost.as deleted file mode 100644 index 6310dd0..0000000 --- a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/ITransformHost.as +++ /dev/null @@ -1,64 +0,0 @@ -//////////////////////////////////////////////////////////////////////////////// -// -// 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.graphics -{ - import org.apache.flex.core.IFlexJSElement; - import org.apache.flex.core.IStrand; - - - - /** - * The ITransformHost interface is the basic interface for the - * container views that have an IBeadTransform. - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - public interface ITransformHost extends IStrand - { - /** - * Each ITransformHost has an element that is actually added to - * the platform's display list DOM. It may not be the actual - * component itself. - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - COMPILE::SWF - function get transformElement():IFlexJSElement; - - /** - * Each ITransformHost has an element that is actually added to - * the platform's display list DOM. It may not be the actual - * component itself. - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ - COMPILE::JS - function get transformElement():org.apache.flex.core.WrappedHTMLElement; - - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/54fd2b4d/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/TransformModel.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/TransformModel.as b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/TransformModel.as deleted file mode 100644 index 68d650b..0000000 --- a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/TransformModel.as +++ /dev/null @@ -1,31 +0,0 @@ -package org.apache.flex.graphics -{ - import org.apache.flex.core.IStrand; - import org.apache.flex.core.ITransformModel; - import org.apache.flex.events.Event; - import org.apache.flex.events.EventDispatcher; - import org.apache.flex.geom.Matrix; - - public class TransformModel extends EventDispatcher implements ITransformModel - { - private var _matrix:Matrix; - - public function TransformModel() - { - } - - public function get matrix():Matrix - { - return _matrix; - } - - public function set matrix(value:Matrix):void - { - _matrix = value; - dispatchEvent(new Event(Event.CHANGE)); - } - - public function set strand(value:IStrand):void {} - - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/54fd2b4d/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/TransformRotateModel.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/TransformRotateModel.as b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/TransformRotateModel.as deleted file mode 100644 index 2dd97fc..0000000 --- a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/TransformRotateModel.as +++ /dev/null @@ -1,28 +0,0 @@ -package org.apache.flex.graphics -{ - import org.apache.flex.geom.Matrix; - - - public class TransformRotateModel extends TransformModel - { - private var _angle:Number; - - public function TransformRotateModel() - { - } - - public function get angle():Number - { - return _angle; - } - - public function set angle(value:Number):void - { - _angle = value; - var radians:Number = value * Math.PI/180; - matrix = new Matrix(Math.cos(radians), Math.sin(radians), -Math.sin(radians), Math.cos(radians)); - } - - - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/54fd2b4d/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/GraphicContainer.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/GraphicContainer.as b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/GraphicContainer.as index 351bcec..0967b85 100644 --- a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/GraphicContainer.as +++ b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/GraphicContainer.as @@ -15,7 +15,7 @@ package org.apache.flex.svg { import org.apache.flex.core.ContainerBase; import org.apache.flex.core.IFlexJSElement; - import org.apache.flex.graphics.ITransformHost; + import org.apache.flex.core.ITransformHost; COMPILE::JS { http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/54fd2b4d/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/TransformBead.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/TransformBead.as b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/TransformBead.as index 3cba59b..e852db5 100644 --- a/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/TransformBead.as +++ b/frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/TransformBead.as @@ -4,8 +4,8 @@ package org.apache.flex.svg import org.apache.flex.core.ITransformModel; import org.apache.flex.events.Event; import org.apache.flex.geom.Matrix; - import org.apache.flex.graphics.IBeadTransform; - import org.apache.flex.graphics.ITransformHost; + import org.apache.flex.core.IBeadTransform; + import org.apache.flex.core.ITransformHost; COMPILE::SWF { import flash.display.Sprite;
