You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ah...@apache.org on 2017/05/01 03:48:11 UTC
[12/50] [abbrv] git commit: [flex-asjs] [refs/heads/develop] - Merge
branch 'develop' into dual. Clean build. Now to get it to run
Merge branch 'develop' into dual. Clean build. Now to get it to run
Conflicts:
examples/examples-integrationtests/pom.xml
examples/flexjs/ListExample/pom.xml
examples/native/ButtonExample/build.xml
examples/native/USStatesMap/build.xml
examples/native/USStatesMap/pom.xml
examples/native/pom.xml
frameworks/build.xml
frameworks/projects/Basic/src/main/flex/BasicClasses.as
frameworks/projects/Basic/src/main/flex/org/apache/flex/html/Image.as
frameworks/projects/Basic/src/main/flex/org/apache/flex/html/supportClasses/ClippingViewport.as
frameworks/projects/Basic/src/main/resources/defaults.css
frameworks/projects/Express/src/main/flex/org/apache/flex/express/TextButton.as
frameworks/projects/Graphics/build.xml
frameworks/projects/Graphics/pom.xml
frameworks/projects/HTML/src/main/flex/HTMLClasses.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/core/ContainerBase.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/core/ContainerBaseStrandChildren.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/core/ImageBase.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/core/ListBase.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/core/UIBase.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/core/UIButtonBase.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/core/View.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/core/ViewBase.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/ButtonBar.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/ButtonBase.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/CheckBox.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Container.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/ControlBar.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/DataGrid.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/DateChooser.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/DropDownList.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Form.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/HContainer.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/HRule.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Image.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/ImageAndTextButton.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/ImageButton.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Label.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/List.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/MXMLBeadView.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/NumericStepper.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Panel.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/PanelWithControlBar.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/RadioButton.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/SimpleList.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Slider.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Spinner.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/TextArea.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/TextInput.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/TitleBar.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/VContainer.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/VRule.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ComboBoxView.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ContainerView.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DataGridView.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DataItemRendererFactoryForArrayData.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DataItemRendererFactoryForArrayList.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DataItemRendererFactoryForColumnData.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DataProviderChangeNotifier.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DateChooserView.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DateFieldView.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/DropDownListView.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/HScrollBarTrackView.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ImageButtonView.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/ListView.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/PanelView.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/PanelWithControlBarView.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/RangeStepperView.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SingleLineBorderBead.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/SolidBackgroundBead.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/TextItemRendererFactoryForArrayData.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/TextItemRendererFactoryForStringVectorData.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/TitleBarView.mxml
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/UnselectableElementBead.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/controllers/ComboBoxController.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/BasicLayout.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/ButtonBarLayout.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/FlexibleFirstChildHorizontalLayout.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/HScrollBarLayout.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/HorizontalLayout.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildHorizontalLayout.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/OneFlexibleChildVerticalLayout.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/TileLayout.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/VerticalColumnLayout.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/layouts/VerticalLayout.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/beads/models/TextModel.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ButtonBarButtonItemRenderer.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/CheckBoxIcon.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ContainerContentArea.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/DataGridButtonBarButtonItemRenderer.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/DataGridColumnList.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/DataGroup.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/DataItemRenderer.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/RadioButtonIcon.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/ScrollingViewport.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/StringItemRenderer.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/html/supportClasses/Viewport.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/Circle.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/DOMWrapper.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/Ellipse.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/GraphicContainer.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/GraphicShape.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/Image.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/Path.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/Rect.as
frameworks/projects/HTML/src/main/flex/org/apache/flex/svg/Text.as
frameworks/projects/HTML/src/main/resources/basic-manifest.xml
frameworks/projects/HTML/src/main/resources/defaults.css
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/9fd9b78b
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/9fd9b78b
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/9fd9b78b
Branch: refs/heads/develop
Commit: 9fd9b78b75fe8f0377a8e9733be64e5cabbb3412
Parents: d205ffb ae5cb4e
Author: Alex Harui <ah...@apache.org>
Authored: Mon Apr 17 23:15:48 2017 -0700
Committer: Alex Harui <ah...@apache.org>
Committed: Mon Apr 17 23:15:48 2017 -0700
----------------------------------------------------------------------
RELEASE_NOTES | 20 +
.../main/resources/archetype-resources/pom.xml | 40 -
.../main/resources/archetype-resources/pom.xml | 40 -
.../flexjs-simple-library-archetype/pom.xml | 31 +-
.../META-INF/maven/archetype-metadata.xml | 37 +
.../main/resources/META-INF/maven/archetype.xml | 30 -
.../main/resources/archetype-resources/pom.xml | 60 +-
.../src/main/flex/MylibClasses.as | 44 +
.../flex/org/example/flexjs/mylib/FlashClass.as | 30 +
.../org/example/flexjs/mylib/JavaScriptClass.as | 30 +
.../org/example/flexjs/mylib/UniversalClass.as | 43 +
.../src/main/resources/mylib-manifest.xml | 27 +
.../flexjs-simple-typedef-archetype/pom.xml | 55 +
.../META-INF/maven/archetype-metadata.xml | 43 +
.../main/resources/archetype-resources/pom.xml | 80 ++
.../src/main/javascript/myscripts.js | 58 +
archetypes/pom.xml | 1 +
examples/.gitignore | 1 +
examples/examples-integrationtests/pom.xml | 10 +-
examples/examples-tests/pom.xml | 4 +-
.../flexjs/examples/tests/ExampleBuildTest.java | 6 -
examples/express/DataBindingExample/pom.xml | 14 +-
.../src/main/flex/MyInitialView.mxml | 3 +-
examples/express/pom.xml | 95 ++
examples/flexjs/ASDoc/pom.xml | 8 -
.../ASDoc/src/main/config/asdoc-config.xml | 2 -
examples/flexjs/ChartExample/pom.xml | 8 -
.../src/main/flex/MyInitialView.mxml | 27 +-
.../src/main/flex/SpeedTestView.mxml | 5 +-
.../src/main/flex/models/ProductsModel.as | 4 +-
examples/flexjs/CordovaCameraExample/pom.xml | 4 -
.../src/main/flex/MyInitialView.mxml | 2 +-
examples/flexjs/CreateJSExample/pom.xml | 8 -
examples/flexjs/DataBindingExample/pom.xml | 8 -
.../src/main/flex/MyInitialView.mxml | 100 +-
examples/flexjs/DataBindingExample_Flat/pom.xml | 55 +-
examples/flexjs/DataBindingExample_as/pom.xml | 8 -
.../src/main/flex/MyInitialView.as | 52 +-
examples/flexjs/DataGridExample/pom.xml | 8 -
.../src/main/flex/MyInitialView.mxml | 46 +-
.../src/main/flex/models/ProductsModel.as | 37 +-
.../main/flex/products/ProductItemRenderer.as | 22 +-
examples/flexjs/DateControlsExample/pom.xml | 8 -
.../src/main/flex/MyInitialView.mxml | 13 +-
examples/flexjs/DesktopMap/pom.xml | 8 -
examples/flexjs/FlexJSStore/pom.xml | 8 -
.../FlexJSStore/src/main/flex/FlexJSStore.mxml | 6 +-
.../FlexJSStore/src/main/flex/HomeView.mxml | 134 +-
.../FlexJSStore/src/main/flex/SupportView.mxml | 6 +-
.../src/main/flex/productsView/Grip.mxml | 4 +-
.../productsView/ProductCatalogThumbnail.mxml | 8 +-
.../main/flex/productsView/ProductDetails.mxml | 8 +-
.../main/flex/productsView/ProductListItem.mxml | 4 +-
examples/flexjs/FlexJSStore_jquery/pom.xml | 8 -
.../src/main/flex/FlexJSStore.mxml | 2 +-
.../src/main/flex/HomeView.mxml | 8 +-
.../src/main/flex/SupportView.mxml | 6 +-
.../src/main/flex/productsView/Grip.mxml | 4 +-
.../productsView/ProductCatalogThumbnail.mxml | 8 +-
.../main/flex/productsView/ProductDetails.mxml | 8 +-
.../main/flex/productsView/ProductListItem.mxml | 4 +-
examples/flexjs/FlexTeamPage_MDL/pom.xml | 8 -
.../src/main/flex/MainView.mxml | 25 +-
.../flex/itemRenderers/MemberItemRenderer.mxml | 62 +-
.../MaterialIconWithFontAwesomeIcon.as | 28 +
.../src/main/flex/models/MembersModel.as | 92 +-
.../src/main/flex/vos/MemberVO.as | 19 +-
examples/flexjs/FlexWebsiteStatsViewer/pom.xml | 8 -
examples/flexjs/HelloWorld/pom.xml | 8 -
examples/flexjs/ListExample/pom.xml | 26 -
.../src/main/flex/MyInitialView.mxml | 7 +-
.../src/main/flex/models/ProductsModel.as | 8 +-
.../src/main/flex/simple/GenericList.as | 66 +-
.../src/main/flex/simple/GenericListView.as | 38 +-
.../main/flex/simple/IRFactoryForArrayData.as | 2 +-
.../flexjs/MDLBlogExample/.vscode/launch.json | 21 +
.../flexjs/MDLBlogExample/.vscode/tasks.json | 9 +
examples/flexjs/MDLBlogExample/asconfig.json | 14 +
examples/flexjs/MDLBlogExample/build.xml | 63 +
examples/flexjs/MDLBlogExample/pom.xml | 83 ++
.../MDLBlogExample/src/main/flex/App.mxml | 34 +
.../src/main/flex/BlogTemplate.mxml | 257 ++++
.../itemRenderers/CustomMenuItemRenderer.mxml | 37 +
.../src/main/flex/models/MenuModel.as | 40 +
.../src/main/flex/vos/MenuItemVO.as | 37 +
.../main/resources/images/android-desktop.png | Bin 0 -> 8325 bytes
.../src/main/resources/images/avatar.png | Bin 0 -> 246 bytes
.../src/main/resources/images/bg_1024.jpg | Bin 0 -> 64530 bytes
.../src/main/resources/images/bg_2048.jpg | Bin 0 -> 262772 bytes
.../src/main/resources/images/bg_2880.jpg | Bin 0 -> 514925 bytes
.../src/main/resources/images/co1.jpg | Bin 0 -> 4839 bytes
.../src/main/resources/images/co2.jpg | Bin 0 -> 12778 bytes
.../src/main/resources/images/coffee.jpg | Bin 0 -> 66602 bytes
.../src/main/resources/images/favicon.png | Bin 0 -> 905 bytes
.../src/main/resources/images/ios-desktop.png | Bin 0 -> 1489 bytes
.../src/main/resources/images/logo.png | Bin 0 -> 1220 bytes
.../src/main/resources/images/road.jpg | Bin 0 -> 76091 bytes
.../src/main/resources/images/road_big.jpg | Bin 0 -> 232489 bytes
.../src/main/resources/images/shopping.jpg | Bin 0 -> 94041 bytes
.../main/resources/mdl-js-index-template.html | 33 +
.../src/main/resources/mdl-styles.css | 504 ++++++++
examples/flexjs/MDLDynamicTabsExample/pom.xml | 78 ++
.../src/main/flex/TabsExample.mxml | 36 +
.../CustomTabBarPanelItemRenderer.mxml | 36 +
.../src/main/flex/models/TabsModel.as | 38 +
.../src/main/flex/views/InitialView.mxml | 52 +
.../src/main/flex/vos/TabVO.as | 33 +
.../main/resources/mdl-js-index-template.html | 33 +
.../src/main/resources/mdl-styles.css | 31 +
examples/flexjs/MDLExample/pom.xml | 8 -
.../flexjs/MDLExample/src/main/flex/App.mxml | 4 +-
.../src/main/flex/models/FooterModel.as | 5 +-
.../src/main/flex/models/ListsModel.as | 6 +-
.../src/main/flex/models/MainNavigationModel.as | 11 +-
.../src/main/flex/models/MenuModel.as | 5 +-
.../src/main/flex/models/TablesModel.as | 5 +-
.../src/main/flex/models/TabsModel.as | 17 +-
.../MDLExample/src/main/flex/vos/MenuItemVO.as | 4 +-
.../src/main/flex/vos/NavigationLinkVO.as | 3 +-
.../MDLExample/src/main/flex/vos/ProductVO.as | 1 -
.../MDLExample/src/main/flex/vos/TabVO.as | 3 +-
examples/flexjs/MapSearch/pom.xml | 8 -
examples/flexjs/MobileMap/pom.xml | 8 -
examples/flexjs/MobileStocks/pom.xml | 8 -
.../src/main/flex/MyInitialView.mxml | 2 +-
.../src/main/flex/views/LaunchView.mxml | 2 +-
.../src/main/flex/views/WatchListView.mxml | 2 +-
examples/flexjs/MobileTrader/pom.xml | 8 -
.../src/main/flex/MyInitialView.mxml | 2 +-
examples/flexjs/StorageExample/pom.xml | 8 -
examples/flexjs/StyleExample/pom.xml | 8 -
examples/flexjs/TeamPage/pom.xml | 8 -
.../src/main/flex/MemberItemRenderer.mxml | 4 +-
examples/flexjs/TodoListSampleApp/pom.xml | 8 -
.../sample/todo/renderers/TodoItemRenderer.as | 90 --
.../sample/todo/renderers/TodoItemRenderer.mxml | 58 +
.../flex/sample/todo/views/TodoListView.mxml | 57 +-
examples/flexjs/TreeExample/pom.xml | 8 -
examples/flexjs/pom.xml | 2 +
examples/native/ButtonExample/build.xml | 34 +
examples/native/ButtonExample/pom.xml | 24 +-
examples/native/USStatesMap/build.xml | 55 +
examples/native/USStatesMap/pom.xml | 10 +
examples/native/pom.xml | 5 +-
examples/pom.xml | 59 +-
frameworks/asdoc-config.xml | 2 +
frameworks/downloads.xml | 78 +-
frameworks/js/.jshintrc | 14 -
frameworks/js/FlexJS/projects/TextJS/build.xml | 172 +++
.../src/main/config/compile-js-config.xml | 96 ++
frameworks/js/jshint.properties | 14 -
.../Basic/src/main/flex/BasicClasses.as | 19 +-
.../flex/org/apache/flex/core/ContainerBase.as | 385 ++----
.../flex/core/ContainerBaseStrandChildren.as | 4 +-
.../org/apache/flex/core/DataContainerBase.as | 278 +++++
.../main/flex/org/apache/flex/core/GroupBase.as | 280 +++++
.../src/main/flex/org/apache/flex/core/IList.as | 48 +
.../main/flex/org/apache/flex/core/ImageBase.as | 4 +-
.../flex/org/apache/flex/core/LayoutBase.as | 166 +++
.../main/flex/org/apache/flex/core/ListBase.as | 101 +-
.../main/flex/org/apache/flex/core/UIBase.as | 15 +-
.../flex/org/apache/flex/core/UIButtonBase.as | 30 +-
.../src/main/flex/org/apache/flex/core/View.as | 93 +-
.../main/flex/org/apache/flex/core/ViewBase.as | 40 +-
.../main/flex/org/apache/flex/html/ButtonBar.as | 39 +-
.../flex/org/apache/flex/html/ButtonBase.as | 1 -
.../flex/org/apache/flex/html/CSSCheckBox.as | 219 ++++
.../main/flex/org/apache/flex/html/CheckBox.as | 18 +-
.../main/flex/org/apache/flex/html/Container.as | 126 +-
.../flex/org/apache/flex/html/ControlBar.as | 38 +-
.../flex/org/apache/flex/html/DataContainer.as | 146 +--
.../main/flex/org/apache/flex/html/DataGrid.as | 56 +-
.../flex/org/apache/flex/html/DateChooser.as | 16 +-
.../flex/org/apache/flex/html/DropDownList.as | 55 +-
.../src/main/flex/org/apache/flex/html/Form.as | 29 +-
.../src/main/flex/org/apache/flex/html/Group.as | 145 +++
.../flex/org/apache/flex/html/HContainer.as | 3 +-
.../src/main/flex/org/apache/flex/html/HRule.as | 17 +-
.../src/main/flex/org/apache/flex/html/Image.as | 61 +-
.../org/apache/flex/html/ImageAndTextButton.as | 35 +-
.../flex/org/apache/flex/html/ImageButton.as | 53 +-
.../src/main/flex/org/apache/flex/html/Label.as | 41 +-
.../src/main/flex/org/apache/flex/html/List.as | 194 +--
.../flex/org/apache/flex/html/MXMLBeadView.as | 108 +-
.../flex/org/apache/flex/html/MultilineLabel.as | 12 +-
.../flex/org/apache/flex/html/NumericStepper.as | 3 +-
.../src/main/flex/org/apache/flex/html/Panel.as | 93 +-
.../org/apache/flex/html/PanelWithControlBar.as | 49 +-
.../flex/org/apache/flex/html/RadioButton.as | 3 +-
.../flex/org/apache/flex/html/SimpleList.as | 19 +-
.../main/flex/org/apache/flex/html/Slider.as | 39 +-
.../main/flex/org/apache/flex/html/Spinner.as | 3 +-
.../flex/org/apache/flex/html/SubAppLoader.as | 137 +++
.../main/flex/org/apache/flex/html/TextArea.as | 96 +-
.../main/flex/org/apache/flex/html/TextInput.as | 47 +-
.../main/flex/org/apache/flex/html/TitleBar.as | 6 +-
.../flex/org/apache/flex/html/VContainer.as | 3 +-
.../src/main/flex/org/apache/flex/html/VRule.as | 15 +-
.../html/beads/AccordionItemRendererView.as | 4 +-
.../org/apache/flex/html/beads/AccordionView.as | 1 +
.../org/apache/flex/html/beads/CenterElement.as | 84 ++
.../org/apache/flex/html/beads/ComboBoxView.as | 36 +-
.../org/apache/flex/html/beads/ContainerView.as | 441 +++----
.../apache/flex/html/beads/DataContainerView.as | 140 ++-
.../flex/html/beads/DataGridPercentageView.as | 293 +++++
.../org/apache/flex/html/beads/DataGridView.as | 466 +++----
.../DataItemRendererFactoryForArrayData.as | 56 +-
.../DataItemRendererFactoryForArrayList.as | 55 +-
.../DataItemRendererFactoryForColumnData.as | 28 +-
.../html/beads/DataProviderChangeNotifier.as | 163 +--
.../DataProviderCollectionChangeNotifier.as | 71 ++
.../beads/DataProviderItemsChangeNotifier.as | 95 ++
.../apache/flex/html/beads/DateChooserView.as | 223 ++--
.../org/apache/flex/html/beads/DateFieldView.as | 15 +-
.../html/beads/DispatchInputFinishedBead.as | 140 +++
.../html/beads/DispatchKeyboardEventBead.as | 148 +++
.../apache/flex/html/beads/DropDownListView.as | 38 +-
.../org/apache/flex/html/beads/GroupView.as | 429 +++++++
.../flex/html/beads/HScrollBarTrackView.as | 1 +
.../apache/flex/html/beads/ImageButtonView.as | 40 +-
.../flex/org/apache/flex/html/beads/ListView.as | 163 ++-
.../org/apache/flex/html/beads/PanelView.as | 228 +++-
.../flex/html/beads/PanelWithControlBarView.as | 160 +--
.../apache/flex/html/beads/RangeStepperView.as | 5 +-
.../flex/html/beads/SingleLineBorderBead.as | 10 +-
.../SingleLineBorderWithChangeListenerBead.as | 89 ++
.../flex/html/beads/SolidBackgroundBead.as | 42 +-
.../SolidBackgroundWithChangeListenerBead.as | 71 ++
.../TextItemRendererFactoryForArrayData.as | 30 +-
...extItemRendererFactoryForStringVectorData.as | 28 +-
.../apache/flex/html/beads/TitleBarView.mxml | 8 +-
.../flex/html/beads/UnselectableElementBead.as | 69 ++
.../beads/controllers/ComboBoxController.as | 2 +-
.../flex/html/beads/layouts/BasicLayout.as | 466 ++-----
.../flex/html/beads/layouts/ButtonBarLayout.as | 148 ++-
.../FlexibleFirstChildHorizontalLayout.as | 249 ++--
.../flex/html/beads/layouts/HScrollBarLayout.as | 34 +-
.../html/beads/layouts/HorizontalFlexLayout.as | 264 ++++
.../html/beads/layouts/HorizontalFlowLayout.as | 76 +-
.../flex/html/beads/layouts/HorizontalLayout.as | 349 ++----
.../layouts/OneFlexibleChildHorizontalLayout.as | 442 ++++---
.../layouts/OneFlexibleChildVerticalLayout.as | 608 ++++-----
.../flex/html/beads/layouts/TileLayout.as | 72 +-
.../html/beads/layouts/VerticalColumnLayout.as | 105 +-
.../html/beads/layouts/VerticalFlexLayout.as | 260 ++++
.../flex/html/beads/layouts/VerticalLayout.as | 336 ++---
.../flex/html/beads/models/ButtonBarModel.as | 102 ++
.../flex/html/beads/models/NonNullTextModel.as | 125 ++
.../ButtonBarButtonItemRenderer.as | 19 +
.../flex/html/supportClasses/CheckBoxIcon.as | 2 +-
.../html/supportClasses/ClippingViewport.as | 11 +-
.../html/supportClasses/ContainerContentArea.as | 54 +-
.../DataGridButtonBarButtonItemRenderer.as | 10 +
.../html/supportClasses/DataGridColumnList.as | 1 +
.../flex/html/supportClasses/DataGroup.as | 92 +-
.../html/supportClasses/DataItemRenderer.as | 2 +-
.../supportClasses/DataProviderNotifierBase.as | 154 +++
.../html/supportClasses/DateChooserHeader.as | 10 +-
.../html/supportClasses/MXMLItemRenderer.as | 15 +-
.../html/supportClasses/PanelLayoutProxy.as | 132 ++
.../flex/html/supportClasses/RadioButtonIcon.as | 2 +-
.../html/supportClasses/ScrollingViewport.as | 329 +++--
.../html/supportClasses/StringItemRenderer.as | 54 +-
.../apache/flex/html/supportClasses/Viewport.as | 74 +-
.../src/main/flex/org/apache/flex/svg/Circle.as | 15 +-
.../main/flex/org/apache/flex/svg/DOMWrapper.as | 2 +-
.../main/flex/org/apache/flex/svg/Ellipse.as | 23 +-
.../org/apache/flex/svg/GraphicContainer.as | 96 +-
.../flex/org/apache/flex/svg/GraphicShape.as | 47 +-
.../src/main/flex/org/apache/flex/svg/Image.as | 2 +-
.../src/main/flex/org/apache/flex/svg/Path.as | 10 +-
.../src/main/flex/org/apache/flex/svg/Rect.as | 24 +-
.../src/main/flex/org/apache/flex/svg/Text.as | 48 +-
.../Basic/src/main/resources/basic-manifest.xml | 41 +-
.../Basic/src/main/resources/defaults.css | 9 +
.../Charts/src/main/flex/ChartsClasses.as | 22 +-
.../apache/flex/charts/beads/AxisBaseBead.as | 8 +
.../charts/beads/ChartItemRendererFactory.as | 29 +-
.../org/apache/flex/charts/beads/ChartView.as | 117 +-
...ItemRendererFactoryForSeriesArrayListData.as | 4 +-
.../DataItemRendererFactoryForSeriesData.as | 4 +-
.../controllers/ChartSeriesMouseController.as | 40 +-
.../flex/charts/beads/layouts/BarChartLayout.as | 8 +-
.../beads/layouts/BarChartLayoutForArrayList.as | 8 +-
.../charts/beads/layouts/ChartBaseLayout.as | 6 +-
.../charts/beads/layouts/ColumnChartLayout.as | 8 +-
.../layouts/ColumnChartLayoutForArrayList.as | 8 +-
.../layouts/LineChartCategoryVsLinearLayout.as | 8 +-
.../layouts/LineChartLinearVsLinearLayout.as | 8 +-
.../flex/charts/beads/layouts/PieChartLayout.as | 4 +-
.../beads/layouts/PieChartLayoutForArrayList.as | 4 +-
.../beads/layouts/StackedBarChartLayout.as | 8 +-
.../StackedBarChartLayoutForArrayList.as | 8 +-
.../beads/layouts/StackedColumnChartLayout.as | 8 +-
.../StackedColumnChartLayoutForArrayList.as | 8 +-
.../org/apache/flex/charts/core/ChartBase.as | 16 +-
.../apache/flex/charts/core/IChartDataGroup.as | 3 +-
.../flex/charts/optimized/SVGChartDataGroup.as | 30 +-
.../charts/supportClasses/ChartDataGroup.as | 11 +-
.../org/apache/flex/collections/ArrayList.as | 57 +-
.../projects/Core/src/main/flex/CoreClasses.as | 24 +-
.../projects/Core/src/main/flex/Promise.as | 277 +++++
.../flex/org/apache/flex/core/AllCSSStyles.as | 652 ++++++++++
.../org/apache/flex/core/BindableCSSStyles.as | 32 +-
.../flex/org/apache/flex/core/ByteArrayAsset.as | 49 +
.../flex/org/apache/flex/core/IContainer.as | 10 +
.../main/flex/org/apache/flex/core/IImage.as | 5 +-
.../org/apache/flex/core/IItemRendererParent.as | 4 +-
.../flex/org/apache/flex/core/ILayoutHost.as | 6 +-
.../flex/org/apache/flex/core/ILayoutView.as | 86 ++
.../org/apache/flex/core/ISelectionModel.as | 2 -
.../flex/org/apache/flex/core/IStrandPrivate.as | 39 +
.../main/flex/org/apache/flex/core/IViewport.as | 2 +-
.../org/apache/flex/core/SimpleCSSStyles.as | 8 +-
.../org/apache/flex/core/SimpleCSSValuesImpl.as | 13 +-
.../org/apache/flex/core/StyleChangeNotifier.as | 82 ++
.../org/apache/flex/events/CollectionEvent.as | 88 ++
.../org/apache/flex/events/IEventDispatcher.as | 2 +-
.../org/apache/flex/events/KeyboardEvent.as | 120 ++
.../flex/org/apache/flex/events/MouseEvent.as | 2 +
.../org/apache/flex/events/StyleChangeEvent.as | 79 ++
.../org/apache/flex/events/utils/EditingKeys.as | 95 ++
.../apache/flex/events/utils/KeyConverter.as | 205 ++++
.../flex/events/utils/KeyboardEventConverter.as | 82 ++
.../apache/flex/events/utils/ModifierKeys.as | 97 ++
.../apache/flex/events/utils/NavigationKeys.as | 66 +
.../org/apache/flex/events/utils/SpecialKeys.as | 40 +
.../flex/org/apache/flex/events/utils/UIKeys.as | 115 ++
.../apache/flex/events/utils/WhitespaceKeys.as | 49 +
.../apache/flex/promises/enums/PromiseState.as | 71 ++
.../flex/promises/interfaces/IThenable.as | 31 +
.../flex/org/apache/flex/promises/vo/Handler.as | 68 ++
.../flex/org/apache/flex/utils/AnimationUtil.as | 116 ++
.../main/flex/org/apache/flex/utils/CSSUtils.as | 18 +-
.../org/apache/flex/utils/CompressionUtils.as | 69 ++
.../main/flex/org/apache/flex/utils/IntUtil.as | 82 ++
.../src/main/flex/org/apache/flex/utils/MD5.as | 257 ++++
.../apache/flex/utils/MXMLDataInterpreter.as | 6 +-
.../main/flex/org/apache/flex/utils/OSUtils.as | 87 ++
.../flex/org/apache/flex/utils/ObjectMap.as | 185 +++
.../main/flex/org/apache/flex/utils/URLUtils.as | 28 +-
.../org/apache/flex/utils/undo/IOperation.as | 54 +
.../org/apache/flex/utils/undo/IUndoManager.as | 187 +++
.../org/apache/flex/utils/undo/UndoManager.as | 265 ++++
.../Core/src/main/resources/basic-manifest.xml | 3 +
.../flex/org/apache/flex/createjs/Container.as | 6 +
.../flex/org/apache/flex/createjs/core/View.as | 6 +
.../flex/org/apache/flex/utils/LayoutTweener.as | 31 +-
.../org/apache/flex/utils/MockContentView.as | 101 +-
.../org/apache/flex/utils/MockLayoutChild.as | 1 -
.../org/apache/flex/utils/MockLayoutHost.as | 12 +-
.../org/apache/flex/utils/MockLayoutParent.as | 131 +-
.../Express/src/main/flex/ExpressClasses.as | 2 +
.../flex/org/apache/flex/express/Container.as | 18 +
.../apache/flex/express/ImageAndTextButton.as | 64 +
.../flex/org/apache/flex/express/ImageButton.as | 64 +
.../flex/org/apache/flex/express/TextButton.as | 33 +-
.../Express/src/main/resources/defaults.css | 2 +
.../src/main/resources/express-manifest.xml | 4 +-
frameworks/projects/Graphics/build.xml | 1 +
frameworks/projects/Graphics/pom.xml | 56 +
.../src/main/config/compile-swf-config.xml | 1 +
.../Graphics/src/main/flex/GraphicsClasses.as | 1 +
.../flex/org/apache/flex/graphics/ICircle.as | 20 +-
.../apache/flex/graphics/ICompoundGraphic.as | 16 +-
.../flex/org/apache/flex/graphics/IDrawable.as | 30 +
.../flex/org/apache/flex/graphics/IEllipse.as | 32 +
.../org/apache/flex/graphics/IGraphicShape.as | 23 +-
.../main/flex/org/apache/flex/graphics/IRect.as | 32 +-
.../main/flex/org/apache/flex/graphics/IText.as | 23 +-
.../org/apache/flex/graphics/PathBuilder.as | 90 +-
.../org/apache/flex/graphics/beads/BlendBead.as | 142 +++
.../flex/graphics/utils/shaderClasses/Color.pbk | 101 ++
.../graphics/utils/shaderClasses/ColorBurn.pbk | 149 +++
.../utils/shaderClasses/ColorBurnShader.as | 60 +
.../graphics/utils/shaderClasses/ColorDodge.pbk | 151 +++
.../utils/shaderClasses/ColorDodgeShader.as | 60 +
.../graphics/utils/shaderClasses/ColorShader.as | 60 +
.../graphics/utils/shaderClasses/Exclusion.pbk | 105 ++
.../utils/shaderClasses/ExclusionShader.as | 60 +
.../flex/graphics/utils/shaderClasses/Hue.pbk | 216 ++++
.../graphics/utils/shaderClasses/HueShader.as | 60 +
.../graphics/utils/shaderClasses/Luminosity.pbk | 103 ++
.../shaderClasses/LuminosityMaskFilter.pbk | 133 ++
.../utils/shaderClasses/LuminosityMaskShader.as | 96 ++
.../utils/shaderClasses/LuminosityShader.as | 59 +
.../graphics/utils/shaderClasses/Saturation.pbk | 222 ++++
.../utils/shaderClasses/SaturationShader.as | 59 +
.../graphics/utils/shaderClasses/SoftLight.pbk | 199 +++
.../utils/shaderClasses/SoftLightShader.as | 59 +
.../src/main/resources/basic-manifest.xml | 1 +
.../projects/HTML/.actionScriptProperties | 1 -
.../projects/HTML/src/main/flex/HTMLClasses.as | 2 +-
.../src/main/flex/org/apache/flex/html/A.as | 4 +-
.../src/main/flex/org/apache/flex/html/Div.as | 4 +-
.../src/main/flex/org/apache/flex/html/Li.as | 4 +-
.../main/flex/org/apache/flex/html/Module.as | 137 ---
.../src/main/flex/org/apache/flex/html/P.as | 4 +-
.../src/main/flex/org/apache/flex/html/Span.as | 4 +-
.../src/main/flex/org/apache/flex/html/Td.as | 4 +-
.../src/main/flex/org/apache/flex/html/Th.as | 4 +-
.../src/main/flex/org/apache/flex/html/Ul.as | 4 +-
.../org/apache/flex/html/beads/InnerHTML.as | 13 +-
.../HTML/src/main/resources/basic-manifest.xml | 1 +
.../HTML/src/main/resources/defaults.css | 231 +++-
.../flex/org/apache/flex/html5/TransformBead.as | 2 +
.../src/main/config/compile-swf-config.xml | 1 +
.../src/main/flex/MDLClasses.as | 7 +-
.../src/main/flex/org/apache/flex/mdl/Button.as | 19 +-
.../src/main/flex/org/apache/flex/mdl/Card.as | 32 +-
.../main/flex/org/apache/flex/mdl/CheckBox.as | 11 +-
.../src/main/flex/org/apache/flex/mdl/Dialog.as | 29 +-
.../flex/org/apache/flex/mdl/DialogActions.as | 12 +-
.../flex/org/apache/flex/mdl/DialogContent.as | 16 +-
.../src/main/flex/org/apache/flex/mdl/Drawer.as | 12 +-
.../src/main/flex/org/apache/flex/mdl/Footer.as | 16 +-
.../org/apache/flex/mdl/FooterBottomSection.as | 20 +-
.../apache/flex/mdl/FooterDropDownSection.as | 24 +-
.../org/apache/flex/mdl/FooterLeftSection.as | 22 +-
.../org/apache/flex/mdl/FooterMiddleSection.as | 22 +-
.../org/apache/flex/mdl/FooterRightSection.as | 22 +-
.../org/apache/flex/mdl/FooterTopSection.as | 20 +-
.../src/main/flex/org/apache/flex/mdl/Grid.as | 18 +-
.../main/flex/org/apache/flex/mdl/GridCell.as | 72 +-
.../src/main/flex/org/apache/flex/mdl/Header.as | 14 +-
.../main/flex/org/apache/flex/mdl/HeaderRow.as | 12 +-
.../main/flex/org/apache/flex/mdl/IconToggle.as | 24 +-
.../src/main/flex/org/apache/flex/mdl/List.as | 409 ++++---
.../src/main/flex/org/apache/flex/mdl/Menu.as | 119 +-
.../main/flex/org/apache/flex/mdl/Navigation.as | 16 +-
.../org/apache/flex/mdl/NavigationLayout.as | 16 +-
.../apache/flex/mdl/NavigationLayoutContent.as | 14 +-
.../flex/org/apache/flex/mdl/RadioButton.as | 65 +-
.../src/main/flex/org/apache/flex/mdl/Slider.as | 66 +-
.../main/flex/org/apache/flex/mdl/Spinner.as | 3 +
.../src/main/flex/org/apache/flex/mdl/Switch.as | 31 +-
.../src/main/flex/org/apache/flex/mdl/THead.as | 14 +-
.../src/main/flex/org/apache/flex/mdl/TabBar.as | 54 +-
.../flex/org/apache/flex/mdl/TabBarPanel.as | 26 +-
.../main/flex/org/apache/flex/mdl/TableCell.as | 24 +-
.../flex/org/apache/flex/mdl/TableColumn.as | 26 +-
.../src/main/flex/org/apache/flex/mdl/Tabs.as | 93 +-
.../main/flex/org/apache/flex/mdl/TextArea.as | 5 +-
.../main/flex/org/apache/flex/mdl/TextField.as | 13 +-
.../org/apache/flex/mdl/beads/DeletableChip.as | 4 +-
.../apache/flex/mdl/beads/DeletableLinkChip.as | 4 +-
.../TabsItemRendererFactoryForArrayData.as | 26 +-
.../TabsItemRendererFactoryForArrayListData.as | 206 ++++
.../flex/org/apache/flex/mdl/beads/Tooltip.as | 72 +-
.../apache/flex/mdl/beads/UpgradeChildren.as | 127 ++
.../org/apache/flex/mdl/beads/UpgradeElement.as | 122 ++
.../flex/mdl/beads/models/SliderRangeModel.as | 198 +++
.../flex/mdl/beads/models/TabArrayListModel.as | 59 +
.../flex/mdl/beads/models/TabArrayModel.as | 59 +
.../apache/flex/mdl/beads/models/TabModel.as | 59 -
.../org/apache/flex/mdl/beads/views/ListView.as | 91 +-
.../apache/flex/mdl/beads/views/SliderView.as | 77 +-
.../apache/flex/mdl/beads/views/TabBarView.as | 49 +-
.../org/apache/flex/mdl/beads/views/TabsView.as | 78 +-
.../flex/mdl/materialIcons/IMaterialIcon.as | 9 +-
.../flex/mdl/materialIcons/MaterialIconType.as | 1156 +++++++++---------
.../apache/flex/mdl/supportClasses/CardInner.as | 16 +-
.../mdl/supportClasses/IMaterialIconProvider.as | 36 +
.../flex/mdl/supportClasses/MaterialIconBase.as | 3 +-
.../src/main/resources/defaults.css | 10 +-
.../src/main/resources/mdl-manifest.xml | 3 +-
.../flex/org/apache/flex/mobile/TitleView.as | 4 +-
.../flex/org/apache/flex/net/HTTPService.as | 41 +-
.../apache/flex/reflection/TypeDefinition.as | 9 +-
frameworks/projects/Text/.vscode/tasks.json | 16 +
frameworks/projects/Text/asconfig.json | 21 +
frameworks/projects/Text/build.xml | 169 +++
.../Text/src/main/config/compile-as-config.xml | 88 ++
.../projects/Text/src/main/flex/TextClasses.as | 77 ++
.../apache/flex/text/engine/BreakOpportunity.as | 32 +
.../org/apache/flex/text/engine/CFFHinting.as | 29 +
.../org/apache/flex/text/engine/Constants.as | 25 +
.../apache/flex/text/engine/ContentElement.as | 71 ++
.../org/apache/flex/text/engine/DigitCase.as | 30 +
.../org/apache/flex/text/engine/DigitWidth.as | 30 +
.../flex/text/engine/EastAsianJustifier.as | 39 +
.../apache/flex/text/engine/ElementFormat.as | 77 ++
.../apache/flex/text/engine/FontDescription.as | 61 +
.../org/apache/flex/text/engine/FontLookup.as | 31 +
.../org/apache/flex/text/engine/FontMetrics.as | 91 ++
.../org/apache/flex/text/engine/FontPosture.as | 30 +
.../org/apache/flex/text/engine/FontWeight.as | 30 +
.../flex/org/apache/flex/text/engine/Fonts.as | 37 +
.../org/apache/flex/text/engine/GlyphMetrics.as | 33 +
.../apache/flex/text/engine/GraphicElement.as | 37 +
.../org/apache/flex/text/engine/GroupElement.as | 73 ++
.../flex/org/apache/flex/text/engine/IFont.as | 38 +
.../org/apache/flex/text/engine/IFontLoader.as | 35 +
.../org/apache/flex/text/engine/ITextBlock.as | 68 ++
.../org/apache/flex/text/engine/ITextFactory.as | 29 +
.../org/apache/flex/text/engine/ITextLine.as | 71 ++
.../flex/text/engine/JustificationStyle.as | 31 +
.../flex/org/apache/flex/text/engine/Kerning.as | 31 +
.../apache/flex/text/engine/LigatureLevel.as | 32 +
.../flex/text/engine/LineJustification.as | 31 +
.../apache/flex/text/engine/RenderingMode.as | 30 +
.../apache/flex/text/engine/SpaceJustifier.as | 46 +
.../org/apache/flex/text/engine/TabAlignment.as | 31 +
.../flex/org/apache/flex/text/engine/TabStop.as | 34 +
.../org/apache/flex/text/engine/TextBaseline.as | 34 +
.../org/apache/flex/text/engine/TextElement.as | 94 ++
.../org/apache/flex/text/engine/TextEngine.as | 27 +
.../apache/flex/text/engine/TextJustifier.as | 45 +
.../flex/text/engine/TextLineCreationResult.as | 31 +
.../flex/text/engine/TextLineMirrorRegion.as | 55 +
.../apache/flex/text/engine/TextLineValidity.as | 28 +
.../org/apache/flex/text/engine/TextRotation.as | 32 +
.../apache/flex/text/engine/TypographicCase.as | 34 +
.../org/apache/flex/text/events/IMEEvent.as | 50 +
.../org/apache/flex/text/events/TextEvent.as | 62 +
.../flex/org/apache/flex/text/html/TextBlock.as | 220 ++++
.../flex/org/apache/flex/text/html/TextLine.as | 273 +++++
.../flex/text/ime/CompositionAttributeRange.as | 121 ++
.../flex/org/apache/flex/text/ime/IIMEClient.as | 186 +++
.../org/apache/flex/text/ime/IIMESupport.as | 86 ++
.../main/flex/org/apache/flex/text/ime/IME.as | 49 +
.../apache/flex/text/ime/IMEConversionMode.as | 37 +
.../src/main/resources/basic-as-manifest.xml | 24 +
.../Text/src/main/resources/basic-manifest.xml | 24 +
.../Text/src/main/resources/defaults.css | 21 +
frameworks/projects/pom.xml | 4 +-
.../observedbugs/ObservedBugTests.as | 4 +-
pom.xml | 37 +-
testsuite/pom.xml | 2 +-
.../custom-html-template/pom.xml | 40 -
530 files changed, 23124 insertions(+), 8101 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/examples/flexjs/ASDoc/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/examples/flexjs/ASDoc/src/main/config/asdoc-config.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/examples/flexjs/ChartExample/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/examples/flexjs/CordovaCameraExample/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/examples/flexjs/CreateJSExample/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/examples/flexjs/DataBindingExample/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/examples/flexjs/DataBindingExample_Flat/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/examples/flexjs/DataBindingExample_as/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/examples/flexjs/DateControlsExample/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/examples/flexjs/DesktopMap/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/examples/flexjs/FlexJSStore/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/examples/flexjs/FlexJSStore/src/main/flex/productsView/ProductCatalogThumbnail.mxml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/examples/flexjs/FlexJSStore_jquery/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/examples/flexjs/FlexJSStore_jquery/src/main/flex/productsView/ProductCatalogThumbnail.mxml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/examples/flexjs/FlexTeamPage_MDL/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/examples/flexjs/FlexWebsiteStatsViewer/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/examples/flexjs/ListExample/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/examples/flexjs/MDLExample/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/examples/flexjs/MapSearch/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/examples/flexjs/MobileMap/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/examples/flexjs/MobileStocks/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/examples/flexjs/MobileTrader/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/examples/flexjs/StorageExample/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/examples/flexjs/StyleExample/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/examples/flexjs/TeamPage/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/examples/flexjs/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/examples/native/ButtonExample/build.xml
----------------------------------------------------------------------
diff --cc examples/native/ButtonExample/build.xml
index 5e0f408,79d3a49..a427dd8
--- a/examples/native/ButtonExample/build.xml
+++ b/examples/native/ButtonExample/build.xml
@@@ -30,10 -30,71 +30,44 @@@
<include file="${basedir}/../../build_example.xml" />
- <condition property="JS.SWC" value="${FLEXJS_HOME}/js/libs/js.swc" >
- <and>
- <not>
- <isset property="JS.SWC" />
- </not>
- <available file="${FLEXJS_HOME}/js/libs/js.swc" type="file" />
- </and>
- </condition>
-
- <condition property="JS.SWC" value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" >
- <and>
- <not>
- <isset property="JS.SWC" />
- </not>
- <available file="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" type="file" />
- </and>
- </condition>
-
- <condition property="JS.SWC" value="${FALCONJX_HOME}/libs/js.swc" >
- <and>
- <not>
- <isset property="JS.SWC" />
- </not>
- <available file="${FALCONJX_HOME}/libs/js.swc" type="file" />
- </and>
- </condition>
-
- <path id="lib.path">
- <fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/>
- </path>
-
- <target name="main" depends="clean,build" description="Clean build of ${example}">
- </target>
+ <property name="config_arg" value="js" />
+ <property name="file_suffix" value="as" />
++<<<<<<< HEAD
+ <target name="main" depends="clean,build_example.compile" description="Clean build of ${example}">
++=======
+ <target name="build">
+ <java jar="${FALCONJX_HOME}/lib/mxmlc.jar" resultProperty="errorCode"
+ fork="true">
+ <jvmarg line="${mxmlc.jvm.args}"/>
+ <jvmarg line="-Dflexlib=${FLEXJS_HOME}/frameworks}"/>
+ <arg value="+flexlib=${FLEXJS_HOME}/frameworks" />
+ <arg value="-debug" />
+ <arg value="-define=CONFIG::as_only,false" />
+ <arg value="-define=CONFIG::js_only,true" />
+ <arg value="-external-library-path=${JS.SWC}" />
+ <arg value="-compiler.mxml.children-as-data" />
+ <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="+playerglobal.version=${playerglobal.version}" />
+ <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
+ <arg value="-js-output-type=FLEXJS" />
+ <arg value="-closure-lib=${GOOG_HOME}" />
+ <arg value="-sdk-js-lib=${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
+ <arg value="${basedir}/src/main/flex/${example}.as" />
+ </java>
+ <fail>
+ <condition>
+ <not>
+ <or>
+ <equals arg1="${errorCode}" arg2="0" />
+ <equals arg1="${errorCode}" arg2="2" />
+ </or>
+ </not>
+ </condition>
+ </fail>
++>>>>>>> develop
</target>
<target name="clean">
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/examples/native/ButtonExample/pom.xml
----------------------------------------------------------------------
diff --cc examples/native/ButtonExample/pom.xml
index 0cc09a6,aacf74f..b81d238
--- a/examples/native/ButtonExample/pom.xml
+++ b/examples/native/ButtonExample/pom.xml
@@@ -39,21 -39,12 +39,21 @@@
<plugin>
<groupId>org.apache.flex.flexjs.compiler</groupId>
<artifactId>flexjs-maven-plugin</artifactId>
- <version>${flexjs.compiler.version}</version>
<extensions>true</extensions>
<configuration>
+ <outputJavaScript>true</outputJavaScript>
<mainClass>ButtonExample.as</mainClass>
+ <targets>JS</targets>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/examples/native/USStatesMap/build.xml
----------------------------------------------------------------------
diff --cc examples/native/USStatesMap/build.xml
index 5a0d580,ebb9478..2a62d4a
--- a/examples/native/USStatesMap/build.xml
+++ b/examples/native/USStatesMap/build.xml
@@@ -30,12 -30,73 +30,67 @@@
<include file="${basedir}/../../build_example.xml" />
- <condition property="JS.SWC" value="${FLEXJS_HOME}/js/libs/js.swc" >
- <and>
- <not>
- <isset property="JS.SWC" />
- </not>
- <available file="${FLEXJS_HOME}/js/libs/js.swc" type="file" />
- </and>
- </condition>
+ <property name="config_arg" value="js" />
+ <property name="file_suffix" value="as" />
+ <condition property="JS.SWC" value="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" >
+ <and>
+ <not>
+ <isset property="JS.SWC" />
+ </not>
+ <available file="${FALCONJX_HOME}/../externs/js/out/bin/js.swc" type="file" />
+ </and>
+ </condition>
+
+ <condition property="JS.SWC" value="${FALCONJX_HOME}/libs/js.swc" >
+ <and>
+ <not>
+ <isset property="JS.SWC" />
+ </not>
+ <available file="${FALCONJX_HOME}/libs/js.swc" type="file" />
+ </and>
+ </condition>
+
+ <path id="lib.path">
+ <fileset dir="${FALCON_HOME}/lib" includes="falcon-flexTasks.jar"/>
+ </path>
+
- <target name="main" depends="clean,build" description="Clean build of ${example}">
+ <target name="main" depends="clean,build_example.compile" description="Clean build of ${example}">
</target>
+ <target name="build">
+ <java jar="${FALCONJX_HOME}/lib/mxmlc.jar" resultProperty="errorCode"
+ fork="true">
+ <jvmarg line="${mxmlc.jvm.args}"/>
+ <jvmarg line="-Dflexlib=${FLEXJS_HOME}/frameworks}"/>
+ <arg value="+flexlib=${FLEXJS_HOME}/frameworks" />
+ <arg value="-debug" />
+ <arg value="-define=CONFIG::as_only,false" />
+ <arg value="-define=CONFIG::js_only,true" />
+ <arg value="-external-library-path=${JS.SWC}" />
+ <arg value="-compiler.mxml.children-as-data" />
+ <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="+playerglobal.version=${playerglobal.version}" />
+ <arg value="+env.PLAYERGLOBAL_HOME=${env.PLAYERGLOBAL_HOME}" />
+ <arg value="-js-output-type=FLEXJS" />
+ <arg value="-closure-lib=${GOOG_HOME}" />
+ <arg value="-sdk-js-lib=${FLEXJS_HOME}/frameworks/js/FlexJS/libs" />
+ <arg value="${basedir}/src/main/flex/${example}.as" />
+ </java>
+ <fail>
+ <condition>
+ <not>
+ <or>
+ <equals arg1="${errorCode}" arg2="0" />
+ <equals arg1="${errorCode}" arg2="2" />
+ </or>
+ </not>
+ </condition>
+ </fail>
+ </target>
+
<target name="clean">
<delete dir="${basedir}/bin" failonerror="false" />
<delete dir="${basedir}/bin-debug" failonerror="false" />
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/examples/native/USStatesMap/pom.xml
----------------------------------------------------------------------
diff --cc examples/native/USStatesMap/pom.xml
index 2dac85b,13755b8..936866d
--- a/examples/native/USStatesMap/pom.xml
+++ b/examples/native/USStatesMap/pom.xml
@@@ -42,18 -42,10 +42,19 @@@
<version>${flexjs.compiler.version}</version>
<extensions>true</extensions>
<configuration>
+ <outputJavaScript>true</outputJavaScript>
<mainClass>USStatesMap.as</mainClass>
+ <targets>JS</targets>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ </plugin>
</plugins>
</build>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/examples/native/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/examples/pom.xml
----------------------------------------------------------------------
diff --cc examples/pom.xml
index 2ebcc32,412ce1a..9499b80
--- a/examples/pom.xml
+++ b/examples/pom.xml
@@@ -70,53 -71,21 +71,8 @@@
<artifactId>flexjs-maven-plugin</artifactId>
<version>${flexjs.compiler.version}</version>
<extensions>true</extensions>
- <executions>
- <!-- Add a second execution with output set to JavaScript (Flash is the default) -->
- <execution>
- <id>compile-javascript</id>
- <phase>compile</phase>
- <goals>
- <goal>compile-app</goal>
- </goals>
- <configuration>
- <outputJavaScript>true</outputJavaScript>
- </configuration>
- </execution>
- </executions>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-war-plugin</artifactId>
- <version>2.6</version>
- <executions>
- <execution>
- <id>package-javascript</id>
- <phase>package</phase>
- <goals>
- <goal>war</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <warSourceDirectory>${compiler.output-dir}</warSourceDirectory>
- <failOnMissingWebXml>false</failOnMissingWebXml>
- <!--webResources>
- <resource>
- <directory>${compiler.output-dir}</directory>
- </resource>
- </webResources-->
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.11</version>
- <executions>
- <execution>
- <id>attach-war</id>
- <phase>package</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <artifacts>
- <artifact>
- <file>${basedir}/target/${project.artifactId}-${project.version}.war</file>
- <type>war</type>
- </artifact>
- </artifacts>
- </configuration>
- </plugin>
- <plugin>
<groupId>org.jboss.errai</groupId>
<artifactId>cordova-maven-plugin</artifactId>
<version>4.0.0.Beta2</version>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/frameworks/asdoc-config.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/frameworks/projects/Basic/src/main/flex/BasicClasses.as
----------------------------------------------------------------------
diff --cc frameworks/projects/Basic/src/main/flex/BasicClasses.as
index f43c962,a81838b..d709608
--- a/frameworks/projects/Basic/src/main/flex/BasicClasses.as
+++ b/frameworks/projects/Basic/src/main/flex/BasicClasses.as
@@@ -27,9 -27,9 +27,9 @@@ packag
*/
internal class BasicClasses
{
--
import org.apache.flex.html.ToolTip; ToolTip;
import org.apache.flex.html.accessories.NumericOnlyTextInputBead; NumericOnlyTextInputBead;
++ import org.apache.flex.html.beads.DispatchInputFinishedBead; DispatchInputFinishedBead;
import org.apache.flex.html.accessories.PasswordInputBead; PasswordInputBead;
import org.apache.flex.html.accessories.TextPromptBead; TextPromptBead;
import org.apache.flex.html.beads.AlertView; AlertView;
@@@ -42,9 -41,9 +42,10 @@@
COMPILE::SWF
{
import org.apache.flex.html.beads.CheckBoxView; CheckBoxView;
- import org.apache.flex.html.beads.ComboBoxView; ComboBoxView;
}
+ import org.apache.flex.html.beads.ComboBoxView; ComboBoxView;
import org.apache.flex.html.beads.ContainerView; ContainerView;
++ import org.apache.flex.html.beads.GroupView; GroupView;
COMPILE::SWF
{
import org.apache.flex.html.beads.ControlBarMeasurementBead; ControlBarMeasurementBead;
@@@ -66,23 -63,23 +67,27 @@@
import org.apache.flex.html.beads.NumericStepperView; NumericStepperView;
}
import org.apache.flex.html.beads.PanelView; PanelView;
++ import org.apache.flex.html.supportClasses.PanelLayoutProxy; PanelLayoutProxy;
+ import org.apache.flex.html.beads.SliderView; SliderView;
+ import org.apache.flex.html.beads.PanelWithControlBarView; PanelWithControlBarView;
++ import org.apache.flex.html.beads.AccordionItemRendererView; AccordionItemRendererView;
COMPILE::SWF
{
- import org.apache.flex.html.beads.PanelWithControlBarView; PanelWithControlBarView;
import org.apache.flex.html.beads.RadioButtonView; RadioButtonView;
import org.apache.flex.html.beads.VScrollBarView; VScrollBarView;
import org.apache.flex.html.beads.HScrollBarView; HScrollBarView;
import org.apache.flex.html.beads.ScrollBarView; ScrollBarView;
import org.apache.flex.html.beads.SimpleAlertView; SimpleAlertView;
import org.apache.flex.html.beads.SingleLineBorderBead; SingleLineBorderBead;
- import org.apache.flex.html.beads.SliderView; SliderView;
+ import org.apache.flex.html.beads.SliderThumbView; SliderThumbView;
+ import org.apache.flex.html.beads.SliderTrackView; SliderTrackView;
++ import org.apache.flex.html.beads.SingleLineBorderWithChangeListenerBead; SingleLineBorderWithChangeListenerBead;
}
- import org.apache.flex.html.beads.SliderThumbView; SliderThumbView;
- import org.apache.flex.html.beads.SliderTrackView; SliderTrackView;
import org.apache.flex.html.beads.SpinnerView; SpinnerView;
COMPILE::SWF
{
import org.apache.flex.html.beads.SolidBackgroundBead; SolidBackgroundBead;
++ import org.apache.flex.html.beads.SolidBackgroundWithChangeListenerBead; SolidBackgroundWithChangeListenerBead;
import org.apache.flex.html.beads.TextButtonMeasurementBead; TextButtonMeasurementBead;
import org.apache.flex.html.beads.TextFieldLabelMeasurementBead; TextFieldLabelMeasurementBead;
import org.apache.flex.html.beads.TextAreaView; TextAreaView;
@@@ -90,8 -87,8 +95,8 @@@
import org.apache.flex.html.beads.TextFieldView; TextFieldView;
import org.apache.flex.html.beads.TextInputView; TextInputView;
import org.apache.flex.html.beads.TextInputWithBorderView; TextInputWithBorderView;
-- import org.apache.flex.html.beads.models.AlertModel; AlertModel;
}
++ import org.apache.flex.html.beads.models.AlertModel; AlertModel
import org.apache.flex.html.beads.models.ArraySelectionModel; ArraySelectionModel;
import org.apache.flex.html.beads.models.ArrayListSelectionModel; ArrayListSelectionModel;
import org.apache.flex.html.beads.models.RangeModel; RangeModel;
@@@ -135,7 -134,7 +140,9 @@@
}
import org.apache.flex.html.beads.layouts.ButtonBarLayout; ButtonBarLayout;
import org.apache.flex.html.beads.layouts.VerticalLayout; VerticalLayout;
++ import org.apache.flex.html.beads.layouts.VerticalFlexLayout; VerticalFlexLayout;
import org.apache.flex.html.beads.layouts.HorizontalLayout; HorizontalLayout;
++ import org.apache.flex.html.beads.layouts.HorizontalFlexLayout; HorizontalFlexLayout;
import org.apache.flex.html.beads.layouts.BasicLayout; BasicLayout;
import org.apache.flex.html.beads.layouts.OneFlexibleChildHorizontalLayout; OneFlexibleChildHorizontalLayout;
import org.apache.flex.html.beads.layouts.OneFlexibleChildVerticalLayout; OneFlexibleChildVerticalLayout;
@@@ -144,6 -143,6 +151,7 @@@
{
import org.apache.flex.html.beads.layouts.HScrollBarLayout; HScrollBarLayout;
import org.apache.flex.html.beads.layouts.VScrollBarLayout; VScrollBarLayout;
++ import org.apache.flex.html.supportClasses.ContainerContentArea; ContainerContentArea;
}
import org.apache.flex.html.beads.layouts.TileLayout; TileLayout;
import org.apache.flex.html.beads.TextItemRendererFactoryForArrayData; TextItemRendererFactoryForArrayData;
@@@ -159,7 -158,7 +167,7 @@@
import org.apache.flex.html.DataGridButtonBar; DataGridButtonBar;
import org.apache.flex.html.beads.DataGridColumnView; DataGridColumnView;
import org.apache.flex.html.beads.DataGridView; DataGridView;
-- import org.apache.flex.html.beads.layouts.DataGridLayout; DataGridLayout;
++ import org.apache.flex.html.beads.DataGridPercentageView; DataGridPercentageView;
import org.apache.flex.html.beads.DateChooserView; DateChooserView;
import org.apache.flex.html.beads.DateFieldView; DateFieldView;
import org.apache.flex.html.beads.DecrementButtonView; DecrementButtonView;
@@@ -186,7 -183,7 +194,6 @@@
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;
@@@ -213,6 -208,6 +220,8 @@@
import org.apache.flex.html.beads.VRuleView; VRuleView;
import org.apache.flex.html.beads.MultilineTextFieldView; MultilineTextFieldView;
}
++
++ import org.apache.flex.html.SubAppLoader; SubAppLoader;
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/ContainerBase.as
----------------------------------------------------------------------
diff --cc frameworks/projects/Basic/src/main/flex/org/apache/flex/core/ContainerBase.as
index a5cb094,0dd0b53..0dcb0e3
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/ContainerBase.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/ContainerBase.as
@@@ -18,12 -18,12 +18,9 @@@
////////////////////////////////////////////////////////////////////////////////
package org.apache.flex.core
{
-- import org.apache.flex.core.IMXMLDocument;
import org.apache.flex.core.ValuesManager;
import org.apache.flex.events.Event;
import org.apache.flex.events.ValueChangeEvent;
-- import org.apache.flex.states.State;
-- import org.apache.flex.utils.MXMLDataInterpreter;
/**
* Indicates that the state change has completed. All properties
@@@ -59,8 -59,8 +56,6 @@@
*/
[Event(name="childrenAdded", type="org.apache.flex.events.Event")]
-- [DefaultProperty("mxmlContent")]
--
/**
* The ContainerBase class is the base class for most containers
* in FlexJS. It is usable as the root tag of MXML
@@@ -71,7 -71,7 +66,7 @@@
* @playerversion AIR 2.6
* @productversion FlexJS 0.0
*/
-- public class ContainerBase extends UIBase implements IMXMLDocument, IStatesObject, IContainer, IContentViewHost
++ public class ContainerBase extends GroupBase implements IStrandPrivate
{
/**
* Constructor.
@@@ -84,8 -84,8 +79,6 @@@
public function ContainerBase()
{
super();
--
-- _strandChildren = new ContainerBaseStrandChildren(this);
}
private var _strandChildren:ContainerBaseStrandChildren;
@@@ -93,144 -93,135 +86,105 @@@
/**
* @private
*/
-- public function get strandChildren():IParent
++ override public function get strandChildren():IParent
{
++ if (_strandChildren == null) {
++ _strandChildren = new ContainerBaseStrandChildren(this);
++ }
return _strandChildren;
}
--
-- /**
-- * @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):IChild
-- {
-- var contentView:IParent = view as IParent;
-- if (contentView != null) {
-- return contentView.getElementAt(index);
-- } else {
-- return super.getElementAt(index);
-- }
-- }
--
-- /**
-- * @private
-- */
-- override public function getElementIndex(c:IChild):int
-- {
-- var contentView:IParent = view as IParent;
-- if (contentView != null) {
-- return contentView.getElementIndex(c);
-- } else {
-- return super.getElementIndex(c);
-- }
-- }
--
-- /**
-- * @private
-- */
-- override public function addElement(c:IChild, dispatchEvent:Boolean = true):void
-- {
-- var contentView:IParent = view as IParent;
-- if (contentView != null) {
-- contentView.addElement(c, dispatchEvent);
-- if (dispatchEvent)
-- this.dispatchEvent(new Event("childrenAdded"));
-- }
-- else {
-- super.addElement(c);
-- }
-- }
--
-- /**
-- * @private
-- */
-- override public function addElementAt(c:IChild, index:int, dispatchEvent:Boolean = true):void
-- {
-- var contentView:IParent = view as IParent;
-- if (contentView != null) {
-- contentView.addElementAt(c, index, dispatchEvent);
-- if (dispatchEvent)
-- this.dispatchEvent(new Event("childrenAdded"));
-- }
-- else {
-- super.addElementAt(c, index);
-- }
-- }
--
-- /**
-- * @private
-- */
-- override public function removeElement(c:IChild, dispatchEvent:Boolean = true):void
-- {
-- var contentView:IParent = view as IParent;
-- if (contentView != null) {
-- contentView.removeElement(c, dispatchEvent);
-- if (dispatchEvent)
-- this.dispatchEvent(new Event("childrenRemoved"));
-- }
-- else {
-- super.removeElement(c);
-- }
-- }
--
-- /**
-- * @private
-- */
-- public function childrenAdded():void
-- {
-- dispatchEvent(new Event("childrenAdded"));
-- }
--
-- /**
-- * A ContainerBase doesn't create its children until it is added to
-- * a parent.
-- *
-- * @langversion 3.0
-- * @playerversion Flash 10.2
-- * @playerversion AIR 2.6
-- * @productversion FlexJS 0.0
-- */
-- override public function addedToParent():void
++
++ /*
++ * The following functions are for the SWF-side only and re-direct element functions
++ * to the content area, enabling scrolling and clipping which are provided automatically
++ * in the JS-side.
++ */
++
++ /**
++ * @private
++ */
++ COMPILE::SWF
++ override public function addElement(c:IChild, dispatchEvent:Boolean = true):void
+ {
- if (!_initialized)
- {
- // each MXML file can also have styles in fx:Style block
- ValuesManager.valuesImpl.init(this);
- }
-
- super.addedToParent();
-
- if (!_initialized)
- {
- MXMLDataInterpreter.generateMXMLInstances(_mxmlDocument, this, MXMLDescriptor);
-
- dispatchEvent(new Event("initBindings"));
- dispatchEvent(new Event("initComplete"));
- _initialized = true;
- }
++ var layoutHost:ILayoutHost = view as ILayoutHost;
++ var contentView:IParent = layoutHost.contentView as IParent;
++ contentView.addElement(c, dispatchEvent);
++ }
++
++ /**
++ * @private
++ */
++ COMPILE::SWF
++ override public function addElementAt(c:IChild, index:int, dispatchEvent:Boolean = true):void
+ {
- if (!_initialized)
- {
- // each MXML file can also have styles in fx:Style block
- ValuesManager.valuesImpl.init(this);
- }
-
- super.addedToParent();
-
- if (!_initialized)
- {
- MXMLDataInterpreter.generateMXMLInstances(_mxmlDocument, this, MXMLDescriptor);
-
- dispatchEvent(new Event("initBindings"));
- dispatchEvent(new Event("initComplete"));
- _initialized = true;
- }
++ var layoutHost:ILayoutHost = view as ILayoutHost;
++ var contentView:IParent = layoutHost.contentView as IParent;
++ contentView.addElementAt(c, index, dispatchEvent);
}
- /**
- * @private
- */
- override public function get numElements():int
- {
- var contentView:IParent = view as IParent;
- return contentView != null ? contentView.numElements : super.numElements;
- }
-
+ /**
+ * @private
++ */
++ COMPILE::SWF
++ override public function getElementIndex(c:IChild):int
++ {
++ var layoutHost:ILayoutHost = view as ILayoutHost;
++ var contentView:IParent = layoutHost.contentView as IParent;
++ return contentView.getElementIndex(c);
++ }
++
++ /**
++ * @private
++ */
++ COMPILE::SWF
++ override public function removeElement(c:IChild, dispatchEvent:Boolean = true):void
++ {
++ var layoutHost:ILayoutHost = view as ILayoutHost;
++ var contentView:IParent = layoutHost.contentView as IParent;
++ contentView.removeElement(c, dispatchEvent);
++ }
++
++ /**
++ * @private
++ */
++ COMPILE::SWF
++ override public function get numElements():int
++ {
++ var layoutHost:ILayoutHost = view as ILayoutHost;
++ var contentView:IParent = layoutHost.contentView as IParent;
++ return contentView.numElements;
++ }
++
++ /**
++ * @private
++ */
++ COMPILE::SWF
++ override public function getElementAt(index:int):IChild
++ {
++ var layoutHost:ILayoutHost = view as ILayoutHost;
++ var contentView:IParent = layoutHost.contentView as IParent;
++ return contentView.getElementAt(index);
++ }
++
++ /*
++ * IStrandPrivate
++ *
++ * These "internal" function provide a backdoor way for proxy classes to
++ * operate directly at strand level. While these function are available on
++ * both SWF and JS platforms, they really only have meaning on the SWF-side.
++ * Other subclasses may provide use on the JS-side.
++ *
++ * @see org.apache.flex.core.IContainer#strandChildren
++ */
++
+ /**
+ * @private
* @suppress {undefinedNames}
* Support strandChildren.
*/
public function $numElements():int
{
-- return super.numElements();
++ return super.numElements;
}
/**
@@@ -283,170 -274,170 +237,5 @@@
return super.getElementAt(index);
}
-- private var _mxmlDescriptor:Array;
-- private var _mxmlDocument:Object = this;
-- private var _initialized:Boolean;
--
-- /**
-- * @copy org.apache.flex.core.Application#MXMLDescriptor
-- *
-- * @langversion 3.0
-- * @playerversion Flash 10.2
-- * @playerversion AIR 2.6
-- * @productversion FlexJS 0.0
-- */
-- public function get MXMLDescriptor():Array
-- {
-- return _mxmlDescriptor;
-- }
--
-- /**
-- * @private
-- */
-- public function setMXMLDescriptor(document:Object, value:Array):void
-- {
-- _mxmlDocument = document;
-- _mxmlDescriptor = value;
-- }
--
-- /**
-- * @copy org.apache.flex.core.Application#generateMXMLAttributes()
-- *
-- * @langversion 3.0
-- * @playerversion Flash 10.2
-- * @playerversion AIR 2.6
-- * @productversion FlexJS 0.0
-- */
-- public function generateMXMLAttributes(data:Array):void
-- {
-- MXMLDataInterpreter.generateMXMLProperties(this, data);
-- }
--
-- /**
-- * @copy org.apache.flex.core.ItemRendererClassFactory#mxmlContent
-- *
-- * @langversion 3.0
-- * @playerversion Flash 10.2
-- * @playerversion AIR 2.6
-- * @productversion FlexJS 0.0
-- */
-- public var mxmlContent:Array;
--
-- private var _states:Array;
--
-- /**
-- * The array of view states. These should
-- * be instances of org.apache.flex.states.State.
-- *
-- * @langversion 3.0
-- * @playerversion Flash 10.2
-- * @playerversion AIR 2.6
-- * @productversion FlexJS 0.0
-- */
-- public function get states():Array
-- {
-- return _states;
-- }
--
-- /**
-- * @private
-- * @flexjsignorecoercion Class
-- * @flexjsignorecoercion org.apache.flex.core.IBead
-- */
-- public function set states(value:Array):void
-- {
-- _states = value;
-- _currentState = _states[0].name;
--
-- try{
-- if (getBeadByType(IStatesImpl) == null)
-- {
-- var c:Class = ValuesManager.valuesImpl.getValue(this, "iStatesImpl") as Class;
-- var b:Object = new c();
-- addBead(b as IBead);
-- }
-- }
-- //TODO: Need to handle this case more gracefully
-- catch(e:Error)
-- {
-- COMPILE::SWF
-- {
-- trace(e.message);
-- }
-- }
--
-- }
--
-- /**
-- * <code>true</code> if the array of states
-- * contains a state with this name.
-- *
-- * @param state The state namem.
-- * @return True if state in state array
-- *
-- * @langversion 3.0
-- * @playerversion Flash 10.2
-- * @playerversion AIR 2.6
-- * @productversion FlexJS 0.0
-- */
-- public function hasState(state:String):Boolean
-- {
-- for each (var s:State in _states)
-- {
-- if (s.name == state)
-- return true;
-- }
-- return false;
-- }
--
-- private var _currentState:String;
--
-- [Bindable("currentStateChange")]
-- /**
-- * The name of the current state.
-- *
-- * @langversion 3.0
-- * @playerversion Flash 10.2
-- * @playerversion AIR 2.6
-- * @productversion FlexJS 0.0
-- */
-- public function get currentState():String
-- {
-- return _currentState;
-- }
--
-- /**
-- * @private
-- */
-- public function set currentState(value:String):void
-- {
-- var event:ValueChangeEvent = new ValueChangeEvent("currentStateChange", false, false, _currentState, value)
-- _currentState = value;
-- dispatchEvent(event);
-- }
--
-- private var _transitions:Array;
--
-- /**
-- * The array of transitions.
-- *
-- * @langversion 3.0
-- * @playerversion Flash 10.2
-- * @playerversion AIR 2.6
-- * @productversion FlexJS 0.0
-- */
-- public function get transitions():Array
-- {
-- return _transitions;
-- }
--
-- /**
-- * @private
-- */
-- public function set transitions(value:Array):void
-- {
-- _transitions = value;
-- }
--
}
}
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/ContainerBaseStrandChildren.as
----------------------------------------------------------------------
diff --cc frameworks/projects/Basic/src/main/flex/org/apache/flex/core/ContainerBaseStrandChildren.as
index e961c1f,e961c1f..d831004
--- a/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/ContainerBaseStrandChildren.as
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/ContainerBaseStrandChildren.as
@@@ -43,10 -43,10 +43,10 @@@ package org.apache.flex.cor
{
super();
-- this.owner = owner as ContainerBase;
++ this.owner = owner as IStrandPrivate;
}
-- public var owner:ContainerBase;
++ public var owner:IStrandPrivate;
/**
* @private
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/9fd9b78b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/DataContainerBase.as
----------------------------------------------------------------------
diff --cc frameworks/projects/Basic/src/main/flex/org/apache/flex/core/DataContainerBase.as
index 0000000,0000000..0f03f67
new file mode 100644
--- /dev/null
+++ b/frameworks/projects/Basic/src/main/flex/org/apache/flex/core/DataContainerBase.as
@@@ -1,0 -1,0 +1,278 @@@
++////////////////////////////////////////////////////////////////////////////////
++//
++// 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
++{
++ import org.apache.flex.core.ValuesManager;
++ import org.apache.flex.html.beads.IListView;
++ import org.apache.flex.events.Event;
++ import org.apache.flex.events.ItemAddedEvent;
++ import org.apache.flex.events.ItemClickedEvent;
++ import org.apache.flex.events.ItemRemovedEvent;
++ import org.apache.flex.events.ValueChangeEvent;
++ import org.apache.flex.states.State;
++ import org.apache.flex.html.supportClasses.DataItemRenderer;
++
++ /**
++ * Indicates that the initialization of the list is complete.
++ *
++ * @langversion 3.0
++ * @playerversion Flash 10.2
++ * @playerversion AIR 2.6
++ * @productversion FlexJS 0.0
++ */
++ [Event(name="initComplete", type="org.apache.flex.events.Event")]
++
++ /**
++ * The DataContainerBase class is the base class for components that
++ * that have generated content, like lists.
++ *
++ * @langversion 3.0
++ * @playerversion Flash 10.2
++ * @playerversion AIR 2.6
++ * @productversion FlexJS 0.0
++ */
++ public class DataContainerBase extends ContainerBase implements IItemRendererParent, IList
++ {
++ /**
++ * Constructor.
++ *
++ * @langversion 3.0
++ * @playerversion Flash 10.2
++ * @playerversion AIR 2.6
++ * @productversion FlexJS 0.0
++ */
++ public function DataContainerBase()
++ {
++ super();
++ }
++
++ /*
++ * UIBase
++ */
++
++ /**
++ * @flexjsignorecoercion org.apache.flex.core.WrappedHTMLElement
++ */
++ COMPILE::JS
++ override protected function createElement():WrappedHTMLElement
++ {
++ super.createElement();
++ className = 'DataContainer';
++
++ return element;
++ }
++
++ private var _DCinitialized:Boolean;
++
++ /**
++ * @private
++ */
++ override public function addedToParent():void
++ {
++ if (!_DCinitialized)
++ {
++ ValuesManager.valuesImpl.init(this);
++ _DCinitialized = true;
++ }
++
++ super.addedToParent();
++
++ // Even though super.addedToParent dispatched "beadsAdded", DataContainer still needs its data mapper
++ // and item factory beads. These beads are added after super.addedToParent is called in case substitutions
++ // were made; these are just defaults extracted from CSS.
++
++ if (getBeadByType(IDataProviderItemRendererMapper) == null)
++ {
++ var mapper:IDataProviderItemRendererMapper = new (ValuesManager.valuesImpl.getValue(this, "iDataProviderItemRendererMapper")) as IDataProviderItemRendererMapper;
++ addBead(mapper);
++ }
++ var itemRendererFactory:IItemRendererClassFactory = getBeadByType(IItemRendererClassFactory) as IItemRendererClassFactory;
++ if (!itemRendererFactory)
++ {
++ itemRendererFactory = new (ValuesManager.valuesImpl.getValue(this, "iItemRendererClassFactory")) as IItemRendererClassFactory;
++ addBead(itemRendererFactory);
++ }
++
++ dispatchEvent(new Event("initComplete"));
++ }
++
++ /*
++ * IList
++ */
++
++ /**
++ * Returns the sub-component that parents all of the item renderers.
++ *
++ * @langversion 3.0
++ * @playerversion Flash 10.2
++ * @playerversion AIR 2.6
++ * @productversion FlexJS 0.0
++ */
++ public function get dataGroup():IItemRendererParent
++ {
++ // The JS-side's view.dataGroup is actually this instance of DataContainerBase
++ return (view as IListView).dataGroup;
++ }
++
++ /*
++ * IItemRendererProvider
++ */
++
++ private var _itemRenderer:IFactory;
++
++ /**
++ * The class or factory used to display each item.
++ *
++ * @langversion 3.0
++ * @playerversion Flash 10.2
++ * @playerversion AIR 2.6
++ * @productversion FlexJS 0.0
++ */
++ public function get itemRenderer():IFactory
++ {
++ return _itemRenderer;
++ }
++ public function set itemRenderer(value:IFactory):void
++ {
++ _itemRenderer = value;
++ }
++
++ /**
++ * Returns whether or not the itemRenderer property has been set.
++ *
++ * @see org.apache.flex.core.IItemRendererProvider
++ *
++ * @langversion 3.0
++ * @playerversion Flash 10.2
++ * @playerversion AIR 2.6
++ * @productversion FlexJS 0.0
++ */
++ public function get hasItemRenderer():Boolean
++ {
++ var result:Boolean = false;
++
++ COMPILE::SWF {
++ result = _itemRenderer != null;
++ }
++
++ COMPILE::JS {
++ var test:* = _itemRenderer;
++ result = _itemRenderer !== null && test !== undefined;
++ }
++
++ return result;
++ }
++
++ /*
++ * IItemRendererParent
++ */
++
++ /**
++ * @copy org.apache.flex.core.IItemRendererParent#addItemRenderer()
++ * @private
++ *
++ * @langversion 3.0
++ * @playerversion Flash 10.2
++ * @playerversion AIR 2.6
++ * @productversion FlexJS 0.8
++ */
++ public function addItemRenderer(renderer:IItemRenderer):void
++ {
++ addElement(renderer, true);
++
++ var newEvent:ItemAddedEvent = new ItemAddedEvent("itemAdded");
++ newEvent.item = renderer;
++
++ dispatchEvent(newEvent);
++ }
++
++ /**
++ * @copy org.apache.flex.core.IItemRendererParent#removeItemRenderer()
++ * @private
++ *
++ * @langversion 3.0
++ * @playerversion Flash 10.2
++ * @playerversion AIR 2.6
++ * @productversion FlexJS 0.8
++ */
++ public function removeItemRenderer(renderer:IItemRenderer):void
++ {
++ removeElement(renderer, true);
++
++ var newEvent:ItemRemovedEvent = new ItemRemovedEvent("itemRemoved");
++ newEvent.item = renderer;
++
++ dispatchEvent(newEvent);
++ }
++
++ /**
++ * @copy org.apache.flex.core.IItemRendererParent#removeAllItemRenderers()
++ * @private
++ *
++ * @langversion 3.0
++ * @playerversion Flash 10.2
++ * @playerversion AIR 2.6
++ * @productversion FlexJS 0.8
++ */
++ public function removeAllItemRenderers():void
++ {
++ while (numElements > 0) {
++ var child:IChild = getElementAt(0);
++ removeElement(child);
++ }
++ }
++
++ /**
++ * @copy org.apache.flex.core.IItemRendererParent#getItemRendererForIndex()
++ *
++ * @langversion 3.0
++ * @playerversion Flash 10.2
++ * @playerversion AIR 2.6
++ * @productversion FlexJS 0.8
++ */
++ public function getItemRendererForIndex(index:int):IItemRenderer
++ {
++ if (index < 0 || index >= numElements) return null;
++ return getElementAt(index) as IItemRenderer;
++ }
++
++ /**
++ * Refreshes the itemRenderers. Useful after a size change by the data group.
++ *
++ * @copy org.apache.flex.core.IItemRendererParent#updateAllItemRenderers()
++ * @langversion 3.0
++ * @playerversion Flash 10.2
++ * @playerversion AIR 2.6
++ * @productversion FlexJS 0.8
++ */
++ public function updateAllItemRenderers():void
++ {
++ var n:Number = numElements;
++ for (var i:Number = 0; i < n; i++)
++ {
++ var renderer:DataItemRenderer = getItemRendererForIndex(i) as DataItemRenderer;
++ if (renderer) {
++ renderer.setWidth(this.width,true);
++ renderer.adjustSize();
++ }
++ }
++ }
++
++ }
++}