0 Replies Latest reply on Nov 19, 2009 7:37 AM by jmurphy67

    [svn:fx-trunk] 11984: Merged 3.x revisions 11672,11898,11927,11952 -> trunk

    jmurphy67 Level 1

      Revision: 11984

      Revision: 11984

      Author:   jimurphy@adobe.com

      Date:     2009-11-19 07:30:34 -0800 (Thu, 19 Nov 2009)

      Log Message:

      ***********

      Merged 3.x revisions 11672,11898,11927,11952 -> trunk

      ........

        r11672 | clucier@adobe.com | 2009-11-11 17:07:26 -0500 (Wed, 11 Nov 2009) | 10 lines

         

        Bugs: SDK-23661

      ........

        r11898 | clucier@adobe.com | 2009-11-17 12:38:44 -0500 (Tue, 17 Nov 2009) | 10 lines

         

        Bugs: SDK-22721

      ........

        r11927 | clucier@adobe.com | 2009-11-18 08:42:28 -0500 (Wed, 18 Nov 2009) | 10 lines

         

        Bugs: SDK-16241

      ........

        r11952 | clucier@adobe.com | 2009-11-18 15:42:08 -0500 (Wed, 18 Nov 2009) | 10 lines

         

        Bugs: SDK-15988

      ........

       

      The majority of files in this change list are svn property changes - removing the svn:mergeinfo property

       

      The following paths are the actual changes from 3.x that were merged:

      frameworks/projects/rpc/src/mx/rpc/soap/SOAPDecoder.as

      frameworks/projects/framework/src/mx/formatters/NumberFormatter.as

      frameworks/projects/framework/src/mx/formatters/NumberBase.as

      frameworks/projects/airframework/src/mx/managers/NativeDragManagerImpl.as

      frameworks/projects/framework/src/mx/controls/ColorPicker.as

       

      Ticket Links:

      ***********

          http://bugs.adobe.com/jira/browse/SDK-23661

          http://bugs.adobe.com/jira/browse/SDK-22721

          http://bugs.adobe.com/jira/browse/SDK-16241

          http://bugs.adobe.com/jira/browse/SDK-15988

       

      Modified Paths:

      **************

          flex/sdk/trunk/frameworks/projects/airframework/src/mx/managers/NativeDragManagerImpl.as

          flex/sdk/trunk/frameworks/projects/framework/src/mx/controls/ColorPicker.as

          flex/sdk/trunk/frameworks/projects/framework/src/mx/formatters/NumberBase.as

          flex/sdk/trunk/frameworks/projects/framework/src/mx/formatters/NumberFormatter.as

          flex/sdk/trunk/frameworks/projects/rpc/src/mx/rpc/soap/SOAPDecoder.as

       

      Property Changed:

      ****************

          flex/sdk/trunk/

          flex/sdk/trunk/checkin-note-template.txt

          flex/sdk/trunk/frameworks/projects/framework/src/mx/accessibility/UIComponentAccProps.as

          flex/sdk/trunk/frameworks/projects/framework/src/mx/collections/AsyncListView.as

          flex/sdk/trunk/frameworks/projects/framework/src/mx/core/ILayoutElement.as

          flex/sdk/trunk/frameworks/projects/framework/src/mx/core/ISWFLoader.as

          flex/sdk/trunk/frameworks/projects/framework/src/mx/core/IVisualElement.as

          flex/sdk/trunk/frameworks/projects/framework/src/mx/core/IVisualElementContainer.as

          flex/sdk/trunk/frameworks/projects/framework/src/mx/utils/SecurityUtil.as

          flex/sdk/trunk/frameworks/projects/spark/asdoc/en_US/spark/components/

          flex/sdk/trunk/frameworks/projects/spark/asdoc/en_US/spark/graphics/

          flex/sdk/trunk/frameworks/projects/spark/asdoc/en_US/spark/primitives/

          flex/sdk/trunk/frameworks/projects/spark/asdoc/en_US/spark/styles/

          flex/sdk/trunk/frameworks/projects/spark/src/spark/components/PopUpAnchor.as

          flex/sdk/trunk/frameworks/projects/spark/src/spark/components/RichEditableText.png

          flex/sdk/trunk/frameworks/projects/spark/src/spark/components/VideoPlayer.as

          flex/sdk/trunk/frameworks/projects/spark/src/spark/components/VideoPlayer.png

          flex/sdk/trunk/frameworks/projects/spark/src/spark/components/VideoPlayer2.as

          flex/sdk/trunk/frameworks/projects/spark/src/spark/components/supportClasses/DisplayLayer .as

          flex/sdk/trunk/frameworks/projects/spark/src/spark/components/supportClasses/RichEditable TextContainerManager.as

          flex/sdk/trunk/frameworks/projects/spark/src/spark/events/DisplayLayerObjectExistenceEven t.as

          flex/sdk/trunk/frameworks/projects/spark/src/spark/events/ElementExistenceEvent.as

          flex/sdk/trunk/frameworks/projects/spark/src/spark/layouts/BasicLayout.as

          flex/sdk/trunk/frameworks/projects/spark/src/spark/layouts/ColumnAlign.as

          flex/sdk/trunk/frameworks/projects/spark/src/spark/layouts/HorizontalAlign.as

          flex/sdk/trunk/frameworks/projects/spark/src/spark/layouts/HorizontalLayout.as

          flex/sdk/trunk/frameworks/projects/spark/src/spark/layouts/RowAlign.as

          flex/sdk/trunk/frameworks/projects/spark/src/spark/layouts/TileLayout.as

          flex/sdk/trunk/frameworks/projects/spark/src/spark/layouts/TileOrientation.as

          flex/sdk/trunk/frameworks/projects/spark/src/spark/layouts/VerticalAlign.as

          flex/sdk/trunk/frameworks/projects/spark/src/spark/layouts/VerticalLayout.as

          flex/sdk/trunk/frameworks/projects/spark/src/spark/layouts/supportClasses/Block.as

          flex/sdk/trunk/frameworks/projects/spark/src/spark/layouts/supportClasses/LayoutBase.as

          flex/sdk/trunk/frameworks/projects/spark/src/spark/layouts/supportClasses/LayoutElementHe lper.as

          flex/sdk/trunk/frameworks/projects/spark/src/spark/layouts/supportClasses/LinearLayoutVec tor.as

          flex/sdk/trunk/frameworks/projects/spark/src/spark/skins/spark/VideoPlayerSkin.mxml

          flex/sdk/trunk/frameworks/projects/spark/src/spark/skins/spark/VideoPlayerSkin2.mxml

          flex/sdk/trunk/frameworks/projects/spark/src/spark/skins/spark/mediaClasses/normal/PlayPa useButtonSkin.mxml

          flex/sdk/trunk/frameworks/projects/spark/src/spark/styles/metadata/AdvancedInheritingText Styles.as

          flex/sdk/trunk/frameworks/projects/spark/src/spark/styles/metadata/BasicInheritingTextSty les.as

          flex/sdk/trunk/frameworks/projects/spark/src/spark/styles/metadata/BasicNonInheritingText Styles.as

          flex/sdk/trunk/modules/compiler/src/java/flex2/compiler/fxg/FlexFXG2SWFTranscoder.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/fxg/FXGConstants.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/fxg/FXGException.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/AbstractFXGNode.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/AbstractShapeNode.jav a

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/BitmapGraphicNode.jav a

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/DefinitionNode.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/DelegateNode.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/EllipseNode.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/FillNode.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/FilterNode.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/GradientEntryNode.jav a

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/GraphicContentNode.ja va

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/GraphicContext.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/GraphicNode.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/GroupDefinitionNode.j ava

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/GroupNode.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/LibraryNode.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/LineNode.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/MaskPropertyNode.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/MaskableNode.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/MaskingNode.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/PathNode.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/PlaceObjectNode.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/RectNode.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/ScalableGradientNode. java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/StrokeNode.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/TextGraphicNode.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/TextNode.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/TransformNode.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/fills/AbstractFillNod e.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/fills/BitmapFillNode. java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/fills/LinearGradientF illNode.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/fills/RadialGradientF illNode.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/fills/SolidColorFillN ode.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/filters/AbstractFilte rNode.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/filters/BevelFilterNo de.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/filters/BlurFilterNod e.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/filters/ColorMatrixFi lterNode.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/filters/DropShadowFil terNode.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/filters/GlowFilterNod e.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/filters/GradientBevel FilterNode.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/filters/GradientGlowF ilterNode.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/strokes/AbstractStrok eNode.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/strokes/LinearGradien tStrokeNode.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/strokes/RadialGradien tStrokeNode.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/strokes/SolidColorStr okeNode.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/text/AbstractCharacte rTextNode.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/text/AbstractTextNode .java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/text/BRNode.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/text/ParagraphNode.ja va

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/text/SpanNode.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/transforms/AbstractTr ansformNode.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/transforms/ColorTrans formNode.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/transforms/MatrixNode .java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/types/BevelType.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/types/BlendMode.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/types/Caps.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/types/InterpolationMe thod.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/types/Joints.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/types/Kerning.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/types/LineBreak.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/types/MaskType.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/types/ScaleMode.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/types/ScalingGrid.jav a

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/types/SpreadMethod.ja va

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/types/WhiteSpaceColla pse.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/dom/types/Winding.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/sax/FXGSAXScanner.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/swf/ImageHelper.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/swf/ShapeHelper.java

          flex/sdk/trunk/modules/fxgutils/src/java/com/adobe/internal/fxg/swf/TypeHelper.java

          flex/sdk/trunk/modules/webtier/j2ee/bootstrap/

          flex/sdk/trunk/modules/webtier/j2ee/build.properties

          flex/sdk/trunk/modules/webtier/j2ee/build.xml

          flex/sdk/trunk/modules/webtier/j2ee/coldfusion/

          flex/sdk/trunk/modules/webtier/j2ee/lib/

          flex/sdk/trunk/modules/webtier/j2ee/local.properties

          flex/sdk/trunk/modules/webtier/j2ee/readme.txt

          flex/sdk/trunk/modules/webtier/j2ee/servlet/

          flex/sdk/trunk/modules/webtier/j2ee/taglib/