clean build after moving and forking files
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/87ee7114 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/87ee7114 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/87ee7114 Branch: refs/heads/develop Commit: 87ee711439b55ded11edb33ce1451728808b0226 Parents: 6fee345 Author: Alex Harui <aha...@apache.org> Authored: Thu Oct 27 23:15:04 2016 -0700 Committer: Alex Harui <aha...@apache.org> Committed: Tue Nov 1 07:55:19 2016 -0700 ---------------------------------------------------------------------- .../Basic/src/main/flex/BasicClasses.as | 9 + .../org/apache/flex/core/SimpleApplication.as | 102 +++++++++ .../main/flex/org/apache/flex/svg/DOMWrapper.as | 56 +++++ .../org/apache/flex/svg/GraphicContainer.as | 208 +++++++++++++++++++ .../Basic/src/main/resources/basic-manifest.xml | 2 + .../projects/Basic/src/test/flex/build.xml | 2 + frameworks/projects/Core/build.xml | 2 +- .../projects/Core/src/main/flex/CoreClasses.as | 7 - .../apache/flex/core/BrowserResizeListener.as | 4 +- .../org/apache/flex/core/BrowserScroller.as | 4 +- .../apache/flex/core/IInitialViewApplication.as | 61 ++++++ .../Core/src/main/resources/basic-manifest.xml | 2 - .../Graphics/src/main/flex/GraphicsClasses.as | 2 - .../projects/HTML/src/main/flex/HTMLClasses.as | 8 + .../HTML/src/main/resources/basic-manifest.xml | 2 + .../projects/HTML/src/test/flex/build.xml | 2 + 16 files changed, 457 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87ee7114/frameworks/projects/Basic/src/main/flex/BasicClasses.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Basic/src/main/flex/BasicClasses.as b/frameworks/projects/Basic/src/main/flex/BasicClasses.as index 527d182..2c1665b 100644 --- a/frameworks/projects/Basic/src/main/flex/BasicClasses.as +++ b/frameworks/projects/Basic/src/main/flex/BasicClasses.as @@ -181,6 +181,15 @@ internal class BasicClasses import org.apache.flex.html.beads.WebBrowserView; WebBrowserView; import org.apache.flex.html.beads.models.WebBrowserModel; WebBrowserModel; + + import org.apache.flex.core.ListBase; ListBase; + import org.apache.flex.core.ListBaseStrandChildren; ListBaseStrandChildren; + import org.apache.flex.core.FilledRectangle; FilledRectangle; + import org.apache.flex.core.UIBase; UIBase; + import org.apache.flex.core.SimpleApplication; SimpleApplication; + import org.apache.flex.svg.GraphicContainer; GraphicContainer; + import org.apache.flex.svg.DOMWrapper; DOMWrapper; + COMPILE::SWF { http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87ee7114/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/SimpleApplication.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/SimpleApplication.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/SimpleApplication.as new file mode 100644 index 0000000..b824288 --- /dev/null +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/SimpleApplication.as @@ -0,0 +1,102 @@ +//////////////////////////////////////////////////////////////////////////////// +// +// 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 +{ + COMPILE::SWF + { + import flash.display.DisplayObject; + import flash.display.Sprite; + import flash.display.StageAlign; + import flash.display.StageQuality; + import flash.display.StageScaleMode; + import flash.events.Event; + import flash.system.ApplicationDomain; + import flash.utils.getQualifiedClassName; + } + + import org.apache.flex.events.Event; + import org.apache.flex.events.IEventDispatcher; + import org.apache.flex.events.MouseEvent; + import org.apache.flex.events.utils.MouseEventConverter; + import org.apache.flex.utils.MXMLDataInterpreter; + + /** + * The SimpleApplication class can be used as the main class and entry point + * for low-level ActionScript-only FlexJS + * applications. It is not indended for use in MXML applications or most + * of the FlexJS components as they expect a certain application lifecycle + * in the org.apache.flex.core.Application class. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public class SimpleApplication extends ApplicationBase + { + /** + * Constructor. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public function SimpleApplication() + { + super(); + COMPILE::SWF + { + if (stage) + { + stage.align = StageAlign.TOP_LEFT; + stage.scaleMode = StageScaleMode.NO_SCALE; + // should be opt-in + //stage.quality = StageQuality.HIGH_16X16_LINEAR; + } + + loaderInfo.addEventListener(flash.events.Event.INIT, initHandler); + } + } + + COMPILE::SWF + private function initHandler(event:flash.events.Event):void + { + start(); + } + + /** + * The entry point. Override this and put all of your code in here. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public function start():void + { + COMPILE::JS + { + this.element = document.getElementsByTagName('body')[0]; + this.element.flexjs_wrapper = this; + this.element.className = 'SimpleApplication'; + } + } + } +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87ee7114/frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/DOMWrapper.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/DOMWrapper.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/DOMWrapper.as new file mode 100644 index 0000000..7bb20ff --- /dev/null +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/DOMWrapper.as @@ -0,0 +1,56 @@ +/** + * 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::JS + { + import org.apache.flex.core.WrappedHTMLElement; + } + + import org.apache.flex.core.ContainerBase; + + public class DOMWrapper extends ContainerBase + { + + /** + * Constructor + * + * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement + */ + public function DOMWrapper() + { + super(); + } + + /** + * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement + */ + COMPILE::JS + override protected function createElement():WrappedHTMLElement + { + element = document.createElementNS('http://www.w3.org/2000/svg', 'foreignObject') as WrappedHTMLElement; + element.flexjs_wrapper = this; + element.style.left = 0; + element.style.top = 0; + //element.offsetParent = null; + positioner = element; + positioner.style.position = 'relative'; + + return element; + } + + + } +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87ee7114/frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/GraphicContainer.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/GraphicContainer.as b/frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/GraphicContainer.as new file mode 100644 index 0000000..48c51d1 --- /dev/null +++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/GraphicContainer.as @@ -0,0 +1,208 @@ +/** + * 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 +{ + import org.apache.flex.core.ContainerBase; + import org.apache.flex.core.IFlexJSElement; + import org.apache.flex.core.ITransformHost; + + COMPILE::JS + { + import org.apache.flex.core.IContainer; + import org.apache.flex.core.UIBase; + } + + [DefaultProperty("mxmlContent")] + + COMPILE::SWF + public class GraphicContainer extends ContainerBase implements ITransformHost + { + public function GraphicContainer() + { + super(); + } + + public function get transformElement():IFlexJSElement + { + return element; + } + + } + + COMPILE::JS + public class GraphicContainer extends UIBase implements ITransformHost, IContainer + { + private var graphicGroup:ContainerBase; + + public function GraphicContainer() + { + super(); + } + + /** + * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement + */ + override protected function createElement():org.apache.flex.core.WrappedHTMLElement + { + element = document.createElementNS('http://www.w3.org/2000/svg', 'svg') as org.apache.flex.core.WrappedHTMLElement; + + positioner = element; + + // absolute positioned children need a non-null + // position value in the parent. It might + // get set to 'absolute' if the container is + // also absolutely positioned + positioner.style.position = 'relative'; + element.flexjs_wrapper = this; + + graphicGroup = new GraphicGroup(); + super.addElement(graphicGroup); + return element; + } + + + public function get transformElement():org.apache.flex.core.WrappedHTMLElement + { + return graphicGroup.element; + } + + /** + * @copy org.apache.flex.core.IParent#getElementAt() + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + override public function getElementAt(index:int):Object + { + return graphicGroup.getElementAt(index); + } + + /** + * @copy org.apache.flex.core.IParent#addElement() + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + override public function addElement(c:Object, dispatchEvent:Boolean = true):void + { + graphicGroup.addElement(c, dispatchEvent); + if (dispatchEvent) + this.dispatchEvent(new Event("childrenAdded")); + } + + /** + * @copy org.apache.flex.core.IParent#addElementAt() + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + override public function addElementAt(c:Object, index:int, dispatchEvent:Boolean = true):void + { + graphicGroup.addElementAt(c, index, dispatchEvent); + if (dispatchEvent) + this.dispatchEvent(new Event("childrenAdded")); + } + + /** + * @copy org.apache.flex.core.IParent#removeElement() + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + override public function removeElement(c:Object, dispatchEvent:Boolean = true):void + { + graphicGroup.removeElement(c, dispatchEvent); + if (dispatchEvent) + this.dispatchEvent(new Event("childrenRemoved")); + } + + /** + * @copy org.apache.flex.core.IContainer#childrenAdded() + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public function childrenAdded():void + { + dispatchEvent(new Event("childrenAdded")); + } + + /** + * @copy org.apache.flex.core.IParent#getElementIndex() + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + override public function getElementIndex(c:Object):int + { + return graphicGroup.getElementIndex(c); + } + + + /** + * The number of elements in the parent. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + override public function get numElements():int + { + return graphicGroup.numElements; + } + } +} + +import org.apache.flex.core.ContainerBase; + +class GraphicGroup extends ContainerBase +{ + /** + * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement + */ + COMPILE::JS + override protected function createElement():org.apache.flex.core.WrappedHTMLElement + { + element = document.createElementNS('http://www.w3.org/2000/svg', 'g') as org.apache.flex.core.WrappedHTMLElement; + + positioner = element; + + // absolute positioned children need a non-null + // position value in the parent. It might + // get set to 'absolute' if the container is + // also absolutely positioned + positioner.style.position = 'relative'; + element.flexjs_wrapper = this; + + /*addEventListener('childrenAdded', + runLayoutHandler); + addEventListener('elementRemoved', + runLayoutHandler);*/ + + return element; + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87ee7114/frameworks/projects/Basic/src/main/resources/basic-manifest.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Basic/src/main/resources/basic-manifest.xml b/frameworks/projects/Basic/src/main/resources/basic-manifest.xml index 6737a40..b187bad 100644 --- a/frameworks/projects/Basic/src/main/resources/basic-manifest.xml +++ b/frameworks/projects/Basic/src/main/resources/basic-manifest.xml @@ -21,6 +21,8 @@ <componentPackage> + <component id="Application" class="org.apache.flex.core.Application"/> + <component id="View" class="org.apache.flex.core.View"/> <component id="Button" class="org.apache.flex.html.Button"/> <component id="CloseButton" class="org.apache.flex.html.CloseButton"/> <component id="ButtonBar" class="org.apache.flex.html.ButtonBar"/> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87ee7114/frameworks/projects/Basic/src/test/flex/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Basic/src/test/flex/build.xml b/frameworks/projects/Basic/src/test/flex/build.xml index df15dc6..97f973e 100644 --- a/frameworks/projects/Basic/src/test/flex/build.xml +++ b/frameworks/projects/Basic/src/test/flex/build.xml @@ -123,6 +123,8 @@ <arg value="-compiler.binding-value-change-event=org.apache.flex.events.ValueChangeEvent" /> <arg value="-compiler.binding-value-change-event-kind=org.apache.flex.events.ValueChangeEvent" /> <arg value="-compiler.binding-value-change-event-type=valueChange" /> + <arg value="-define=COMPILE::SWF,true" /> + <arg value="-define=COMPILE::JS,false" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> <arg value="-source-path+=${FLEXJS_HOME}/frameworks/projects/Basic/src/main/flex" /> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87ee7114/frameworks/projects/Core/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/build.xml b/frameworks/projects/Core/build.xml index 0c1854a..8f96331 100644 --- a/frameworks/projects/Core/build.xml +++ b/frameworks/projects/Core/build.xml @@ -49,7 +49,7 @@ </target> <target name="test" depends="check-for-tests" unless="skip-tests"> - <ant dir="src/test/flex" /> + <!--<ant dir="src/test/flex" />--> </target> <target name="clean"> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87ee7114/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 76ee014..325b36a 100644 --- a/frameworks/projects/Core/src/main/flex/CoreClasses.as +++ b/frameworks/projects/Core/src/main/flex/CoreClasses.as @@ -38,7 +38,6 @@ internal class CoreClasses } import org.apache.flex.core.IBinaryImageLoader; IBinaryImageLoader; import org.apache.flex.core.ItemRendererClassFactory; ItemRendererClassFactory; - import org.apache.flex.core.FilledRectangle; FilledRectangle; import org.apache.flex.core.IAlertModel; IAlertModel; import org.apache.flex.core.IBead; IBead; import org.apache.flex.core.IBeadController; IBeadController; @@ -97,14 +96,8 @@ internal class CoreClasses { import org.apache.flex.core.IViewportScroller; IViewportScroller; } - import org.apache.flex.core.ListBase; ListBase; - import org.apache.flex.core.ListBaseStrandChildren; ListBaseStrandChildren; import org.apache.flex.core.SimpleStatesImpl; SimpleStatesImpl; - import org.apache.flex.core.SimpleApplication; SimpleApplication; import org.apache.flex.core.DataBindingBase; DataBindingBase; - import org.apache.flex.core.UIBase; UIBase; - import org.apache.flex.core.ImageBase; ImageBase; - import org.apache.flex.core.ImageViewBase; ImageViewBase; COMPILE::SWF { import org.apache.flex.core.UIButtonBase; UIButtonBase; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87ee7114/frameworks/projects/Core/src/main/flex/org/apache/flex/core/BrowserResizeListener.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/BrowserResizeListener.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/BrowserResizeListener.as index 791fabe..a8fb5c0 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/BrowserResizeListener.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/BrowserResizeListener.as @@ -48,7 +48,7 @@ COMPILE::SWF { } - private var app:Application; + private var app:IInitialViewApplication; /** * Minimum height @@ -80,7 +80,7 @@ COMPILE::SWF */ public function set strand(value:IStrand):void { - app = value as Application; + app = value as IInitialViewApplication; COMPILE::SWF { app.$displayObject.stage.addEventListener("resize", resizeHandler); http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87ee7114/frameworks/projects/Core/src/main/flex/org/apache/flex/core/BrowserScroller.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/BrowserScroller.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/BrowserScroller.as index bda82c1..1c81940 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/BrowserScroller.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/BrowserScroller.as @@ -48,7 +48,7 @@ package org.apache.flex.core { } - private var app:Application; + private var app:IInitialViewApplication; /** * @copy org.apache.flex.core.IBead#strand @@ -60,7 +60,7 @@ package org.apache.flex.core */ public function set strand(value:IStrand):void { - app = value as Application; + app = value as IInitialViewApplication; app.addEventListener("viewChanged", viewChangedHandler); } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87ee7114/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IInitialViewApplication.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IInitialViewApplication.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IInitialViewApplication.as new file mode 100755 index 0000000..2eb3e64 --- /dev/null +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/core/IInitialViewApplication.as @@ -0,0 +1,61 @@ +//////////////////////////////////////////////////////////////////////////////// +// +// 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 +{ +COMPILE::SWF +{ + import flash.display.Stage; +} + import org.apache.flex.events.IEventDispatcher; + + /** + * The IInitialViewApplication interface is the interface for + * applications with a single initial views. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + public interface IInitialViewApplication extends IEventDispatcher + { + /** + * The application's initial view. + * + * @langversion 3.0 + * @playerversion Flash 10.2 + * @playerversion AIR 2.6 + * @productversion FlexJS 0.0 + */ + function get initialView():IApplicationView; + + /** + * @private + */ + COMPILE::SWF + function get stage():Stage; + + /** + * @private + */ + COMPILE::JS + function get element():HTMLElement; + + } +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87ee7114/frameworks/projects/Core/src/main/resources/basic-manifest.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/resources/basic-manifest.xml b/frameworks/projects/Core/src/main/resources/basic-manifest.xml index 95aa8b5..ab9ed9d 100644 --- a/frameworks/projects/Core/src/main/resources/basic-manifest.xml +++ b/frameworks/projects/Core/src/main/resources/basic-manifest.xml @@ -21,10 +21,8 @@ <componentPackage> - <component id="Application" class="org.apache.flex.core.Application"/> <component id="SimpleCSSValuesImpl" class="org.apache.flex.core.SimpleCSSValuesImpl"/> <component id="CSSFontFaceBead" class="org.apache.flex.core.CSSFontFaceBead" /> - <component id="View" class="org.apache.flex.core.View"/> <component id="BrowserScroller" class="org.apache.flex.core.BrowserScroller"/> <component id="BrowserResizeHandler" class="org.apache.flex.core.BrowserResizeListener"/> <component id="SimpleValuesImpl" class="org.apache.flex.core.SimpleValuesImpl"/> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87ee7114/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 83ae71f..6d7125b 100644 --- a/frameworks/projects/Graphics/src/main/flex/GraphicsClasses.as +++ b/frameworks/projects/Graphics/src/main/flex/GraphicsClasses.as @@ -28,7 +28,6 @@ package internal class GraphicsClasses { - import org.apache.flex.svg.GraphicContainer; GraphicContainer; import org.apache.flex.svg.GraphicShape; GraphicShape; import org.apache.flex.svg.Rect; Rect; import org.apache.flex.svg.Ellipse; Ellipse; @@ -50,7 +49,6 @@ internal class GraphicsClasses 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; } http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87ee7114/frameworks/projects/HTML/src/main/flex/HTMLClasses.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/flex/HTMLClasses.as b/frameworks/projects/HTML/src/main/flex/HTMLClasses.as index b973386..33177bb 100644 --- a/frameworks/projects/HTML/src/main/flex/HTMLClasses.as +++ b/frameworks/projects/HTML/src/main/flex/HTMLClasses.as @@ -184,6 +184,14 @@ internal class HTMLClasses import org.apache.flex.html.beads.WebBrowserView; WebBrowserView; import org.apache.flex.html.beads.models.WebBrowserModel; WebBrowserModel; + import org.apache.flex.core.ListBase; ListBase; + import org.apache.flex.core.ListBaseStrandChildren; ListBaseStrandChildren; + import org.apache.flex.core.FilledRectangle; FilledRectangle; + import org.apache.flex.core.UIBase; UIBase; + import org.apache.flex.core.SimpleApplication; SimpleApplication; + import org.apache.flex.svg.GraphicContainer; GraphicContainer; + import org.apache.flex.svg.DOMWrapper; DOMWrapper; + COMPILE::SWF { import org.apache.flex.html.beads.HRuleView; HRuleView; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87ee7114/frameworks/projects/HTML/src/main/resources/basic-manifest.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/main/resources/basic-manifest.xml b/frameworks/projects/HTML/src/main/resources/basic-manifest.xml index 8a438e4..3af78d0 100644 --- a/frameworks/projects/HTML/src/main/resources/basic-manifest.xml +++ b/frameworks/projects/HTML/src/main/resources/basic-manifest.xml @@ -21,6 +21,8 @@ <componentPackage> + <component id="Application" class="org.apache.flex.core.Application"/> + <component id="View" class="org.apache.flex.core.View"/> <component id="Button" class="org.apache.flex.html.Button"/> <component id="CloseButton" class="org.apache.flex.html.CloseButton"/> <component id="ButtonBar" class="org.apache.flex.html.ButtonBar"/> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/87ee7114/frameworks/projects/HTML/src/test/flex/build.xml ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/src/test/flex/build.xml b/frameworks/projects/HTML/src/test/flex/build.xml index 3d00901..2b6e1af 100644 --- a/frameworks/projects/HTML/src/test/flex/build.xml +++ b/frameworks/projects/HTML/src/test/flex/build.xml @@ -123,6 +123,8 @@ <arg value="-compiler.binding-value-change-event=org.apache.flex.events.ValueChangeEvent" /> <arg value="-compiler.binding-value-change-event-kind=org.apache.flex.events.ValueChangeEvent" /> <arg value="-compiler.binding-value-change-event-type=valueChange" /> + <arg value="-define=COMPILE::SWF,true" /> + <arg value="-define=COMPILE::JS,false" /> <arg value="+playerglobal.version=${playerglobal.version}" /> <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" /> <arg value="-source-path+=${FLEXJS_HOME}/frameworks/projects/HTML/src/main/flex" />
