clean compile on AS side
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/416f7be3 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/416f7be3 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/416f7be3 Branch: refs/heads/spark Commit: 416f7be35096c4b3693a5359c52924869752617b Parents: 390a1d8 Author: Alex Harui <[email protected]> Authored: Tue Feb 23 21:43:52 2016 -0800 Committer: Alex Harui <[email protected]> Committed: Tue Feb 23 21:44:22 2016 -0800 ---------------------------------------------------------------------- .../main/flex/org/apache/flex/utils/Proxy.as | 17 +- .../projects/HTML/.actionScriptProperties | 20 +- frameworks/projects/HTML/.flexLibProperties | 18 - .../MX/src/main/flex/flex/events/Event.as | 1 + .../MX/src/main/flex/flex/text/TextField.as | 26 + .../src/main/flex/flex/text/TextFormatAlign.as | 16 + .../src/main/flex/flex/text/TextLineMetrics.as | 38 + .../MX/src/main/flex/mx/core/IIMESupport.as | 87 + .../src/main/flex/mx/core/ITextFieldFactory.as | 78 + .../main/flex/mx/core/ITextFieldInterface.as | 610 ++++ .../MX/src/main/flex/mx/core/IUITextField.as | 155 + .../MX/src/main/flex/mx/core/UIComponent.as | 11 +- .../MX/src/main/flex/mx/core/UITextField.as | 2709 ++++++++++++++++++ .../MX/src/main/flex/mx/core/UITextFormat.as | 649 +++++ .../src/main/flex/mx/styles/StyleProtoChain.as | 33 +- .../MX/src/main/flex/mx/utils/OrderedObject.as | 360 +++ 16 files changed, 4761 insertions(+), 67 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/416f7be3/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/Proxy.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/Proxy.as b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/Proxy.as index 39b6945..ad36a34 100644 --- a/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/Proxy.as +++ b/frameworks/projects/Core/src/main/flex/org/apache/flex/utils/Proxy.as @@ -45,7 +45,7 @@ COMPILE::JS COMPILE::AS3 public dynamic class Proxy extends flash.utils.Proxy { - private var valueMap:Object = {}; + protected var valueMap:Object = {}; override flash_proxy function getProperty(propName:*):* { @@ -100,25 +100,12 @@ public dynamic class Proxy extends flash.utils.Proxy COMPILE::JS public dynamic class Proxy extends EventDispatcher { - /** - * Constructor. - * - * @param delay The number of milliseconds - * to wait before dispatching the event. - * @param repeatCount The number of times to dispatch - * the event. If 0, keep dispatching forever. - * - * @langversion 3.0 - * @playerversion Flash 10.2 - * @playerversion AIR 2.6 - * @productversion FlexJS 0.0 - */ public function Proxy() { } - private var valueMap:Object = {}; + protected var valueMap:Object = {}; public function getProperty(propName:String):* { http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/416f7be3/frameworks/projects/HTML/.actionScriptProperties ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/.actionScriptProperties b/frameworks/projects/HTML/.actionScriptProperties index eef34a6..0fb9630 100644 --- a/frameworks/projects/HTML/.actionScriptProperties +++ b/frameworks/projects/HTML/.actionScriptProperties @@ -1,24 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- - -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. - ---> <actionScriptProperties analytics="false" mainApplicationPath="HTML.as" projectUUID="10468643-4626-481f-ba6b-3f035ccbbabb" version="11"> - <compiler additionalCompilerArguments="-locale en_US -define=COMPILE::AS3,true -define=COMPILE::JS,false -load-config=../resources/compile-config.xml" autoRSLOrdering="true" copyDependentFiles="false" fteInMXComponents="false" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="false" htmlHistoryManagement="false" htmlPlayerVersionCheck="true" includeNetmonSwc="false" outputFolderPath="target" removeUnusedRSL="true" sourceFolderPath="src/main/flex" strict="true" targetPlayerVersion="0.0.0" useApolloConfig="false" useDebugRSLSwfs="true" useFlashSDK="false" verifyDigests="true" warn="true"> + <compiler additionalCompilerArguments="-locale en_US -define=COMPILE::AS3,true -define=COMPILE::JS,false -load-config=../resources/compile-config.xml" autoRSLOrdering="true" copyDependentFiles="false" fteInMXComponents="false" generateAccessible="false" htmlExpressInstall="true" htmlGenerate="false" htmlHistoryManagement="false" htmlPlayerVersionCheck="true" includeNetmonSwc="false" outputFolderPath="target" removeUnusedRSL="true" sourceFolderPath="src/main/flex" strict="true" targetPlayerVersion="0.0.0" useApolloConfig="true" useDebugRSLSwfs="true" useFlashSDK="false" verifyDigests="true" warn="true"> <compilerSourcePath/> <libraryPath defaultLinkType="0"> <libraryPathEntry kind="4" path=""> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/416f7be3/frameworks/projects/HTML/.flexLibProperties ---------------------------------------------------------------------- diff --git a/frameworks/projects/HTML/.flexLibProperties b/frameworks/projects/HTML/.flexLibProperties index 20339ea..1fbacb4 100644 --- a/frameworks/projects/HTML/.flexLibProperties +++ b/frameworks/projects/HTML/.flexLibProperties @@ -1,22 +1,4 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- - - 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. - ---> <flexLibProperties includeAllClasses="true" useMultiPlatformConfig="false" version="3"> <includeClasses/> <includeResources/> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/416f7be3/frameworks/projects/MX/src/main/flex/flex/events/Event.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MX/src/main/flex/flex/events/Event.as b/frameworks/projects/MX/src/main/flex/flex/events/Event.as index c8e9d2b..558afa5 100644 --- a/frameworks/projects/MX/src/main/flex/flex/events/Event.as +++ b/frameworks/projects/MX/src/main/flex/flex/events/Event.as @@ -10,6 +10,7 @@ package flex.events } public static const ADDED:String = "added"; + public static const CHANGE:String = "change"; public static const ENTER_FRAME:String = "enterFrame"; public static const REMOVED:String = "removed"; public static const REMOVED_FROM_STAGE:String = "removedFromStage"; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/416f7be3/frameworks/projects/MX/src/main/flex/flex/text/TextField.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MX/src/main/flex/flex/text/TextField.as b/frameworks/projects/MX/src/main/flex/flex/text/TextField.as new file mode 100644 index 0000000..a60bac1 --- /dev/null +++ b/frameworks/projects/MX/src/main/flex/flex/text/TextField.as @@ -0,0 +1,26 @@ +package flex.text +{ +COMPILE::AS3 +{ + import flash.text.TextField; +} +COMPILE::JS +{ + import org.apache.flex.html.Label; +} + +COMPILE::AS3 +public class TextField extends flash.text.TextField +{ + public function TextField() + { + super(); + } +} + +COMPILE::JS +public class TextField extends Label implements IUITextField +{ + +} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/416f7be3/frameworks/projects/MX/src/main/flex/flex/text/TextFormatAlign.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MX/src/main/flex/flex/text/TextFormatAlign.as b/frameworks/projects/MX/src/main/flex/flex/text/TextFormatAlign.as new file mode 100644 index 0000000..6305621 --- /dev/null +++ b/frameworks/projects/MX/src/main/flex/flex/text/TextFormatAlign.as @@ -0,0 +1,16 @@ +package flex.text +{ + public class TextFormatAlign + { + public function TextFormatAlign() + { + } + + public static const CENTER:String = "center"; + public static const END:String = "end"; + public static const JUSTIFY:String = "justify"; + public static const LEFT:String = "left"; + public static const RIGHT:String = "right"; + public static const START:String = "start"; + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/416f7be3/frameworks/projects/MX/src/main/flex/flex/text/TextLineMetrics.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MX/src/main/flex/flex/text/TextLineMetrics.as b/frameworks/projects/MX/src/main/flex/flex/text/TextLineMetrics.as new file mode 100644 index 0000000..d501d40 --- /dev/null +++ b/frameworks/projects/MX/src/main/flex/flex/text/TextLineMetrics.as @@ -0,0 +1,38 @@ +package flex.text +{ +COMPILE::AS3 +{ + import flash.text.TextLineMetrics; +} + +COMPILE::AS3 +public class TextLineMetrics extends flash.text.TextLineMetrics +{ + public function TextLineMetrics(x:Number, width:Number, height:Number, ascent:Number, descent:Number, leading:Number) + { + super(x, width, height, ascent, descent, leading); + } + +} + +COMPILE::JS +public class TextLineMetrics +{ + public function TextLineMetrics(x:Number, width:Number, height:Number, ascent:Number, descent:Number, leading:Number) + { + this.x = x; + this.width = width; + this.height = height; + this.ascent = ascent; + this.descent = descent; + this.leading = leading; + } + + public var x:Number; + public var width:Number; + public var height:Number; + public var ascent:Number; + public var descent:Number; + public var leading:Number; +} +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/416f7be3/frameworks/projects/MX/src/main/flex/mx/core/IIMESupport.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MX/src/main/flex/mx/core/IIMESupport.as b/frameworks/projects/MX/src/main/flex/mx/core/IIMESupport.as new file mode 100644 index 0000000..0870e49 --- /dev/null +++ b/frameworks/projects/MX/src/main/flex/mx/core/IIMESupport.as @@ -0,0 +1,87 @@ +//////////////////////////////////////////////////////////////////////////////// +// +// 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 mx.core +{ + +/** + * The IIMESupport interface defines the interface for any component that supports IME + * (input method editor). + * IME is used for entering characters in Chinese, Japanese, and Korean. + * + * @see flash.system.IME + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ +public interface IIMESupport +{ + //-------------------------------------------------------------------------- + // + // Properties + // + //-------------------------------------------------------------------------- + + //---------------------------------- + // enableIME + //---------------------------------- + + /** + * Specifies whether the IME should be enabled when + * this component has focus. Even if a component + * uses the IME, it may not in all configurations. + * For example, TextArea will set enableIME to false + * if its <code>editable</code> is <code>false</code> since no + * input is allowed in that configuration. Similarly + * DataGrid always sets enableIME to false. If + * the DataGrid puts up an ItemEditor, its editor + * will have <code>enableIME</code> set to <code>true</code>. + * + * @langversion 3.0 + * @playerversion Flash 10 + * @playerversion AIR 1.5 + * @productversion Flex 4 + */ + function get enableIME():Boolean; + + //---------------------------------- + // imeMode + //---------------------------------- + + /** + * The IME mode of the component. + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function get imeMode():String; + + /** + * @private + */ + function set imeMode(value:String):void; + + +} + +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/416f7be3/frameworks/projects/MX/src/main/flex/mx/core/ITextFieldFactory.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MX/src/main/flex/mx/core/ITextFieldFactory.as b/frameworks/projects/MX/src/main/flex/mx/core/ITextFieldFactory.as new file mode 100644 index 0000000..95c52eb --- /dev/null +++ b/frameworks/projects/MX/src/main/flex/mx/core/ITextFieldFactory.as @@ -0,0 +1,78 @@ +//////////////////////////////////////////////////////////////////////////////// +// +// 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 mx.core +{ + +COMPILE::AS3 +{ + import flash.text.TextField; +} +COMPILE::JS +{ + import flash.text.TextField; +} + +[ExcludeClass] + +/** + * @private + * Interface to create instances of TextField and FTETextField. + * These are re-used so that there are no more than one of each + * per module factory. + */ +public interface ITextFieldFactory +{ + /** + * Creates an instance of TextField + * in the context of the specified IFlexModuleFactory. + * + * @param moduleFactory The IFlexModuleFactory requesting the TextField. + * + * @return A FTETextField created in the context + * of <code>moduleFactory</code>. + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function createTextField(moduleFactory:IFlexModuleFactory):TextField; + + /** + * Creates an instance of FTETextField + * in the context of the specified module factory. + * + * @param moduleFactory The IFlexModuleFactory requesting the TextField. + * May not be <code>null</code>. + * + * @return A FTETextField created in the context + * of <code>moduleFactory</code>. + * The return value is loosely typed as Object + * to avoid linking in FTETextField (and therefore much of TLF). + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 4 + */ + function createFTETextField(moduleFactory:IFlexModuleFactory):Object; +} + +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/416f7be3/frameworks/projects/MX/src/main/flex/mx/core/ITextFieldInterface.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MX/src/main/flex/mx/core/ITextFieldInterface.as b/frameworks/projects/MX/src/main/flex/mx/core/ITextFieldInterface.as new file mode 100644 index 0000000..15cd952 --- /dev/null +++ b/frameworks/projects/MX/src/main/flex/mx/core/ITextFieldInterface.as @@ -0,0 +1,610 @@ +//////////////////////////////////////////////////////////////////////////////// +// +// 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. +// +//////////////////////////////////////////////////////////////////////////////// + +/** + * The ITextField interface defines the basic set of APIs + * for flash.display.TextField + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + + /** + * @copy flash.text.TextField#alwaysShowSelection + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function get alwaysShowSelection():Boolean; + function set alwaysShowSelection(value:Boolean):void; + + /** + * @copy flash.text.TextField#antiAliasType + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function get antiAliasType():String; + function set antiAliasType(antiAliasType:String):void; + + /** + * @copy flash.text.TextField#autoSize + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function get autoSize():String; + function set autoSize(value:String):void; + + /** + * @copy flash.text.TextField#background + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function get background():Boolean; + function set background(value:Boolean):void; + + /** + * @copy flash.text.TextField#backgroundColor + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function get backgroundColor():uint; + function set backgroundColor(value:uint):void; + + /** + * @copy flash.text.TextField#border + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function get border():Boolean; + function set border(value:Boolean):void; + + /** + * @copy flash.text.TextField#borderColor + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function get borderColor():uint; + function set borderColor(value:uint):void; + + /** + * @copy flash.text.TextField#bottomScrollV + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function get bottomScrollV():int; + + /** + * @copy flash.text.TextField#caretIndex + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function get caretIndex():int; + + /** + * @copy flash.text.TextField#condenseWhite + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function get condenseWhite():Boolean; + function set condenseWhite(value:Boolean):void; + + /** + * @copy flash.text.TextField#defaultTextFormat + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function get defaultTextFormat():TextFormat; + function set defaultTextFormat(format:TextFormat):void; + + /** + * @copy flash.text.TextField#embedFonts + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function get embedFonts():Boolean; + function set embedFonts(value:Boolean):void; + + /** + * @copy flash.text.TextField#gridFitType + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function get gridFitType():String; + function set gridFitType(gridFitType:String):void; + + /** + * @copy flash.text.TextField#htmlText + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function get htmlText():String; + function set htmlText(value:String):void; + + /** + * @copy flash.text.TextField#length + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function get length():int; + + /** + * @copy flash.text.TextField#maxChars + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function get maxChars():int; + function set maxChars(value:int):void; + + /** + * @copy flash.text.TextField#maxScrollH + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function get maxScrollH():int; + + /** + * @copy flash.text.TextField#maxScrollV + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function get maxScrollV():int; + + /** + * @copy flash.text.TextField#mouseWheelEnabled + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function get mouseWheelEnabled():Boolean; + function set mouseWheelEnabled(value:Boolean):void; + + /** + * @copy flash.text.TextField#multiline + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function get multiline():Boolean; + function set multiline(value:Boolean):void; + + /** + * @copy flash.text.TextField#numLines + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function get numLines():int; + + /** + * @copy flash.text.TextField#displayAsPassword + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function get displayAsPassword():Boolean; + function set displayAsPassword(value:Boolean):void; + + /** + * @copy flash.text.TextField#restrict + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function get restrict():String; + function set restrict(value:String):void; + + /** + * @copy flash.text.TextField#scrollH + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function get scrollH():int; + function set scrollH(value:int):void; + + /** + * @copy flash.text.TextField#scrollV + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function get scrollV():int; + function set scrollV(value:int):void; + + /** + * @copy flash.text.TextField#selectable + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function get selectable():Boolean; + function set selectable(value:Boolean):void; + + /** + * @copy flash.text.TextField#selectionBeginIndex + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function get selectionBeginIndex():int; + + /** + * @copy flash.text.TextField#selectionEndIndex + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function get selectionEndIndex():int; + + /** + * @copy flash.text.TextField#sharpness + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function get sharpness():Number; + function set sharpness(value:Number):void; + + /** + * @copy flash.text.TextField#styleSheet + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function get styleSheet():StyleSheet; + function set styleSheet(value:StyleSheet):void; + + /** + * @copy flash.text.TextField#text + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function get text():String; + function set text(value:String):void; + + /** + * @copy flash.text.TextField#textColor + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function get textColor():uint; + function set textColor(value:uint):void; + + /** + * @copy flash.text.TextField#textHeight + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function get textHeight():Number; + + /** + * @copy flash.text.TextField#textWidth + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function get textWidth():Number; + + /** + * @copy flash.text.TextField#thickness + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function get thickness():Number; + function set thickness(value:Number):void; + + /** + * @copy flash.text.TextField#type + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function get type():String; + function set type(value:String):void; + + /** + * @copy flash.text.TextField#wordWrap + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function get wordWrap():Boolean; + function set wordWrap(value:Boolean):void; + + + /** + * @copy flash.text.TextField#appendText() + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function appendText(newText:String):void; + + /** + * @copy flash.text.TextField#getCharBoundaries() + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function getCharBoundaries(charIndex:int):Rectangle; + + /** + * @copy flash.text.TextField#getCharIndexAtPoint() + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function getCharIndexAtPoint(x:Number, y:Number):int; + + /** + * @copy flash.text.TextField#getFirstCharInParagraph() + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function getFirstCharInParagraph(charIndex:int):int; + + /** + * @copy flash.text.TextField#getLineIndexAtPoint() + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function getLineIndexAtPoint(x:Number, y:Number):int; + + /** + * @copy flash.text.TextField#getLineIndexOfChar() + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function getLineIndexOfChar(charIndex:int):int; + + /** + * @copy flash.text.TextField#getLineLength() + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function getLineLength(lineIndex:int):int; + + /** + * @copy flash.text.TextField#getLineMetrics() + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function getLineMetrics(lineIndex:int):TextLineMetrics; + + /** + * @copy flash.text.TextField#getLineOffset() + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function getLineOffset(lineIndex:int):int; + + /** + * @copy flash.text.TextField#getLineText() + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function getLineText(lineIndex:int):String; + + /** + * @copy flash.text.TextField#getParagraphLength() + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function getParagraphLength(charIndex:int):int; + + /** + * @copy flash.text.TextField#getTextFormat() + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function getTextFormat(beginIndex:int=-1, endIndex:int=-1):TextFormat; + + /** + * @copy flash.text.TextField#replaceSelectedText() + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function replaceSelectedText(value:String):void; + + /** + * @copy flash.text.TextField#replaceText() + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function replaceText(beginIndex:int, endIndex:int, newText:String):void; + + /** + * @copy flash.text.TextField#setSelection() + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function setSelection(beginIndex:int, endIndex:int):void; + + /** + * @copy flash.text.TextField#setTextFormat() + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function setTextFormat(format:TextFormat, + beginIndex:int=-1, + endIndex:int=-1):void; + + /** + * @copy flash.text.TextField#getImageReference() + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function getImageReference(id:String):DisplayObject; + + /** + * @copy flash.text.TextField#useRichTextClipboard + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function get useRichTextClipboard():Boolean; + function set useRichTextClipboard(value:Boolean):void; + http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/416f7be3/frameworks/projects/MX/src/main/flex/mx/core/IUITextField.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MX/src/main/flex/mx/core/IUITextField.as b/frameworks/projects/MX/src/main/flex/mx/core/IUITextField.as new file mode 100644 index 0000000..4c9c1db --- /dev/null +++ b/frameworks/projects/MX/src/main/flex/mx/core/IUITextField.as @@ -0,0 +1,155 @@ +//////////////////////////////////////////////////////////////////////////////// +// +// 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 mx.core +{ + +import flash.display.DisplayObject; +import flash.geom.Rectangle; +import flash.text.StyleSheet; +import flash.text.TextFormat; +import flash.text.TextLineMetrics; +import mx.managers.IToolTipManagerClient; +import mx.styles.ISimpleStyleClient; + +/** + * The IUITextField interface defines the basic set of APIs + * for UITextField instances. + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ +public interface IUITextField extends IIMESupport, + IFlexModule, + IInvalidating, ISimpleStyleClient, + IToolTipManagerClient, IUIComponent +{ + + include "ITextFieldInterface.as" + include "IInteractiveObjectInterface.as" + + /** + * @copy mx.core.UITextField#ignorePadding + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function get ignorePadding():Boolean; + function set ignorePadding(value:Boolean):void; + + /** + * @copy mx.core.UITextField#inheritingStyles + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function get inheritingStyles():Object; + function set inheritingStyles(value:Object):void; + + /** + * @copy mx.core.UITextField#nestLevel + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function get nestLevel():int; + function set nestLevel(value:int):void; + + /** + * @copy mx.core.UITextField#nonInheritingStyles + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function get nonInheritingStyles():Object; + function set nonInheritingStyles(value:Object):void; + + /** + * @copy mx.core.UITextField#nonZeroTextHeight + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function get nonZeroTextHeight():Number; + + /** + * @copy mx.core.UITextField#getStyle() + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function getStyle(styleProp:String):*; + + /** + * @copy mx.core.UITextField#getUITextFormat() + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function getUITextFormat():UITextFormat + + /** + * @copy mx.core.UITextField#setColor() + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function setColor(color:uint):void; + + /** + * @copy mx.core.UITextField#setFocus() + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function setFocus():void; + + /** + * @copy mx.core.UITextField#truncateToFit() + * + * @langversion 3.0 + * @playerversion Flash 9 + * @playerversion AIR 1.1 + * @productversion Flex 3 + */ + function truncateToFit(truncationIndicator:String = null):Boolean; + +} + +} http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/416f7be3/frameworks/projects/MX/src/main/flex/mx/core/UIComponent.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MX/src/main/flex/mx/core/UIComponent.as b/frameworks/projects/MX/src/main/flex/mx/core/UIComponent.as index 32c70ed..427550e 100644 --- a/frameworks/projects/MX/src/main/flex/mx/core/UIComponent.as +++ b/frameworks/projects/MX/src/main/flex/mx/core/UIComponent.as @@ -69,10 +69,17 @@ import flash.geom.Transform; import flash.geom.Vector3D; import flash.system.ApplicationDomain; import flash.system.Capabilities; -import flash.text.TextFormatAlign; -import flash.text.TextLineMetrics; import flash.utils.Dictionary; */ +import flex.text.TextLineMetrics; +COMPILE::AS3 +{ + import flash.text.TextFormatAlign; +} +COMPILE::JS +{ + import flex.text.TextFormatAlign; +} import org.apache.flex.reflection.getQualifiedClassName; import mx.automation.IAutomationObject;
