fix imports after merge
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/1890e89d Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/1890e89d Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/1890e89d Branch: refs/heads/core_js_to_as Commit: 1890e89df8ef786c40171b01d18a6fd8fa23ddb6 Parents: 30a08a8 Author: Alex Harui <aha...@apache.org> Authored: Thu Sep 17 10:08:56 2015 -0700 Committer: Alex Harui <aha...@apache.org> Committed: Thu Sep 17 10:08:56 2015 -0700 ---------------------------------------------------------------------- .../as/src/org/apache/flex/core/Application.as | 91 +------------------- 1 file changed, 4 insertions(+), 87 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/1890e89d/frameworks/projects/Core/as/src/org/apache/flex/core/Application.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/as/src/org/apache/flex/core/Application.as b/frameworks/projects/Core/as/src/org/apache/flex/core/Application.as index 5d0bdf9..1d8d7e0 100644 --- a/frameworks/projects/Core/as/src/org/apache/flex/core/Application.as +++ b/frameworks/projects/Core/as/src/org/apache/flex/core/Application.as @@ -18,6 +18,10 @@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.core { + 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; COMPILE::AS3 { @@ -29,11 +33,6 @@ package org.apache.flex.core 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; } //-------------------------------------- @@ -557,86 +556,4 @@ package org.apache.flex.core }; } - - COMPILE::JS { - import org.apache.flex.events.IEventDispatcher; - } - - COMPILE::JS - public class Application extends HTMLElementWrapper implements IParent{ - private var _controller:IBead; - private var _initialView:Object; - - public function start():void { - element = document.getElementsByTagName('body')[0]; - this.element["flexjs_wrapper"] = this; - this.element["className"] = 'Application'; - - MXMLDataInterpreter.generateMXMLInstances(this, null, this.MXMLDescriptor); - - this.dispatchEvent('initialize'); - - if (this.model) this.addBead(this.model); - if (this.controller) this.addBead(controller as IBead); - - this.initialView.applicationModel = this.model; - this.addElement(this.initialView); - - this.dispatchEvent('viewChanged'); - } - - public function generateMXMLAttributes(data:Array):void - { - MXMLDataInterpreter.generateMXMLProperties(this, data); - } - - public function get controller():IBead { - return _controller; - } - - public function set controller(value:IBead):void { - if (value != _controller) - _controller = value; - } - - public function get initialView():Object { - return _initialView; - } - - public function set initialView(value:Object):void { - if (value != _initialView) - _initialView = value; - } - - public function set valuesImpl(value:IValuesImpl):void { - ValuesManager.valuesImpl = value; - if (value.init) { - value.init(this); - } - } - - public function addElement(c:Object, dispatchEvent:Boolean = true):void { - (element as HTMLBodyElement).appendChild(c.element); - c.addedToParent(); - } - - public function addElementAt(c:Object, index:int, dispatchEvent:Boolean = true):void - { - } - - public function getElementIndex(c:Object):int { - return 0; - } - - public function removeElement(c:Object, dispatchEvent:Boolean = true):void { - } - - public function get numElements():int { - return 0; - } - - public function getElementAt(index:int):Object { - return null; - } - } }