Merge branch 'refactor-sprite' into develop Conflicts: frameworks/projects/Basic/src/main/flex/org/apache/flex/core/Application.as frameworks/projects/Basic/src/main/flex/org/apache/flex/core/ContainerBaseStrandChildren.as frameworks/projects/Basic/src/main/flex/org/apache/flex/core/ListBase.as frameworks/projects/Basic/src/main/flex/org/apache/flex/core/ListBaseStrandChildren.as frameworks/projects/Basic/src/main/flex/org/apache/flex/core/SimpleApplication.as frameworks/projects/Basic/src/main/flex/org/apache/flex/svg/GraphicContainer.as frameworks/projects/Core/src/main/flex/org/apache/flex/core/Application.as frameworks/projects/Core/src/main/flex/org/apache/flex/core/ContainerBaseStrandChildren.as frameworks/projects/Core/src/main/flex/org/apache/flex/core/ListBase.as frameworks/projects/Core/src/main/flex/org/apache/flex/core/ListBaseStrandChildren.as frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleApplication.as frameworks/projects/Graphics/src/main/flex/org/apache/flex/svg/GraphicContainer.as frameworks/projects/HTML/src/main/flex/org/apache/flex/core/Application.as frameworks/projects/HTML/src/main/flex/org/apache/flex/core/ContainerBaseStrandChildren.as frameworks/projects/HTML/src/main/flex/org/apache/flex/core/ListBase.as frameworks/projects/HTML/src/main/flex/org/apache/flex/core/ListBaseStrandChildren.as frameworks/projects/HTML/src/main/flex/org/apache/flex/core/SimpleApplication.as frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/GraphicContainer.as
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/956037ae Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/956037ae Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/956037ae Branch: refs/heads/develop Commit: 956037aec4a12620d4bbc29005e9043a83125f49 Parents: ecd8e10 1b6c3af Author: Alex Harui <aha...@apache.org> Authored: Tue Nov 1 23:20:17 2016 -0700 Committer: Alex Harui <aha...@apache.org> Committed: Tue Nov 1 23:20:17 2016 -0700 ---------------------------------------------------------------------- .../CordovaCameraExample/src/MyInitialView.mxml | 2 +- .../DataGridExample/src/models/ProductsModel.as | 15 +- .../src/products/ProductItemRenderer.as | 2 +- .../flexjs/FlexJSStore/src/FlexJSStore.mxml | 2 +- examples/flexjs/FlexJSStore/src/HomeView.mxml | 8 +- .../flexjs/FlexJSStore/src/SupportView.mxml | 6 +- .../FlexJSStore/src/productsView/Grip.mxml | 4 +- .../productsView/ProductCatalogThumbnail.mxml | 2 +- .../src/productsView/ProductDetails.mxml | 2 +- .../src/productsView/ProductListItem.mxml | 2 +- .../src/samples/flexstore/ProductThumbEvent.as | 18 +- .../FlexJSStore_jquery/src/FlexJSStore.mxml | 2 +- .../flexjs/FlexJSStore_jquery/src/HomeView.mxml | 10 +- .../FlexJSStore_jquery/src/SupportView.mxml | 6 +- .../src/productsView/Grip.mxml | 4 +- .../productsView/ProductCatalogThumbnail.mxml | 2 +- .../src/productsView/ProductDetails.mxml | 2 +- .../src/productsView/ProductListItem.mxml | 2 +- .../flexjs/MobileTrader/src/MyInitialView.mxml | 2 +- frameworks/build.xml | 1 - .../Basic/src/main/flex/BasicClasses.as | 5 +- .../flex/org/apache/flex/core/Application.as | 46 +- .../flex/org/apache/flex/core/ContainerBase.as | 20 +- .../flex/core/ContainerBaseStrandChildren.as | 10 +- .../org/apache/flex/core/FilledRectangle.as | 2 +- .../org/apache/flex/core/HTMLElementWrapper.as | 265 +++++++++++ .../main/flex/org/apache/flex/core/ImageBase.as | 84 ++++ .../main/flex/org/apache/flex/core/ListBase.as | 10 +- .../apache/flex/core/ListBaseStrandChildren.as | 12 +- .../main/flex/org/apache/flex/core/UIBase.as | 70 ++- .../flex/org/apache/flex/core/UIButtonBase.as | 17 +- .../src/main/flex/org/apache/flex/html/Image.as | 8 +- .../org/apache/flex/html/beads/ComboBoxView.as | 3 +- .../org/apache/flex/html/beads/ContainerView.as | 11 +- .../apache/flex/html/beads/DropDownListView.as | 3 +- .../org/apache/flex/html/beads/ImageView.as | 181 +------- .../apache/flex/html/beads/SliderThumbView.as | 2 +- .../apache/flex/html/beads/WebBrowserView.as | 2 +- .../flex/html/beads/layouts/HorizontalLayout.as | 3 +- .../apache/flex/html/beads/models/ImageModel.as | 12 +- .../html/supportClasses/ContainerContentArea.as | 5 +- .../flex/html/supportClasses/DataGroup.as | 5 +- .../html/supportClasses/ScrollingViewport.as | 5 +- .../supportClasses/TextFieldItemRenderer.as | 16 + .../flex/org/apache/flex/svg/BinaryImage.as | 87 ++++ .../org/apache/flex/svg/GraphicContainer.as | 22 +- .../flex/org/apache/flex/svg/GraphicShape.as | 6 +- .../src/main/flex/org/apache/flex/svg/Image.as | 133 ++++++ .../flex/org/apache/flex/svg/beads/ImageView.as | 87 ++++ .../org/apache/flex/charts/core/IAxisGroup.as | 3 +- .../flex/charts/optimized/SVGChartDataGroup.as | 5 +- .../charts/supportClasses/ChartAxisGroup.as | 8 +- frameworks/projects/Core/.flexLibProperties | 28 +- .../projects/Core/src/main/flex/CoreClasses.as | 26 +- .../org/apache/flex/core/ApplicationFactory.as | 132 ++++++ .../apache/flex/core/BrowserResizeListener.as | 23 +- .../main/flex/org/apache/flex/core/CSSShape.as | 11 +- .../main/flex/org/apache/flex/core/CSSSprite.as | 12 +- .../flex/org/apache/flex/core/CSSTextField.as | 10 +- .../flex/org/apache/flex/core/CallLaterBead.as | 5 +- .../flex/org/apache/flex/core/ElementWrapper.as | 352 ++++++++++++++ .../org/apache/flex/core/HTMLElementWrapper.as | 265 ----------- .../flex/org/apache/flex/core/IBinaryImage.as | 47 ++ .../org/apache/flex/core/IBinaryImageLoader.as | 34 ++ .../org/apache/flex/core/IBinaryImageModel.as | 48 ++ .../main/flex/org/apache/flex/core/IChild.as | 22 +- .../flex/org/apache/flex/core/IContentView.as | 5 +- .../flex/org/apache/flex/core/IFlexJSElement.as | 15 +- .../main/flex/org/apache/flex/core/IImage.as | 50 ++ .../flex/org/apache/flex/core/IImageModel.as | 5 +- .../flex/org/apache/flex/core/IImageView.as | 53 +++ .../apache/flex/core/IInitialViewApplication.as | 7 + .../flex/org/apache/flex/core/IItemRenderer.as | 2 +- .../main/flex/org/apache/flex/core/IParent.as | 10 +- .../org/apache/flex/core/IRenderedObject.as | 44 ++ .../org/apache/flex/core/ISWFApplication.as | 44 ++ .../org/apache/flex/core/ITransformModel.as | 2 +- .../main/flex/org/apache/flex/core/IUIBase.as | 46 +- .../flex/org/apache/flex/core/ImageViewBase.as | 255 +++++++++++ .../org/apache/flex/core/SimpleCSSValuesImpl.as | 3 +- .../org/apache/flex/core/SimpleStatesImpl.as | 13 +- .../apache/flex/core/StyleableCSSTextField.as | 2 +- .../org/apache/flex/core/TransformBeadBase.as | 100 ++++ .../apache/flex/core/UIHTMLElementWrapper.as | 263 +++++++++++ .../org/apache/flex/core/WrappedHTMLElement.as | 2 +- .../org/apache/flex/core/WrappedMovieClip.as | 60 +++ .../flex/org/apache/flex/core/WrappedShape.as | 60 +++ .../org/apache/flex/core/WrappedSimpleButton.as | 65 +++ .../flex/org/apache/flex/core/WrappedSprite.as | 61 +++ .../org/apache/flex/core/WrappedTextField.as | 60 +++ .../flex/org/apache/flex/events/BrowserEvent.as | 9 + .../org/apache/flex/events/ElementEvents.as | 20 + .../main/flex/org/apache/flex/events/Event.as | 71 ++- .../flex/org/apache/flex/events/IFlexJSEvent.as | 48 ++ .../flex/org/apache/flex/events/MouseEvent.as | 67 ++- .../flex/events/utils/MouseEventConverter.as | 7 +- .../main/flex/org/apache/flex/geom/Rectangle.as | 459 ++++++++++--------- .../flex/org/apache/flex/utils/BinaryData.as | 6 +- .../org/apache/flex/utils/CSSBorderUtils.as | 2 +- .../main/flex/org/apache/flex/utils/CSSUtils.as | 14 +- .../flex/org/apache/flex/utils/DisplayUtils.as | 163 +++++++ .../apache/flex/utils/MXMLDataInterpreter.as | 11 +- .../flex/org/apache/flex/utils/PointUtils.as | 22 +- .../main/flex/org/apache/flex/utils/UIUtils.as | 5 +- .../main/flex/org/apache/flex/utils/URLUtils.as | 59 +++ .../flex/utils/ViewSourceContextMenuOption.as | 3 +- .../test/flex/FlexUnitFlexJSApplication.mxml | 3 +- .../org/apache/flex/createjs/Application.as | 24 +- .../org/apache/flex/createjs/core/UIBase.as | 43 +- .../flex/org/apache/flex/events/DragEvent.as | 32 +- .../beads/controllers/DragMouseController.as | 6 +- .../beads/controllers/DropMouseController.as | 5 + .../flex/core/StatesWithTransitionsImpl.as | 9 +- .../org/apache/flex/effects/PlatformWiper.as | 7 +- .../beads/CSSContentAndTextToggleButtonView.as | 28 +- .../flex/flat/beads/CSSScrollBarButtonView.as | 10 +- .../apache/flex/flat/beads/CSSScrollBarView.as | 42 +- .../apache/flex/flat/beads/DropDownListView.as | 33 +- frameworks/projects/GoogleMaps/pom.xml | 13 + .../flex/maps/google/beads/GoogleMapView.as | 2 +- .../projects/Graphics/.actionScriptProperties | 42 +- frameworks/projects/Graphics/.flexLibProperties | 29 +- .../src/main/config/compile-as-config.xml | 9 + .../Graphics/src/main/flex/GraphicsClasses.as | 1 + .../org/apache/flex/graphics/GradientEntry.as | 21 +- .../main/flex/org/apache/flex/graphics/IFill.as | 5 +- .../org/apache/flex/graphics/IGraphicShape.as | 7 - .../flex/org/apache/flex/graphics/IStroke.as | 6 +- .../org/apache/flex/graphics/PathBuilder.as | 19 +- .../flex/org/apache/flex/graphics/SolidColor.as | 11 +- .../apache/flex/graphics/SolidColorStroke.as | 8 +- .../main/flex/org/apache/flex/svg/ClipBead.as | 182 ++++++++ .../flex/org/apache/flex/svg/LinearGradient.as | 17 +- .../flex/org/apache/flex/svg/TransformBead.as | 81 +--- .../Graphics/src/main/resources/defaults.css | 37 ++ .../src/main/resources/svg-manifest.xml | 10 +- .../projects/HTML/.actionScriptProperties | 19 - .../projects/HTML/src/main/flex/HTMLClasses.as | 7 +- .../flex/org/apache/flex/core/Application.as | 313 +++++-------- .../org/apache/flex/core/ApplicationBase.as | 5 +- .../flex/org/apache/flex/core/ContainerBase.as | 30 +- .../flex/core/ContainerBaseStrandChildren.as | 10 +- .../org/apache/flex/core/FilledRectangle.as | 2 +- .../main/flex/org/apache/flex/core/ImageBase.as | 84 ++++ .../main/flex/org/apache/flex/core/ListBase.as | 10 +- .../apache/flex/core/ListBaseStrandChildren.as | 10 +- .../org/apache/flex/core/SimpleApplication.as | 28 +- .../main/flex/org/apache/flex/core/UIBase.as | 295 +++++------- .../flex/org/apache/flex/core/UIButtonBase.as | 154 ++----- .../org/apache/flex/events/ItemAddedEvent.as | 3 +- .../org/apache/flex/events/ItemClickedEvent.as | 3 +- .../org/apache/flex/events/ItemRemovedEvent.as | 3 +- .../org/apache/flex/events/ItemRendererEvent.as | 3 +- .../flex/org/apache/flex/html/BinaryImage.as | 88 ++++ .../src/main/flex/org/apache/flex/html/Image.as | 52 +-- .../flex/org/apache/flex/html/RadioButton.as | 4 +- .../flex/org/apache/flex/html/TextButton.as | 2 +- .../accessories/NumericOnlyTextInputBead.as | 5 +- .../flex/html/accessories/TextPromptBead.as | 4 +- .../flex/html/beads/BackgroundImageBead.as | 4 +- .../apache/flex/html/beads/BinaryImageLoader.as | 121 +++++ .../org/apache/flex/html/beads/CSSButtonView.as | 27 +- .../html/beads/CSSImageAndTextButtonView.as | 39 +- .../apache/flex/html/beads/CSSTextButtonView.as | 40 +- .../org/apache/flex/html/beads/CheckBoxView.as | 23 +- .../apache/flex/html/beads/CloseButtonView.as | 10 +- .../org/apache/flex/html/beads/ComboBoxView.as | 124 ++--- .../org/apache/flex/html/beads/ContainerView.as | 11 +- .../org/apache/flex/html/beads/DisableBead.as | 130 ++++++ .../flex/html/beads/DownArrowButtonView.as | 28 +- .../apache/flex/html/beads/DropDownListView.as | 35 +- .../org/apache/flex/html/beads/HRuleView.as | 8 +- .../flex/html/beads/HScrollBarThumbView.as | 20 +- .../flex/html/beads/HScrollBarTrackView.as | 25 +- .../apache/flex/html/beads/HScrollBarView.as | 31 +- .../apache/flex/html/beads/IScrollBarView.as | 10 +- .../org/apache/flex/html/beads/ISliderView.as | 6 +- .../org/apache/flex/html/beads/ISpinnerView.as | 6 +- .../flex/html/beads/ImageAndTextButtonView.as | 12 +- .../apache/flex/html/beads/ImageButtonView.as | 27 +- .../org/apache/flex/html/beads/ImageView.as | 181 +------- .../flex/html/beads/LeftArrowButtonView.as | 22 +- .../apache/flex/html/beads/RadioButtonView.as | 25 +- .../flex/html/beads/RightArrowButtonView.as | 22 +- .../org/apache/flex/html/beads/ScrollBarView.as | 16 +- .../flex/html/beads/SingleLineBorderBead.as | 2 +- .../apache/flex/html/beads/SliderThumbView.as | 15 +- .../apache/flex/html/beads/SliderTrackView.as | 13 +- .../org/apache/flex/html/beads/SliderView.as | 36 +- .../flex/html/beads/SolidBackgroundBead.as | 18 +- .../org/apache/flex/html/beads/SpinnerView.as | 30 +- .../org/apache/flex/html/beads/TextAreaView.as | 23 +- .../apache/flex/html/beads/TextButtonView.as | 18 +- .../apache/flex/html/beads/TextFieldViewBase.as | 2 +- .../apache/flex/html/beads/UpArrowButtonView.as | 22 +- .../org/apache/flex/html/beads/VRuleView.as | 8 +- .../flex/html/beads/VScrollBarThumbView.as | 30 +- .../flex/html/beads/VScrollBarTrackView.as | 25 +- .../apache/flex/html/beads/VScrollBarView.as | 24 +- .../apache/flex/html/beads/WebBrowserView.as | 2 +- .../html/beads/controllers/AlertController.as | 4 +- .../beads/controllers/ComboBoxController.as | 15 +- .../beads/controllers/DropDownListController.as | 21 +- .../controllers/HScrollBarMouseController.as | 14 +- .../controllers/VScrollBarMouseController.as | 14 +- .../flex/html/beads/layouts/BasicLayout.as | 10 +- .../flex/html/beads/layouts/HScrollBarLayout.as | 26 +- .../flex/html/beads/layouts/HorizontalLayout.as | 4 +- .../flex/html/beads/layouts/VScrollBarLayout.as | 16 +- .../flex/html/beads/models/BinaryImageModel.as | 86 ++++ .../apache/flex/html/beads/models/ImageModel.as | 17 +- .../html/supportClasses/ContainerContentArea.as | 7 +- .../flex/html/supportClasses/DataGroup.as | 5 +- .../html/supportClasses/DataItemRenderer.as | 2 +- .../html/supportClasses/ScrollingViewport.as | 15 +- .../html/supportClasses/StringItemRenderer.as | 2 +- .../supportClasses/TextFieldItemRenderer.as | 15 +- .../flex/org/apache/flex/svg/BinaryImage.as | 87 ++++ .../src/main/flex/org/apache/flex/svg/Circle.as | 5 +- .../flex/org/apache/flex/svg/CompoundGraphic.as | 21 +- .../main/flex/org/apache/flex/svg/Ellipse.as | 37 +- .../org/apache/flex/svg/GraphicContainer.as | 23 +- .../flex/org/apache/flex/svg/GraphicShape.as | 28 +- .../src/main/flex/org/apache/flex/svg/Image.as | 133 ++++++ .../src/main/flex/org/apache/flex/svg/Path.as | 4 +- .../src/main/flex/org/apache/flex/svg/Rect.as | 6 +- .../src/main/flex/org/apache/flex/svg/Text.as | 2 +- .../flex/org/apache/flex/svg/beads/ImageView.as | 87 ++++ .../src/main/resources/basic-as-manifest.xml | 2 +- .../HTML/src/main/resources/basic-manifest.xml | 2 + .../HTML/src/main/resources/defaults.css | 9 + .../HTML/src/main/resources/svg-manifest.xml | 8 + .../test/flex/FlexUnitFlexJSApplication.mxml | 3 +- .../flex/org/apache/flex/html5/TransformBead.as | 44 ++ .../HTML5/src/main/resources/html5-manifest.xml | 51 +-- .../org/apache/flex/mobile/IViewManagerView.as | 4 +- .../flex/org/apache/flex/mobile/ManagerBase.as | 11 +- .../apache/flex/mobile/StackedViewManager.as | 3 +- .../apache/flex/mobile/beads/DeviceSizeBead.as | 16 +- .../flex/mobile/beads/MobileWebBrowserView.as | 20 +- .../flex/mobile/models/ViewManagerModel.as | 5 +- .../flex/org/apache/flex/net/BinaryUploader.as | 8 +- .../flex/org/apache/flex/net/HTTPService.as | 8 +- .../flex/org/apache/flex/net/HTTPServiceBase.as | 4 +- .../main/flex/org/apache/flex/net/URLRequest.as | 4 +- .../org/apache/flex/net/URLRequestHeader.as | 62 +++ .../main/flex/org/apache/flex/net/URLStream.as | 44 +- frameworks/projects/XML/src/main/flex/XML.as | 293 ++++++++---- .../projects/XML/src/main/flex/XMLList.as | 310 ++++++++++--- .../src/products/ProductItemRenderer.as | 2 +- .../src/products/ProductItemRenderer.as | 2 +- 251 files changed, 6463 insertions(+), 2755 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/956037ae/frameworks/build.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/956037ae/frameworks/projects/Core/.flexLibProperties ---------------------------------------------------------------------- diff --cc frameworks/projects/Core/.flexLibProperties index 20339ea,4d32599..f107568 --- a/frameworks/projects/Core/.flexLibProperties +++ b/frameworks/projects/Core/.flexLibProperties @@@ -1,24 -1,8 +1,26 @@@ <?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 ++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 ++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. ++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/> + <includeClasses> + <classEntry path="org.apache.flex.core.IBinaryImageLoader"/> + </includeClasses> <includeResources/> <namespaceManifests/> </flexLibProperties> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/956037ae/frameworks/projects/GoogleMaps/pom.xml ---------------------------------------------------------------------- diff --cc frameworks/projects/GoogleMaps/pom.xml index 915bab7,915bab7..71e6134 --- a/frameworks/projects/GoogleMaps/pom.xml +++ b/frameworks/projects/GoogleMaps/pom.xml @@@ -76,6 -76,6 +76,19 @@@ <type>swc</type> <classifier>typedefs</classifier> </dependency> ++ <dependency> ++ <groupId>org.apache.flex.flexjs.framework</groupId> ++ <artifactId>HTML</artifactId> ++ <version>0.8.0-SNAPSHOT</version> ++ <type>swc</type> ++ </dependency> ++ <dependency> ++ <groupId>org.apache.flex.flexjs.framework</groupId> ++ <artifactId>HTML</artifactId> ++ <version>0.8.0-SNAPSHOT</version> ++ <type>swc</type> ++ <classifier>typedefs</classifier> ++ </dependency> <dependency> <groupId>org.apache.flex.flexjs.typedefs</groupId> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/956037ae/frameworks/projects/Graphics/.actionScriptProperties ---------------------------------------------------------------------- diff --cc frameworks/projects/Graphics/.actionScriptProperties index d67949b,49ec6c7..355befe --- a/frameworks/projects/Graphics/.actionScriptProperties +++ b/frameworks/projects/Graphics/.actionScriptProperties @@@ -1,24 -1,6 +1,24 @@@ <?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 ++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 ++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. ++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="Graphics.as" projectUUID="ff3e0531-b7c9-4b0c-9146-05c27a47f837" version="11"> - <compiler additionalCompilerArguments="-locale en_US -define=COMPILE::SWF,true -define=COMPILE::JS,false -load-config=../config/compile-as-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::SWF,true -define=COMPILE::JS,false -load-config=../config/compile-as-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"> <compilerSourcePath/> <libraryPath defaultLinkType="0"> <libraryPathEntry kind="4" path=""> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/956037ae/frameworks/projects/Graphics/.flexLibProperties ---------------------------------------------------------------------- diff --cc frameworks/projects/Graphics/.flexLibProperties index 0d6f4f8,1fbacb4..3de4ff6 --- a/frameworks/projects/Graphics/.flexLibProperties +++ b/frameworks/projects/Graphics/.flexLibProperties @@@ -1,27 -1,6 +1,24 @@@ <?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 ++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 ++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. ++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> - <classEntry path="org.apache.flex.svg.TransformBead"/> - <classEntry path="org.apache.flex.graphics.ITransformHost"/> - </includeClasses> + <includeClasses/> <includeResources/> <namespaceManifests/> </flexLibProperties> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/956037ae/frameworks/projects/Graphics/src/main/resources/svg-manifest.xml ---------------------------------------------------------------------- diff --cc frameworks/projects/Graphics/src/main/resources/svg-manifest.xml index 08d278a,fd08c87..adceb51 --- a/frameworks/projects/Graphics/src/main/resources/svg-manifest.xml +++ b/frameworks/projects/Graphics/src/main/resources/svg-manifest.xml @@@ -20,12 -20,16 +20,8 @@@ <componentPackage> -- <component id="Circle" class="org.apache.flex.svg.Circle" /> -- <component id="Ellipse" class="org.apache.flex.svg.Ellipse" /> -- <component id="Path" class="org.apache.flex.svg.Path" /> -- <component id="Rect" class="org.apache.flex.svg.Rect" /> -- <component id="CompoundGraphic" class="org.apache.flex.svg.CompoundGraphic" /> -- <component id="GraphicContainer" class="org.apache.flex.svg.GraphicContainer" /> <component id="TransformBead" class="org.apache.flex.svg.TransformBead" /> - <component id="LinearGradient" class="org.apache.flex.svg.LinearGradient" /> + <component id="ClipBead" class="org.apache.flex.svg.ClipBead" /> + <component id="LinearGradient" class="org.apache.flex.svg.LinearGradient" /> - <component id="Image" class="org.apache.flex.svg.Image"/> - <component id="BinaryImage" class="org.apache.flex.svg.BinaryImage"/> + </componentPackage> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/956037ae/frameworks/projects/HTML/src/main/resources/svg-manifest.xml ---------------------------------------------------------------------- diff --cc frameworks/projects/HTML/src/main/resources/svg-manifest.xml index a32483e,a32483e..28d4b47 --- a/frameworks/projects/HTML/src/main/resources/svg-manifest.xml +++ b/frameworks/projects/HTML/src/main/resources/svg-manifest.xml @@@ -20,5 -20,5 +20,13 @@@ <componentPackage> ++ <component id="Circle" class="org.apache.flex.svg.Circle" /> ++ <component id="Ellipse" class="org.apache.flex.svg.Ellipse" /> ++ <component id="Path" class="org.apache.flex.svg.Path" /> ++ <component id="Rect" class="org.apache.flex.svg.Rect" /> ++ <component id="CompoundGraphic" class="org.apache.flex.svg.CompoundGraphic" /> ++ <component id="GraphicContainer" class="org.apache.flex.svg.GraphicContainer" /> ++ <component id="Image" class="org.apache.flex.svg.Image"/> ++ <component id="BinaryImage" class="org.apache.flex.svg.BinaryImage"/> <component id="TextButton" class="org.apache.flex.svg.TextButton"/> </componentPackage>