Merge branch 'develop' into refactor-sprite * develop: (22 commits) Setup for side-by-side Unit test view of swf and js, with flexuint shim, added Reflection tests Initial sweep through wide set of Reflection functionality. Currently only verified as compatible between platforms within the FlexJS classes. This update requires corresponding Falcon/FalconJX updates Examples' compileair target was not copying image assets correctly to the bin-debug output directory. use a subclass so we don't have to bring in DG classes in a class selector. Class selectors do not get pruned from the .css file, only Type selectors do New MobileStocks app. A work in progress so it is not connected to the examples build yet. Fix for StackedViewManager in Mobile project. Updated DataProviderChangeNotifier to listen for replacement of the dataProvider itself. Added ArrayList parallels for Chart classes. [FIX] Added Bindable metas to text and html getters on TextInput. Fixes mxml bindings for these properties. Issue reported by PKumar in users mailing list. Added missing event listeners. change JS CSS encoding add reminder to update JIRA - Added ImageView and ImageModel to the manifest so they are included in the build Removed the explicit creation of model and view for Image now that the CSS defines it universally. Modified the CSS definition for Image so its model and view are included for both SWF and JS production. try selenium 2.53.1 update to 0.8.0 also fix up nightly.properties test update from 0.6.0 to 0.7.0 add a script to update version numbers ...
# Conflicts: # frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Image.as # 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/0c031d92 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/0c031d92 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/0c031d92 Branch: refs/heads/refactor-sprite Commit: 0c031d922de8568a51ebd80cfdc83404ccbff689 Parents: 2166024 1026ec7 Author: Harbs <[email protected]> Authored: Tue Sep 27 12:49:14 2016 +0300 Committer: Harbs <[email protected]> Committed: Tue Sep 27 12:49:14 2016 +0300 ---------------------------------------------------------------------- build.properties | 2 +- build.xml | 37 +- examples/build_example.xml | 3 +- .../CordovaCameraExample-app.xml | 2 +- examples/flexjs/DesktopMap/DesktopMap-app.xml | 2 +- examples/flexjs/MapSearch/MapSearch-app.xml | 2 +- .../flexjs/MobileStocks/MobileStocks-app.xml | 252 ++++++ examples/flexjs/MobileStocks/build-web.xml | 61 ++ examples/flexjs/MobileStocks/build.xml | 94 +++ examples/flexjs/MobileStocks/pom.xml | 94 +++ .../flexjs/MobileStocks/src/MobileStocks.mxml | 43 + .../flexjs/MobileStocks/src/MyInitialView.mxml | 264 ++++++ .../src/StockDataJSONItemConverter.as | 40 + .../MobileStocks/src/assets/arrow_left_24.png | Bin 0 -> 47785 bytes .../MobileStocks/src/assets/background.png | Bin 0 -> 49376 bytes .../flexjs/MobileStocks/src/assets/logo.png | Bin 0 -> 55223 bytes .../src/controller/AlertsViewController.as | 141 ++++ .../src/controller/LaunchViewController.as | 150 ++++ .../src/controller/WatchListController.as | 139 ++++ .../flexjs/MobileStocks/src/models/Alert.as | 94 +++ .../flexjs/MobileStocks/src/models/Asset.as | 77 ++ .../MobileStocks/src/models/AssetsModel.as | 57 ++ .../MobileStocks/src/models/ProductsModel.as | 296 +++++++ .../flexjs/MobileStocks/src/models/Stock.as | 168 ++++ .../MobileStocks/src/renderers/AlertRenderer.as | 44 + .../src/renderers/CompanyNameRenderer.as | 37 + .../src/renderers/SharesTotalRenderer.as | 37 + .../MobileStocks/src/renderers/StockRenderer.as | 47 ++ .../MobileStocks/src/views/AlertsView.mxml | 102 +++ .../MobileStocks/src/views/AssetsView.mxml | 125 +++ .../MobileStocks/src/views/LaunchView.mxml | 161 ++++ .../MobileStocks/src/views/SearchView.mxml | 37 + .../MobileStocks/src/views/StockView.mxml | 102 +++ .../MobileStocks/src/views/WatchListView.mxml | 154 ++++ .../StorageExample/StorageExample-app.xml | 2 +- .../renderers/TodoListItemRendererFactory.as | 68 -- .../src/sample/todo/views/TodoListView.mxml | 53 +- frameworks/projects/Charts/pom.xml | 13 + .../src/main/config/compile-as-config.xml | 1 + .../Charts/src/main/flex/ChartsClasses.as | 11 + ...ItemRendererFactoryForSeriesArrayListData.as | 139 ++++ .../charts/beads/HorizontalCategoryAxisBead.as | 2 +- .../HorizontalCategoryAxisForArrayListBead.as | 85 ++ .../charts/beads/HorizontalLinearAxisBead.as | 4 +- .../HorizontalLinearAxisForArrayListBead.as | 121 +++ .../charts/beads/VerticalCategoryAxisBead.as | 2 +- .../VerticalCategoryAxisForArrayListBead.as | 98 +++ .../flex/charts/beads/VerticalLinearAxisBead.as | 4 +- .../beads/VerticalLinearAxisForArrayListBead.as | 119 +++ .../beads/layouts/BarChartLayoutForArrayList.as | 129 +++ .../layouts/ColumnChartLayoutForArrayList.as | 129 +++ .../beads/layouts/PieChartLayoutForArrayList.as | 142 ++++ .../StackedBarChartLayoutForArrayList.as | 145 ++++ .../StackedColumnChartLayoutForArrayList.as | 142 ++++ .../models/ChartArrayListSelectionModel.as | 75 ++ .../src/main/resources/basic-manifest.xml | 21 + .../org/apache/flex/core/SimpleCSSValuesImpl.as | 17 +- .../projects/HTML/src/main/flex/HTMLClasses.as | 1 - .../org/apache/flex/events/ItemRendererEvent.as | 90 ++ .../src/main/flex/org/apache/flex/html/Image.as | 21 +- .../main/flex/org/apache/flex/html/TextInput.as | 2 + .../org/apache/flex/html/beads/DataGridView.as | 13 +- ...ererFactoryAndEventDispatcherForArrayData.as | 191 ----- .../DataItemRendererFactoryForArrayData.as | 23 +- .../DataItemRendererFactoryForArrayList.as | 13 +- ...ataItemRendererFactoryForHierarchicalData.as | 4 + .../html/beads/DataProviderChangeNotifier.as | 42 +- .../TextItemRendererFactoryForArrayData.as | 23 +- ...extItemRendererFactoryForStringVectorData.as | 23 +- .../html/supportClasses/DataGridColumnList.as | 61 ++ .../HTML/src/main/resources/basic-manifest.xml | 9 + .../HTML/src/main/resources/defaults.css | 16 +- .../apache/flex/mobile/StackedViewManager.as | 13 +- .../flex/reflection/AccessorDefinition.as | 86 ++ .../apache/flex/reflection/DefinitionBase.as | 4 +- .../flex/reflection/DefinitionWithMetaData.as | 46 +- .../flex/reflection/MetaDataArgDefinition.as | 24 +- .../flex/reflection/MetaDataDefinition.as | 66 +- .../apache/flex/reflection/MethodDefinition.as | 105 ++- .../flex/reflection/ParameterDefinition.as | 84 ++ .../apache/flex/reflection/TypeDefinition.as | 823 ++++++++++++++++--- .../flex/reflection/VariableDefinition.as | 36 +- .../org/apache/flex/reflection/describeType.as | 12 +- .../apache/flex/reflection/getAliasByClass.as | 47 ++ .../apache/flex/reflection/getClassByAlias.as | 43 + .../flex/reflection/registerClassAlias.as | 44 + installer.xml | 4 +- manualtests/GenericTests/build.xml | 74 ++ manualtests/GenericTests/src/GenericTests.mxml | 39 + manualtests/GenericTests/src/MyInitialView.mxml | 193 +++++ manualtests/GenericTests/src/README.txt | 61 ++ manualtests/GenericTests/src/TestClasses.as | 37 + .../src/flexUnitTests/CoreTester.as | 30 + .../src/flexUnitTests/JiraIssuesTester.as | 29 + .../src/flexUnitTests/ObservedBugsTester.as | 29 + .../src/flexUnitTests/ReflectionTester.as | 29 + .../flexUnitTests/core/BinaryDataTesterTest.as | 567 +++++++++++++ .../src/flexUnitTests/core/StrandTesterTest.as | 55 ++ .../src/flexUnitTests/jira/JiraTesterTest.as | 73 ++ .../observedbugs/ObservedBugTests.as | 86 ++ .../reflection/ReflectionTesterTest.as | 368 +++++++++ .../reflection/support/ITestInterface.as | 27 + .../reflection/support/ITestInterface2.as | 29 + .../reflection/support/ITestInterface3.as | 27 + .../reflection/support/ITestInterface4.as | 29 + .../reflection/support/TestClass1.as | 91 ++ .../reflection/support/TestClass2.as | 103 +++ .../reflection/support/TestClass3.as | 39 + .../reflection/support/TestClass4.as | 95 +++ .../src/flexunit/framework/Assert.as | 305 +++++++ .../flexunit/framework/AssertionFailedError.as | 39 + .../src/testshim/FlexJSUnitTestRunner.as | 186 +++++ .../GenericTests/src/testshim/TestResult.as | 56 ++ .../GenericTests/testsview/image/Flex.png | Bin 0 -> 3526 bytes manualtests/GenericTests/testsview/index.html | 112 +++ .../testsview/src/GenericTestsContainer.mxml | 32 + .../testsview/src/MyInitialView.mxml | 96 +++ .../testsview/src/controllers/MyController.as | 52 ++ .../testsview/src/models/MyModel.as | 125 +++ .../testsview/src/models/TestResultsModel.as | 40 + marmotinni/java/downloads.xml | 4 +- nightly.properties | 4 +- 122 files changed, 8995 insertions(+), 521 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0c031d92/frameworks/projects/Core/src/main/flex/org/apache/flex/core/SimpleCSSValuesImpl.as ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0c031d92/frameworks/projects/HTML/src/main/flex/HTMLClasses.as ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0c031d92/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Image.as ---------------------------------------------------------------------- diff --cc frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Image.as index 61953ca,0a42d2a..1eda9f4 --- a/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Image.as +++ b/frameworks/projects/HTML/src/main/flex/org/apache/flex/html/Image.as @@@ -18,10 -18,8 +18,9 @@@ //////////////////////////////////////////////////////////////////////////////// package org.apache.flex.html { + import org.apache.flex.core.IImage; import org.apache.flex.core.IImageModel; import org.apache.flex.core.UIBase; - import org.apache.flex.utils.BinaryData; COMPILE::JS { import org.apache.flex.core.WrappedHTMLElement; http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0c031d92/frameworks/projects/HTML/src/main/resources/basic-manifest.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0c031d92/frameworks/projects/HTML/src/main/resources/defaults.css ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/0c031d92/frameworks/projects/Mobile/src/main/flex/org/apache/flex/mobile/StackedViewManager.as ----------------------------------------------------------------------
