Merge branch 'pr/72' There was already one merge conflict - so merging now to get master to a current state and prevent duplicate work.
This closes #72 Project: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/commit/3a78eabd Tree: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/tree/3a78eabd Diff: http://git-wip-us.apache.org/repos/asf/incubator-netbeans/diff/3a78eabd Branch: refs/heads/jdk-javac Commit: 3a78eabda26fa643ffc1e20dc2632bff264b1ff3 Parents: 2150433 a81fb15 Author: Matthias Bläsing <mblaes...@doppel-helix.eu> Authored: Sat Oct 7 15:47:11 2017 +0200 Committer: Matthias Bläsing <mblaes...@doppel-helix.eu> Committed: Sat Oct 7 15:47:11 2017 +0200 ---------------------------------------------------------------------- .../org/netbeans/api/debugger/jpda/package.html | 49 +++++----------- .../org/netbeans/spi/debugger/jpda/package.html | 49 +++++----------- apisupport.project/apichanges.xml | 60 ++++++-------------- .../org/netbeans/api/autoupdate/mf-layer.xml | 52 +++++------------ core.multiview/apichanges.xml | 60 ++++++-------------- csl.types/apichanges.xml | 60 ++++++-------------- .../org/netbeans/modules/css/lib/Css3Lexer.java | 53 +++++------------ .../netbeans/modules/css/lib/Css3Parser.java | 53 +++++------------ .../spi/ExecutionEnvironmentFactoryService.java | 53 +++++------------ editor.guards/apichanges.xml | 60 ++++++-------------- extexecution.base/apichanges.xml | 60 ++++++-------------- .../netbeans/modules/j2ee/eclipselink/layer.xml | 58 ++++++------------- .../modules/j2ee/eclipselinkmodelgen/layer.xml | 58 ++++++------------- j2ee.metadata/apichanges.xml | 60 ++++++-------------- j2ee.persistenceapi/apichanges.xml | 60 ++++++-------------- .../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 ++++++-------------- .../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 ++++++-------------- .../netbeans/modules/junit/resources/layer.xml | 52 +++++------------ lib.terminalemulator/arch.xml | 55 ++++++------------ libs.git/apichanges.xml | 60 ++++++-------------- nbbuild/javadoctools/apichanges-template.xml | 59 ++++++------------- o.n.swing.outline/arch.xml | 57 ++++++------------- .../modules/refactoring/api/resources/layer.xml | 52 +++++------------ .../refactoring/java/resources/mf-layer.xml | 52 +++++------------ .../org/netbeans/spi/debugger/ui/package.html | 49 +++++----------- spi.editor.hints.projects/apichanges.xml | 1 + .../src/org/netbeans/spi/viewmodel/package.html | 49 +++++----------- versioning/apichanges.xml | 60 ++++++-------------- .../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.xam/apichanges.xml | 59 ++++++------------- 47 files changed, 733 insertions(+), 1787 deletions(-) ----------------------------------------------------------------------