Merge branch 'release4.16.0'
Project: http://git-wip-us.apache.org/repos/asf/flex-sdk/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-sdk/commit/ea8a5ab6 Tree: http://git-wip-us.apache.org/repos/asf/flex-sdk/tree/ea8a5ab6 Diff: http://git-wip-us.apache.org/repos/asf/flex-sdk/diff/ea8a5ab6 Branch: refs/heads/master Commit: ea8a5ab637cb4cb46f240433cb8f44cfd34dfd1a Parents: 07e452b 14c9664 Author: Justin Mclean <[email protected]> Authored: Wed Mar 15 15:05:22 2017 +1100 Committer: Justin Mclean <[email protected]> Committed: Wed Mar 15 15:05:22 2017 +1100 ---------------------------------------------------------------------- .gitignore | 1 + ApproveSDK.xml | 21 +- CONTRIBUTORS | 6 + GIT-TEST.txt | 11 +- NOTICE | 2 +- README | 9 +- RELEASE_NOTES | 97 +- bin/asc | 4 +- bin/asdoc | 2 +- bin/compc | 2 +- bin/copylocale | 2 +- bin/digest | 2 +- bin/fcsh | 2 +- bin/fdb | 2 +- bin/fontswf | 4 +- bin/mxmlc | 2 +- bin/optimizer | 2 +- bin/swcdepends | 2 +- bin/swfdump | 4 +- build.properties | 4 +- build.xml | 4 +- flex-sdk-description.xml | 6 +- flexunit-tests.xml | 8 +- frameworks/build.xml | 12 + frameworks/downloads.xml | 134 +- .../src/mx/collections/GroupingCollection2.as | 2 - .../collections/HierarchicalCollectionView.as | 4 +- .../HierarchicalCollectionViewCursor.as | 71 +- .../src/mx/controls/AdvancedDataGridBaseEx.as | 27 +- .../AdvancedDataGridBase.as | 22 +- .../mx/controls/listClasses/AdvancedListBase.as | 17 +- ...rchicalCollectionViewCursor_FindAny_Tests.as | 510 +++++ ...erarchicalCollectionView_FLEX_34775_Tests.as | 4 +- .../tests/mx/controls/FLEX_33058_Tests.as | 196 ++ .../src/mx/managers/NativeDragManagerImpl.as | 2 +- .../apache/flex/collections/VectorCollection.as | 2 +- .../apache/flex/formatters/PostCodeFormatter.as | 4 +- .../src/mx/automation/AutomationClass.as | 4 +- .../experimental/src/spark/components/Alert.as | 5 +- .../assets/fonts/awesome/FontAwesome.otf | Bin 109688 -> 134808 bytes .../src/flatspark/skins/ButtonIconSkin.mxml | 2 +- .../src/flatspark/utils/AwesomeUtils.as | 122 +- frameworks/projects/framework/manifest.xml | 1 + .../framework/src/mx/binding/Binding.as | 2 +- .../framework/src/mx/collections/ArrayList.as | 22 +- .../src/mx/collections/ComplexSortField.as | 2 + .../src/mx/collections/CursorBookmark.as | 13 +- .../framework/src/mx/collections/IViewCursor.as | 18 +- .../src/mx/collections/ListCollectionView.as | 73 +- .../mx/collections/ModifiedCollectionView.as | 26 +- .../framework/src/mx/collections/Sort.as | 9 +- .../framework/src/mx/collections/SortField.as | 5 + .../framework/src/mx/core/CrossDomainRSLItem.as | 2 +- .../framework/src/mx/core/FlexVersion.as | 18 +- .../src/mx/formatters/DateFormatter.as | 2 +- .../systemClasses/MarshallingSupport.as | 4 +- .../src/mx/resources/ResourceManagerImpl.as | 11 +- .../framework/src/mx/utils/ArrayUtil.as | 104 + .../framework/src/mx/utils/ObjectUtil.as | 85 +- .../framework/src/mx/utils/TransformUtil.as | 2 +- .../framework/src/mx/utils/VectorUtil.as | 52 + .../src/mx/validators/EmailValidator.as | 2 +- .../framework/src/mx/validators/Validator.as | 32 +- .../mx/binding/utils/BindingUtils_Tests.as | 234 +++ .../ArrayCollection_AddRemoveNumbers_Tests.as | 174 ++ .../ArrayCollection_AddRemoveObjects_Tests.as | 274 +++ .../ArrayCollection_AddRemoveStrings_Tests.as | 200 ++ ...ArrayCollection_FilerAndSortNumbers_Tests.as | 114 + ...ArrayCollection_FilerAndSortStrings_Tests.as | 114 + .../ArrayCollection_FilterNumbers_Tests.as | 315 +++ .../ArrayCollection_FilterStrings_Tests.as | 341 +++ .../ArrayCollection_SortNumbers_Tests.as | 212 ++ .../ArrayCollection_SortStrings_Tests.as | 254 +++ ...tCollectionView_PropertyChangeEvent_Tests.as | 532 +++++ .../framework/tests/mx/utils/ArrayUtil_Tests.as | 308 +++ .../tests/mx/utils/ObjectUtil_Compare_Tests.as | 161 ++ .../tests/mx/utils/ObjectUtil_Tests.as | 341 +++ .../framework/tests/mx/utils/VectorUtilTests.as | 152 ++ .../supportClasses/ScrollableStageText.as | 24 + .../src/spark/skins/ios7/BusyIndicatorSkin.as | 20 +- .../src/spark/skins/mobile/BusyIndicatorSkin.as | 2 +- .../mx/containers/utilityClasses/BoxLayout.as | 2 +- .../projects/mx/src/mx/controls/ComboBox.as | 4 +- .../projects/mx/src/mx/controls/DataGrid.as | 3 +- .../projects/mx/src/mx/controls/DateField.as | 34 +- .../treeClasses/HierarchicalViewCursor.as | 36 +- .../spark/src/spark/collections/Sort.as | 5 + .../spark/src/spark/collections/SortField.as | 5 + .../spark/src/spark/components/DataGrid.as | 149 +- .../spark/src/spark/components/DropDownList.as | 18 +- .../projects/spark/src/spark/components/Grid.as | 8 +- .../spark/components/GridColumnHeaderGroup.as | 6 +- .../projects/spark/src/spark/components/List.as | 38 +- .../spark/components/gridClasses/GridColumn.as | 4 +- .../components/gridClasses/GridViewLayout.as | 12 +- .../components/supportClasses/ButtonBase.as | 2 +- .../supportClasses/DropDownController.as | 8 - .../spark/components/supportClasses/ListBase.as | 4 +- .../supportClasses/SkinnableComponent.as | 2 +- .../spark/src/spark/layouts/ConstraintLayout.as | 32 +- .../src/spark/skins/spark/BusyIndicatorSkin.as | 21 +- .../projects/spark/src/spark/utils/LabelUtil.as | 5 +- .../spark/src/spark/utils/MouseEventUtil.as | 2 +- .../components/DataGrid_FLEX_26808_Tests.as | 324 +++ .../components/DataGrid_FLEX_34837_Tests.as | 2 + .../components/DropDownList_FLEX_35126_Tests.as | 182 ++ .../CalloutButton_FLEX_34088_Tests.as | 146 ++ .../ConstraintLayout_FLEX_33311_Tests.as | 139 ++ .../tests/spark/skins/spark/FLEX_34625_Tests.as | 15 +- ide/addAIRtoSDK.sh | 59 +- ide/checkAllPlayerGlobals.sh | 54 +- ide/flashbuilder/config/air-config.xml | 21 +- ide/flashbuilder/config/flex-config.xml | 20 +- ide/setFlashPlayerVersion.sh | 79 +- installer.xml | 1973 +++++++++--------- licenseParts/NOTICE.asc | 2 +- licenseParts/NOTICE.base | 2 +- licenseParts/NOTICE.pb | 2 +- licenseParts/saxon9-NOTICES/APACHE-ANT.txt | 13 + licenseParts/saxon9-NOTICES/APACHE-RESOLVER.txt | 9 + licenseParts/saxon9-NOTICES/APACHE-XERCES.txt | 17 + licenseParts/saxon9-NOTICES/CERN.txt | 7 + licenseParts/saxon9-NOTICES/FRIJTERS.txt | 22 + licenseParts/saxon9-NOTICES/GPL+CLASSPATH.txt | 347 +++ licenseParts/saxon9-NOTICES/JAMESCLARK.txt | 25 + licenseParts/saxon9-NOTICES/LEGAL.txt | 33 + licenseParts/saxon9-NOTICES/LICENSE.txt | 15 + licenseParts/saxon9-NOTICES/THAI.txt | 31 + licenseParts/saxon9-NOTICES/UNICODE.txt | 29 + .../src/java/macromedia/asc/embedding/Main.java | 2 +- .../java/macromedia/asc/embedding/Shell.java | 2 +- .../java/macromedia/asc/embedding/SwfMaker.java | 16 +- .../flex2/compiler/common/Configuration.java | 32 + .../java/flex2/linker/LinkerConfiguration.java | 4 + .../src/java/flex2/linker/SimpleMovie.java | 10 + .../src/java/flex2/tools/ASDoc_da.properties | 2 +- .../src/java/flex2/tools/ASDoc_de.properties | 2 +- .../src/java/flex2/tools/ASDoc_en.properties | 2 +- .../src/java/flex2/tools/ASDoc_es.properties | 2 +- .../src/java/flex2/tools/ASDoc_fi.properties | 2 +- .../src/java/flex2/tools/ASDoc_fr.properties | 2 +- .../src/java/flex2/tools/ASDoc_it.properties | 2 +- .../src/java/flex2/tools/ASDoc_ja.properties | 2 +- .../src/java/flex2/tools/ASDoc_ko.properties | 2 +- .../src/java/flex2/tools/ASDoc_nb.properties | 2 +- .../src/java/flex2/tools/ASDoc_nl.properties | 2 +- .../src/java/flex2/tools/ASDoc_pt.properties | 2 +- .../src/java/flex2/tools/ASDoc_ru.properties | 2 +- .../src/java/flex2/tools/ASDoc_sv.properties | 2 +- .../src/java/flex2/tools/ASDoc_zh_CN.properties | 2 +- .../src/java/flex2/tools/ASDoc_zh_TW.properties | 2 +- .../src/java/flex2/tools/Compc_da.properties | 2 +- .../src/java/flex2/tools/Compc_de.properties | 2 +- .../src/java/flex2/tools/Compc_en.properties | 2 +- .../src/java/flex2/tools/Compc_es.properties | 2 +- .../src/java/flex2/tools/Compc_fi.properties | 2 +- .../src/java/flex2/tools/Compc_fr.properties | 2 +- .../src/java/flex2/tools/Compc_it.properties | 2 +- .../src/java/flex2/tools/Compc_ja.properties | 2 +- .../src/java/flex2/tools/Compc_ko.properties | 2 +- .../src/java/flex2/tools/Compc_nb.properties | 2 +- .../src/java/flex2/tools/Compc_nl.properties | 2 +- .../src/java/flex2/tools/Compc_pt.properties | 2 +- .../src/java/flex2/tools/Compc_ru.properties | 2 +- .../src/java/flex2/tools/Compc_sv.properties | 2 +- .../src/java/flex2/tools/Compc_zh_CN.properties | 2 +- .../src/java/flex2/tools/Compc_zh_TW.properties | 2 +- .../java/flex2/tools/DigestTool_da.properties | 2 +- .../java/flex2/tools/DigestTool_de.properties | 2 +- .../java/flex2/tools/DigestTool_en.properties | 2 +- .../java/flex2/tools/DigestTool_es.properties | 2 +- .../java/flex2/tools/DigestTool_fi.properties | 2 +- .../java/flex2/tools/DigestTool_fr.properties | 2 +- .../java/flex2/tools/DigestTool_it.properties | 2 +- .../java/flex2/tools/DigestTool_ja.properties | 2 +- .../java/flex2/tools/DigestTool_ko.properties | 2 +- .../java/flex2/tools/DigestTool_nb.properties | 2 +- .../java/flex2/tools/DigestTool_nl.properties | 2 +- .../java/flex2/tools/DigestTool_pt.properties | 2 +- .../java/flex2/tools/DigestTool_ru.properties | 2 +- .../java/flex2/tools/DigestTool_sv.properties | 2 +- .../flex2/tools/DigestTool_zh_CN.properties | 2 +- .../flex2/tools/DigestTool_zh_TW.properties | 2 +- .../src/java/flex2/tools/Fcsh_da.properties | 2 +- .../src/java/flex2/tools/Fcsh_de.properties | 2 +- .../src/java/flex2/tools/Fcsh_en.properties | 2 +- .../src/java/flex2/tools/Fcsh_es.properties | 2 +- .../src/java/flex2/tools/Fcsh_fi.properties | 2 +- .../src/java/flex2/tools/Fcsh_fr.properties | 2 +- .../src/java/flex2/tools/Fcsh_it.properties | 2 +- .../src/java/flex2/tools/Fcsh_ja.properties | 2 +- .../src/java/flex2/tools/Fcsh_ko.properties | 2 +- .../src/java/flex2/tools/Fcsh_nb.properties | 2 +- .../src/java/flex2/tools/Fcsh_nl.properties | 2 +- .../src/java/flex2/tools/Fcsh_pt.properties | 2 +- .../src/java/flex2/tools/Fcsh_ru.properties | 2 +- .../src/java/flex2/tools/Fcsh_sv.properties | 2 +- .../src/java/flex2/tools/Fcsh_zh_CN.properties | 2 +- .../src/java/flex2/tools/Fcsh_zh_TW.properties | 2 +- .../src/java/flex2/tools/Mxmlc_da.properties | 2 +- .../src/java/flex2/tools/Mxmlc_de.properties | 2 +- .../src/java/flex2/tools/Mxmlc_en.properties | 2 +- .../src/java/flex2/tools/Mxmlc_es.properties | 2 +- .../src/java/flex2/tools/Mxmlc_fi.properties | 2 +- .../src/java/flex2/tools/Mxmlc_fr.properties | 2 +- .../src/java/flex2/tools/Mxmlc_it.properties | 2 +- .../src/java/flex2/tools/Mxmlc_ja.properties | 2 +- .../src/java/flex2/tools/Mxmlc_ko.properties | 2 +- .../src/java/flex2/tools/Mxmlc_nb.properties | 2 +- .../src/java/flex2/tools/Mxmlc_nl.properties | 2 +- .../src/java/flex2/tools/Mxmlc_pt.properties | 2 +- .../src/java/flex2/tools/Mxmlc_ru.properties | 2 +- .../src/java/flex2/tools/Mxmlc_sv.properties | 2 +- .../src/java/flex2/tools/Mxmlc_zh_CN.properties | 2 +- .../src/java/flex2/tools/Mxmlc_zh_TW.properties | 2 +- .../tools/flexbuilder/BuilderConfiguration.java | 10 + .../src/java/flex2/tools/oem/Application.java | 2 +- .../src/java/flex2/tools/oem/Configuration.java | 44 +- .../src/java/flex2/tools/oem/Library.java | 2 +- .../src/java/flex2/tools/oem/Toolkit.java | 4 +- .../oem/internal/ConfigurationConstants.java | 2 + .../tools/oem/internal/LinkerConfiguration.java | 24 + .../tools/oem/internal/OEMConfiguration.java | 30 + .../flex/tools/debugger/cli/fdb_da.properties | 2 +- .../flex/tools/debugger/cli/fdb_de.properties | 2 +- .../flex/tools/debugger/cli/fdb_en.properties | 4 +- .../flex/tools/debugger/cli/fdb_es.properties | 2 +- .../flex/tools/debugger/cli/fdb_fi.properties | 2 +- .../flex/tools/debugger/cli/fdb_fr.properties | 2 +- .../flex/tools/debugger/cli/fdb_it.properties | 2 +- .../flex/tools/debugger/cli/fdb_ja.properties | 2 +- .../flex/tools/debugger/cli/fdb_ko.properties | 2 +- .../flex/tools/debugger/cli/fdb_nb.properties | 2 +- .../flex/tools/debugger/cli/fdb_nl.properties | 2 +- .../flex/tools/debugger/cli/fdb_pt.properties | 2 +- .../flex/tools/debugger/cli/fdb_ru.properties | 2 +- .../flex/tools/debugger/cli/fdb_sv.properties | 2 +- .../tools/debugger/cli/fdb_zh_CN.properties | 2 +- .../tools/debugger/cli/fdb_zh_TW.properties | 2 +- modules/downloads.xml | 109 +- .../swfutils/src/java/flash/swf/TagDecoder.java | 7 +- .../swfutils/src/java/flash/swf/TagEncoder.java | 4 +- .../src/java/flash/swf/tags/FileAttributes.java | 4 + .../src/java/flash/swf/tools/SwfxParser.java | 2 + .../src/java/flash/swf/tools/SwfxPrinter.java | 2 + modules/thirdparty/batik/build.xml | 2 +- .../velocity/test/texen/additional.props | 1 - .../velocity/test/texen/compare/Test.txt | 11 - .../test/texen/compare/TurbineWeather.java | 81 - .../texen/compare/TurbineWeatherService.java | 78 - .../test/texen/compare/WeatherService.java | 70 - .../velocity/test/texen/compare/book.txt | 15 - .../thirdparty/velocity/test/texen/license.txt | 55 - .../velocity/test/texen/service.props | 21 - .../velocity/test/texen/templates/Control.vm | 41 - .../texen/templates/ServiceImplementation.vm | 39 - .../test/texen/templates/ServiceInterface.vm | 31 - .../test/texen/templates/ServiceStaticHelper.vm | 42 - .../velocity/test/texen/templates/Test.vm | 27 - .../velocity/test/texen/templates/book.vm | 31 - .../velocity/test/texen/templates/test.props | 4 - .../Sort/SWFs/SF_ORIG_ListBasic.mxml | 5 +- templates/swfobject/history/history.js | 23 +- 263 files changed, 8371 insertions(+), 2276 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-sdk/blob/ea8a5ab6/frameworks/projects/framework/src/mx/resources/ResourceManagerImpl.as ---------------------------------------------------------------------- diff --cc frameworks/projects/framework/src/mx/resources/ResourceManagerImpl.as index 9b56bee,92915a0..a92a77c --- a/frameworks/projects/framework/src/mx/resources/ResourceManagerImpl.as +++ b/frameworks/projects/framework/src/mx/resources/ResourceManagerImpl.as @@@ -927,10 -927,12 +927,9 @@@ public class ResourceManagerImpl extend parameters:Array = null, locale:String = null):String { - var resourceBundle:IResourceBundle = - findBundle(bundleName, resourceName, locale); + var resourceBundle:IResourceBundle = findBundle(bundleName, resourceName, locale); if (!resourceBundle) return null; - - if(!(resourceName in resourceBundle.content)) - return null; var value:String = String(resourceBundle.content[resourceName]);
