Merge master into jdk-javac
Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/4e662ec7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/4e662ec7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/4e662ec7 Branch: refs/heads/jdk-javac Commit: 4e662ec703a6aa7a41f09d6e5dc8de5b10e0f1d3 Parents: 8bc9bf3 b8762ab Author: Jan Lahoda <[email protected]> Authored: Sun Oct 8 15:46:25 2017 +0200 Committer: Jan Lahoda <[email protected]> Committed: Sun Oct 8 15:46:25 2017 +0200 ---------------------------------------------------------------------- .gitignore | 1 + .../org/netbeans/api/debugger/jpda/package.html | 49 ++--- .../org/netbeans/spi/debugger/jpda/package.html | 49 ++--- api.progress.nb/apichanges.xml | 60 ++---- api.progress/apichanges.xml | 60 ++---- .../projects/UtilitiesTestProject/build.xml | 20 ++ .../nbproject/build-impl.xml | 20 ++ .../nbproject/genfiles.properties | 17 ++ .../nbproject/project.properties | 17 ++ .../UtilitiesTestProject/nbproject/project.xml | 20 ++ .../test/unit/data/projects/Project1/build.xml | 20 ++ .../projects/Project1/nbproject/build-impl.xml | 20 ++ .../Project1/nbproject/genfiles.properties | 17 ++ .../Project1/nbproject/project.properties | 17 ++ .../projects/Project1/nbproject/project.xml | 20 ++ .../src/org/netbeans/modules/templates/utf8.xml | 21 ++ api.visual/examples-readme.txt | 53 ++--- .../netbeans/api/xml/parsers/data/Entity.dtd | 20 ++ .../api/xml/parsers/data/RelativeTest.dtd | 20 ++ apisupport.harness/windows-launcher-src/app.rc | 47 ++--- apisupport.project/apichanges.xml | 60 ++---- .../api/autoupdate/data/updates-subset.xml | 20 ++ .../netbeans/api/autoupdate/data/updates.xml | 20 ++ .../org/netbeans/api/autoupdate/mf-layer.xml | 52 ++--- .../autoupdate/updateprovider/data/catalog.xml | 21 +- .../autoupdate/updateprovider/malformed.xml | 20 ++ .../netbeans/updater/UpdateTrackingTest.java | 53 ++--- .../resources/templates/AddProperty.freemarker | 47 ++--- beans/test/qa-func/src/gui/data/TestFile.java | 18 ++ .../qa-functional/data/projects/Beans/build.xml | 20 ++ .../data/projects/Beans/src/beans/Add.java | 19 +- .../projects/Beans/src/beans/AddBeanInfo.java | 22 +- .../data/projects/Beans/src/beans/Beans.java | 18 ++ .../data/projects/Beans/src/beans/Generate.java | 18 ++ .../data/projects/Beans/src/beans/Source.java | 18 ++ .../Beans/src/beans/SourceBeanInfo.java | 22 +- .../projects/Beans/src/members/Test_A_A.java | 18 ++ core.multiview/apichanges.xml | 60 ++---- .../csl/editor/semantic/Bundle.properties | 57 ++--- csl.types/apichanges.xml | 60 ++---- .../org/netbeans/modules/css/lib/Css3Lexer.java | 53 ++--- .../netbeans/modules/css/lib/Css3Parser.java | 53 ++--- .../org/netbeans/modules/css/visual/todo.txt | 17 ++ .../qa-functional/data/CSSTestProject/build.xml | 20 ++ .../CSSTestProject/nbproject/ant-deploy.xml | 20 ++ .../data/CSSTestProject/web/WEB-INF/sun-web.xml | 20 ++ .../data/CSSTestProject/web/WEB-INF/web.xml | 20 ++ .../CSSTestProject/web/css/navigatorTest.css | 19 ++ derby/etc/sample.sql | 17 ++ .../spi/ExecutionEnvironmentFactoryService.java | 53 ++--- .../projects/editor_bookmarks_test/build.xml | 20 ++ .../nbproject/project.properties | 17 ++ .../editor_bookmarks_test/nbproject/project.xml | 20 ++ editor.completion/apichanges.xml | 60 ++---- .../modules/editor/completion/Bundle.properties | 53 ++--- .../editor/errorstripe/resources/layer.xml | 52 ++--- .../modules/editor/errorstripe/test-layer.xml | 52 ++--- editor.guards/apichanges.xml | 60 ++---- .../settings/storage/fonts-and-colors-2.xml | 20 ++ .../settings/storage/fonts-and-colors-3.xml | 20 ++ .../settings/storage/fonts-and-colors-4.xml | 20 ++ .../settings/storage/fonts-and-colors-5.xml | 20 ++ .../storage/fonts-and-colors-all-languages.xml | 20 ++ .../settings/storage/fonts-and-colors.xml | 20 ++ .../editor/settings/storage/key-bindings.xml | 20 ++ .../editor/settings/storage/preferences.xml | 20 ++ .../preferences/preferences-all-languages.xml | 20 ++ .../storage/preferences/preferences-testA-1.xml | 20 ++ .../storage/preferences/preferences-testA-2.xml | 20 ++ editor.settings/branch-info.txt | 18 ++ editor/demosrc/base/settings.properties | 50 ++--- editor/src/META-INF/netbeans/translate.names | 52 ++--- .../test/qa-functional/data/cp-prj-1/build.xml | 20 ++ .../data/cp-prj-1/nbproject/project.properties | 17 ++ .../data/cp-prj-1/nbproject/project.xml | 20 ++ .../data/projects/editor_test/build.xml | 20 ++ .../editor_test/nbproject/project.properties | 17 ++ .../projects/editor_test/nbproject/project.xml | 20 ++ .../editor/impl/KitsTracker-test-layer.xml | 20 ++ .../SideBarFactoriesProvider-test-layer.xml | 20 ++ extexecution.base/apichanges.xml | 60 ++---- extexecution/apichanges.xml | 60 ++---- .../nbproject/configs/JWS_generated.properties | 50 ++--- .../netbeans/projectopener/Bundle.properties | 49 ++--- .../unit/data/JavaApp/nbproject/project.xml | 20 ++ .../netbeans/modules/j2ee/eclipselink/layer.xml | 58 ++--- .../modules/j2ee/eclipselinkmodelgen/layer.xml | 58 ++--- j2ee.metadata/apichanges.xml | 60 ++---- j2ee.persistenceapi/apichanges.xml | 60 ++---- .../java/examples/FoldersListSettings.java | 56 ++--- .../java/hints/declarative/resources/layer.xml | 52 ++--- java.hints.test/apichanges.xml | 59 ++---- .../java/hints/errors/empty-class-template.xml | 52 ++--- .../java/hints/errors/only-imports-layer.xml | 52 ++--- .../resources/build-native-prototype.xml | 57 ++--- .../java/j2semodule/ui/resources/module.html | 49 ++--- java.lexer/apichanges.xml | 60 ++---- .../unit/data/hints/metrics/CoupledEnum.java | 20 +- .../data/hints/metrics/CoupledException.java | 20 +- .../unit/data/hints/metrics/FullBranch.java | 20 +- .../unit/data/hints/metrics/MethodCount.java | 18 ++ .../data/hints/metrics/MethodCountAbstract.java | 18 ++ .../data/hints/metrics/MethodCountLess.java | 18 ++ .../unit/data/hints/metrics/MethodCoupled.java | 20 +- .../unit/data/hints/metrics/MethodLimits.java | 20 +- .../unit/data/hints/metrics/MethodNoReturn.java | 20 +- .../data/hints/metrics/MethodNotCoupled.java | 20 +- .../data/hints/metrics/MethodNotTooComplex.java | 20 +- .../data/hints/metrics/MethodNotTooDeep.java | 20 +- .../unit/data/hints/metrics/MethodReturn.java | 20 +- .../data/hints/metrics/MethodTooComplex.java | 20 +- .../unit/data/hints/metrics/MethodTooDeep.java | 20 +- .../unit/data/hints/metrics/NoMethodLimits.java | 20 +- .../metrics/NotTooManyLinesOrCommands.java | 20 +- .../hints/metrics/TooManyLinesOrCommands.java | 20 +- .../java/project/ui/resources/module-info.html | 49 ++--- .../java/project/ui/resources/package-info.html | 47 ++--- java.source.queries/apichanges.xml | 60 ++---- java.source/apichanges.xml | 52 ++--- java.sourceui/apichanges.xml | 60 ++---- .../modules/jshell/project/Bundle.properties | 55 ++--- .../netbeans/modules/jshell/tool/Feedback.java | 37 ++-- jumpto/apichanges.xml | 58 ++--- .../modules/jumpto/type/GoToTypeAction.java | 57 ++--- .../netbeans/modules/junit/resources/layer.xml | 52 ++--- .../modules/lexer/nbbridge/test/testLayer.xml | 20 ++ lib.terminalemulator/arch.xml | 55 ++--- libs.antlr3.runtime/external/binaries-list | 2 +- libs.felix/external/binaries-list | 19 +- libs.felix/external/felix-4.2.1-license.txt | 209 ------------------- .../org.apache.felix.main-4.2.1-license.txt | 208 ++++++++++++++++++ .../org.apache.felix.main-4.2.1-notice.txt | 8 + libs.felix/nbproject/project.properties | 2 +- libs.felix/nbproject/project.xml | 4 +- libs.git/apichanges.xml | 60 ++---- libs.jna.platform/external/binaries-list | 19 +- .../external/jna-platform-4.2.2-license.txt | 3 +- libs.jna/external/binaries-list | 19 +- libs.jna/external/jna-4.2.2-license.txt | 3 +- .../masterfs/ui/suspend/Bundle.properties | 16 ++ .../modules/mylyn/util/wiki/Bundle.properties | 55 ++--- nbbuild/build.xml | 13 +- nbbuild/javadoctools/apichanges-template.xml | 59 ++---- .../modules/notifications/Bundle.properties | 50 ++--- o.n.swing.outline/arch.xml | 57 ++--- parsing.api/arch.xml | 55 ++--- parsing.indexing/arch.xml | 55 ++--- .../parsing/nb/CursorSensitiveScheduler.java | 53 ++--- .../netbeans/api/project/libraries/package.html | 55 ++--- .../modules/refactoring/api/resources/layer.xml | 52 ++--- .../refactoring/java/resources/mf-layer.xml | 52 ++--- .../spellchecker/hints/Bundle.properties | 57 ++--- .../org/netbeans/spi/debugger/ui/package.html | 49 ++--- spi.editor.hints.projects/apichanges.xml | 58 ++--- .../spi/editor/hints/projects/Bundle.properties | 54 ++--- .../hints/projects/support/Bundle.properties | 54 ++--- spi.editor.hints/apichanges.xml | 57 ++--- .../netbeans/spi/java/hints/Bundle.properties | 54 ++--- spi.navigator/apichanges.xml | 61 ++---- spi.palette/apichanges.xml | 60 ++---- .../src/org/netbeans/spi/viewmodel/package.html | 49 ++--- .../team/commons/resources/package-info.java | 53 ++--- terminal/README.attributes | 17 ++ terminal/README.close_semantics | 17 ++ .../modules/testng/maven/Bundle.properties | 50 ++--- versioning/apichanges.xml | 60 ++---- .../websvc/saas/codegen/ui/Bundle.properties | 54 ++--- .../modules/websvc/saas/ui/Bundle.properties | 55 ++--- .../websvc/saas/ui/wizards/Bundle.properties | 55 ++--- .../release/docs/GUIExamplesDescription.html | 47 ++--- .../release/docs/SwingInteropDescription.html | 47 ++--- .../src/org/netbeans/modules/xml/jaxb/layer.xml | 52 ++--- .../text/syntax/javacc/DTDSyntaxConstants.java | 55 ++--- .../syntax/javacc/DTDSyntaxTokenManager.java | 55 ++--- .../xml/text/syntax/javacc/ParseException.java | 55 ++--- .../modules/xml/text/syntax/javacc/Token.java | 55 ++--- .../xml/text/syntax/javacc/TokenMgrError.java | 55 ++--- .../xml/tools/java/resources/Bundle.properties | 53 ++--- xml.xam/apichanges.xml | 59 ++---- 179 files changed, 3138 insertions(+), 3636 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-netbeans/blob/4e662ec7/nbbuild/build.xml ----------------------------------------------------------------------
