This is an automated email from the ASF dual-hosted git repository. jtulach pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
commit a174e1fcc369084f6e66b76402d8f39d8473d51e Merge: 743b777 c5b7442 Author: Jaroslav Tulach <[email protected]> AuthorDate: Thu Dec 21 12:39:05 2017 +0100 Merge pull request #333 from jlahoda/jdk-javac Making nb-javac optional .travis.yml | 4 +- apisupport.project/nbproject/project.properties | 1 + apisupport.wizards/nbproject/project.properties | 1 + beans/nbproject/project.properties | 1 + .../addproperty/AddPropertyCodeGenerator.java | 4 +- .../src/org/netbeans/core/startup/NbInstaller.java | 2 + debugger.jpda.ant/nbproject/project.properties | 1 + .../debugger/jpda/projects/ClassScanner.java | 4 +- .../jpda/projects/EditorContextSupport.java | 6 +- .../debugger/jpda/projects/ExpressionScanner.java | 4 +- .../jpda/projects/MethodArgumentsScanner.java | 4 +- .../debugger/jpda/projects/PreferredCCParser.java | 8 +- .../debugger/jpda/projects/ScanLocalVars.java | 4 +- .../jpda/projectsui/EditorContextImpl.java | 6 +- debugger.jpda.visual/nbproject/project.xml | 8 + .../modules/debugger/jpda/EditorContextBridge.java | 20 +- .../debugger/jpda/expr/CanInterpretVisitor.java | 4 +- .../debugger/jpda/expr/EvaluatorVisitor.java | 4 +- .../api/debugger/jpda/JDIWrappersTest.java | 4 +- form.binding/nbproject/project.properties | 1 + form.j2ee/nbproject/project.properties | 1 + form.nb/nbproject/project.properties | 1 + form.refactoring/nbproject/project.properties | 1 + .../RADComponentRenameRefactoringSupport.java | 4 +- hibernate/nbproject/project.properties | 2 + i18n/nbproject/project.properties | 1 + ide/launcher/netbeans.conf | 2 +- j2ee.core.utilities/nbproject/project.properties | 2 + .../api/common/classpath/ModuleClassPaths.java | 4 +- .../common/impl/DefaultProjectModulesModifier.java | 8 +- .../api/common/impl/TemplateModuleDeclarator.java | 4 +- java.completion/nbproject/project.xml | 4 + .../netbeans/modules/java/completion/BaseTask.java | 5 +- .../java/completion/JavaCompletionTask.java | 3 +- .../java/completion/CompletionTestBase.java | 27 +- .../java/debug/TreeNavigatorProviderImpl.java | 4 +- .../java/editor/base/imports/UnusedImports.java | 4 +- .../java/editor/base/javadoc/JavadocImports.java | 14 +- .../semantic/MarkOccurrencesHighlighterBase.java | 4 +- .../editor/base/semantic/UnusedImportsTest.java | 4 +- java.editor/nbproject/project.xml | 4 + .../netbeans/modules/editor/java/GoToSupport.java | 6 +- .../editor/java/JavaCodeTemplateProcessor.java | 3 +- .../netbeans/modules/editor/java/Utilities.java | 8 +- .../editor/codegen/EqualsHashCodeGenerator.java | 4 +- .../editor/fold/ResourceStringFoldProvider.java | 4 +- .../java/editor/imports/ClipboardHandler.java | 4 +- .../java/editor/imports/JavaFixAllImports.java | 4 +- .../java/editor/rename/InstantRenamePerformer.java | 4 +- .../modules/editor/java/GoToSupportTest.java | 5 +- .../modules/editor/java/UtilitiesTest.java | 4 +- .../codegen/DelegateMethodGeneratorTest.java | 4 +- .../java/editor/completion/CompletionTestBase.java | 4 +- .../IsOverriddenAnnotationCreatorTest.java | 6 +- .../hints/declarative/DeclarativeHintsParser.java | 13 +- .../hints/declarative/conditionapi/Matcher.java | 6 +- .../debugging/EvaluationSpanTaskTest.java | 4 +- .../modules/java/hints/test/api/HintTest.java | 2 - java.hints.ui/nbproject/project.properties | 1 + .../modules/java/hints/ArithmeticUtilities.java | 4 +- .../modules/java/hints/AssignmentIssues.java | 4 +- .../java/hints/ConvertAnonymousToInner.java | 8 +- .../netbeans/modules/java/hints/DoubleCheck.java | 4 +- .../modules/java/hints/EqualsMethodHint.java | 4 +- .../modules/java/hints/OrganizeImports.java | 4 +- .../modules/java/hints/WrongPackageSuggestion.java | 4 +- .../java/hints/bugs/AssertWithSideEffects.java | 14 - .../modules/java/hints/bugs/CloneAndCloneable.java | 4 +- .../hints/bugs/ComparatorParameterNotUsed.java | 4 +- .../modules/java/hints/bugs/InfiniteRecursion.java | 4 +- .../netbeans/modules/java/hints/bugs/Regexp.java | 4 +- .../org/netbeans/modules/java/hints/bugs/Tiny.java | 6 +- .../modules/java/hints/bugs/TryCatchFinally.java | 4 +- .../java/hints/control/RemoveUnnecessary.java | 4 +- .../java/hints/errors/AddParameterOrLocalFix.java | 4 +- .../hints/errors/ImplementAllAbstractMethods.java | 4 +- .../hints/errors/MagicSurroundWithTryCatchFix.java | 4 +- .../java/hints/errors/MissingReturnStatement.java | 3 - .../hints/errors/OrigSurroundWithTryCatchFix.java | 4 +- .../modules/java/hints/errors/Utilities.java | 18 +- .../hints/finalize/FinalizeDoesNotCallSuper.java | 4 +- .../modules/java/hints/introduce/Flow.java | 4 +- .../java/hints/introduce/InstanceRefFinder.java | 4 +- .../java/hints/introduce/IntroduceHint.java | 12 +- .../java/hints/introduce/ReferenceTransformer.java | 4 +- .../java/hints/introduce/ScanStatement.java | 4 +- .../modules/java/hints/jdk/ConvertToARM.java | 12 +- .../java/hints/jdk/ConvertToLambdaConverter.java | 4 +- .../jdk/ConvertToLambdaPreconditionChecker.java | 4 +- .../modules/java/hints/jdk/IteratorToFor.java | 4 +- .../modules/java/hints/jdk/UseSpecificCatch.java | 4 +- .../hints/jdk/mapreduce/PreconditionsChecker.java | 8 +- .../modules/java/hints/perf/ManualArrayCopy.java | 4 +- .../java/hints/perf/ReplaceBufferByString.java | 8 +- .../java/hints/perf/StringBuffer2Builder.java | 4 +- .../java/hints/suggestions/IfToSwitchSupport.java | 8 +- .../modules/java/hints/suggestions/Lambda.java | 6 +- .../modules/java/hints/suggestions/Tiny.java | 4 +- .../modules/java/hints/threading/Tiny.java | 4 +- .../java/hints/ConvertAnonymousToInnerTest.java | 4 +- .../java/hints/SuspiciousNamesCombinationTest.java | 4 +- .../hints/infrastructure/TreeRuleTestBase.java | 4 +- .../java/hints/introduce/RefFinderTest.java | 4 - java.j2semodule/nbproject/project.properties | 1 + java.j2seprofiles/nbproject/project.properties | 1 + .../java/j2seprofiles/ProfilesAnalyzer.java | 4 +- java.j2seproject/nbproject/project.properties | 1 + .../modules/java/metrics/hints/ClassMetrics.java | 2 +- .../metrics/hints/CyclomaticComplexityVisitor.java | 4 +- .../java/metrics/hints/DependencyCollector.java | 4 +- .../modules/java/metrics/hints/DepthVisitor.java | 4 +- .../java/metrics/hints/ExpressionVisitor.java | 4 +- .../modules/java/metrics/hints/MethodMetrics.java | 8 +- .../modules/java/metrics/hints/NCLOCVisitor.java | 4 +- java.module.graph/nbproject/project.properties | 1 + java.module.graph/nbproject/project.xml | 9 - .../java/navigation/BreadCrumbsNodeImpl.java | 4 +- .../java/navigation/ElementScanningTask.java | 4 +- .../java/navigation/actions/OpenAction.java | 4 +- .../nbproject/project.properties | 1 + java.source.base/nbproject/project.properties | 1 + java.source.base/nbproject/project.xml | 22 +- .../netbeans/api/java/source/AssignComments.java | 4 +- .../netbeans/api/java/source/CompilationInfo.java | 25 +- .../netbeans/api/java/source/ElementHandle.java | 7 +- .../netbeans/api/java/source/ElementUtilities.java | 3 +- .../api/java/source/GeneratorUtilities.java | 18 +- .../org/netbeans/api/java/source/JavaSource.java | 3 + .../org/netbeans/api/java/source/SourceUtils.java | 6 +- .../api/java/source/TranslateIdentifier.java | 4 +- .../org/netbeans/api/java/source/TreeMaker.java | 6 +- .../netbeans/api/java/source/TreePathHandle.java | 4 +- .../netbeans/api/java/source/TreeUtilities.java | 302 ++++++++++++++---- .../netbeans/api/java/source/TypeUtilities.java | 105 +++++- .../org/netbeans/api/java/source/WorkingCopy.java | 21 +- .../source/support/CancellableTreePathScanner.java | 4 +- .../source/support/CancellableTreeScanner.java | 4 +- .../source/support/ErrorAwareTreePathScanner.java | 30 +- .../java/source/support/ErrorAwareTreeScanner.java | 30 +- .../java/source/CompilationInfoAccessor.java | 65 ++++ .../netbeans/modules/java/source/ElementUtils.java | 94 ++++++ .../modules/java/source/JavaSourceUtilImpl.java | 12 +- .../netbeans/modules/java/source/JavadocEnv.java | 24 +- .../netbeans/modules/java/source/ModuleNames.java | 10 +- .../modules/java/source/NoJavacHelper.java | 78 +++++ .../modules/java/source/PostFlowAnalysis.java | 2 +- .../modules/java/source/TreeUtilitiesAccessor.java | 67 ++++ .../modules/java/source/base/SourceLevelUtils.java | 34 +- .../netbeans/modules/java/source/base/layer.xml | 7 - .../java/source/builder/ElementsService.java | 3 +- .../java/source/indexing/CompileWorker.java | 40 +-- .../source/indexing/DiagnosticListenerImpl.java | 6 +- .../modules/java/source/indexing/FQN2Files.java | 4 +- .../java/source/indexing/JavaBinaryIndexer.java | 15 +- .../java/source/indexing/JavaCustomIndexer.java | 40 ++- .../modules/java/source/indexing/JavaIndex.java | 2 +- .../java/source/indexing/JavaParsingContext.java | 16 +- .../java/source/indexing/SourcePrefetcher.java | 4 +- ...ompileWorker.java => VanillaCompileWorker.java} | 326 +++++++++++++------ .../modules/java/source/matching/CopyFinder.java | 4 +- .../source/parsing/AbstractSourceFileObject.java | 5 +- .../java/source/parsing/BasicSourceFileObject.java | 2 +- .../java/source/parsing/CachingFileManager.java | 9 +- .../java/source/parsing/CompilationInfoImpl.java | 25 +- .../source/parsing/FileManagerTransaction.java | 6 +- .../modules/java/source/parsing/FileObjects.java | 1 + .../java/source/parsing/JavacFlowListener.java | 4 +- .../modules/java/source/parsing/JavacParser.java | 353 ++++++++------------- .../java/source/parsing/JavacParserFactory.java | 3 + .../java/source/parsing/ModuleFileManager.java | 9 +- .../java/source/parsing/ModuleOraculum.java | 13 +- .../java/source/parsing/OutputFileManager.java | 5 +- .../modules/java/source/parsing/ParsingUtils.java | 53 ++++ .../java/source/parsing/ProxyFileManager.java | 3 + .../java/source/pretty/ImportAnalysis2.java | 6 +- .../modules/java/source/pretty/VeryPretty.java | 16 +- .../modules/java/source/save/CasualDiff.java | 28 +- .../modules/java/source/save/Reformatter.java | 13 +- .../modules/java/source/save/Reindenter.java | 16 +- .../java/source/usages/SourceAnalyzerFactory.java | 8 +- .../api/java/source/APIIsSelfContainedTest.java | 2 - .../api/java/source/CommentCollectorTest.java | 22 +- .../api/java/source/ElementHandleTest.java | 29 +- .../netbeans/api/java/source/JavaSourceTest.java | 64 +++- .../api/java/source/SourceUtilsTestUtil.java | 45 +-- .../api/java/source/SourceUtilsTestUtil2.java | 23 +- .../api/java/source/TreeUtilitiesTest.java | 45 ++- .../api/java/source/TypeMirrorHandleTest.java | 4 +- .../api/java/source/gen/AnnotationTest.java | 12 +- .../netbeans/api/java/source/gen/ArraysTest.java | 4 +- .../netbeans/api/java/source/gen/BlockTest.java | 4 +- .../netbeans/api/java/source/gen/CommentsTest.java | 12 +- .../api/java/source/gen/CompilationUnitTest.java | 6 +- .../api/java/source/gen/ConstructorTest.java | 6 +- .../netbeans/api/java/source/gen/DoctreeTest.java | 72 ++--- .../org/netbeans/api/java/source/gen/EnumTest.java | 6 +- .../netbeans/api/java/source/gen/ForLoopTest.java | 4 +- .../api/java/source/gen/GuardedBlockTest.java | 6 +- .../netbeans/api/java/source/gen/LambdaTest.java | 46 +-- .../api/java/source/gen/MemberAdditionTest.java | 6 +- .../api/java/source/gen/MethodBodyTest.java | 8 +- .../api/java/source/gen/ModifiersTest.java | 8 +- .../netbeans/api/java/source/gen/MoveTreeTest.java | 6 +- .../api/java/source/gen/MultiCatchTest.java | 10 +- .../source/gen/RefactoringRegressionsTest.java | 4 +- .../source/gen/RewriteOccasionalStatements.java | 6 +- .../netbeans/api/java/source/gen/SwitchTest.java | 6 +- .../org/netbeans/api/java/source/gen/TryTest.java | 4 +- .../api/java/source/gen/TypeAnnotationTest.java | 10 +- .../org/netbeans/modules/java/source/TestUtil.java | 79 +++++ .../source/indexing/CompileWorkerTestBase.java | 67 ++-- .../source/indexing/VanillaCompileWorkerTest.java | 195 ++++++++++++ .../java/source/parsing/ClasspathInfoTest.java | 9 +- .../java/source/parsing/JavacParserTest.java | 54 +++- .../java/source/parsing/ModuleOraculumTest.java | 21 -- .../parsing/TestJavaPlatformProviderImpl.java | 20 +- .../modules/java/source/transform/Transformer.java | 4 +- .../java/source/usages/CompromiseSATest.java | 4 +- .../java/source/usages/SourceAnalyzerTest.java | 19 +- {libs.javacapi => java.source.nbjavac}/build.xml | 3 +- java.source.nbjavac/manifest.mf | 6 + .../nbproject/project.properties | 3 + .../nbproject/project.xml | 64 ++-- .../modules/java/source/nbjavac/Bundle.properties | 4 +- .../indexing}/ClassNamesForFileOraculumImpl.java | 2 +- .../nbjavac}/indexing/MultiPassCompileWorker.java | 19 +- .../indexing/NBJavacCompileWorkerProvider.java | 31 +- .../nbjavac}/indexing/OnePassCompileWorker.java | 22 +- .../indexing/SuperOnePassCompileWorker.java | 22 +- .../nbjavac/parsing/ContextEnhancerImpl.java | 24 +- .../nbjavac}/parsing/FindAnonymousVisitor.java | 6 +- .../nbjavac/parsing/PartialReparserImpl.java | 226 +++++++++++++ .../nbjavac/parsing/PartialReparserService.java | 72 ++++- .../nbjavac/parsing/SequentialParsingImpl.java | 26 +- .../parsing/TranslatePositionsVisitor.java | 9 +- .../java/source/nbjavac/parsing}/TreeLoader.java | 37 ++- .../lib/nbjavac/services/CouplingTest.java | 6 +- .../ClassNamesForFileOraculumImplTest.java | 2 +- .../indexing/MultiPassCompileWorkerTest.java | 8 +- .../indexing/NBJavacCompileWorkerTestBase.java | 55 ++++ .../indexing/OnePassCompileWorkerTest.java | 5 +- .../indexing/SuperOnePassCompileWorkerTest.java | 5 +- .../source/nbjavac/indexing}/TreeLoaderTest.java | 2 +- .../source/queriesimpl/JavaOperationsImpl.java | 8 +- java.source/nbproject/project.xml | 8 + .../src/org/netbeans/api/java/source/UiUtils.java | 4 +- .../src/org/netbeans/modules/java/JavaNode.java | 4 +- .../modules/java/classfile/CodeGenerator.java | 18 +- .../modules/java/source/JBrowseModule.java | 62 +++- .../java/source/parsing/SourceFileObject.java | 2 +- .../netbeans/api/java/source/gen/LambdaTest.java | 46 +-- .../netbeans/api/java/source/ui/ElementOpen.java | 4 +- .../java/source/ui/AsyncJavaSymbolDescriptor.java | 6 +- .../api/java/source/ui/ElementHeadersTest.java | 4 +- java.testrunner.ui/nbproject/project.properties | 1 + java.testrunner/nbproject/project.properties | 1 + javaee.injection/nbproject/project.properties | 1 + .../javafx2/editor/FXMLCompletionTestBase.java | 4 +- javafx2.project/nbproject/project.properties | 1 + javawebstart/nbproject/project.properties | 1 + jshell.support/nbproject/project.properties | 2 +- jshell.support/nbproject/project.xml | 9 +- junit.ant.ui/nbproject/project.properties | 1 + junit.ui/nbproject/project.properties | 1 + .../netbeans/modules/junit/ui/OpenTestAction.java | 4 +- .../services/{NBEnter.java => NBClassFinder.java} | 37 +-- .../lib/nbjavac/services/NBClassReader.java | 40 --- .../lib/nbjavac/services/NBClassWriter.java | 124 -------- .../org/netbeans/lib/nbjavac/services/NBEnter.java | 14 + .../services/{NBEnter.java => NBJavaCompiler.java} | 37 ++- .../{NBEnter.java => NBJavadocClassFinder.java} | 38 +-- .../lib/nbjavac/services/NBJavadocEnter.java | 14 + .../lib/nbjavac/services/NBJavadocMemberEnter.java | 18 +- .../lib/nbjavac/services/NBParserFactory.java | 104 +++--- .../netbeans/lib/nbjavac/services/NBResolve.java | 5 +- .../nbjavac/services/AnonymousNumberingTest.java | 7 +- .../lib/nbjavac/services/NBClassWriterTest.java | 5 +- .../netbeans/lib/nbjavac/services/Utilities.java | 8 +- lib.nbjshell/nbproject/project.properties | 1 + libs.javacapi/build.xml | 11 + libs.javacapi/external/binaries-list | 2 +- ...-api-license.txt => nb-javac-9-api-license.txt} | 9 +- libs.javacapi/manifest.mf | 1 - libs.javacapi/nbproject/project.properties | 1 - libs.javacapi/nbproject/project.xml | 6 +- libs.javacimpl/build.xml | 2 - libs.javacimpl/external/binaries-list | 2 +- ...mpl-license.txt => nb-javac-9-impl-license.txt} | 9 +- libs.javacimpl/manifest.mf | 2 - libs.javacimpl/nbproject/project.properties | 2 +- libs.javacimpl/nbproject/project.xml | 29 +- libs.jshell.compile/nbproject/project.properties | 1 + libs.jshell.compile/nbproject/project.xml | 17 - maven.apisupport/nbproject/project.properties | 1 + maven.hints/nbproject/project.properties | 1 + maven.junit.ui/nbproject/project.properties | 1 + maven.refactoring/nbproject/project.properties | 1 + .../queries/UnitTestsCompilerOptionsQueryImpl.java | 2 +- nbbuild/build.xml | 35 +- nbbuild/cluster.properties | 1 + nbbuild/external/binaries-list | 1 + .../external/langtools-9-license.txt | 13 +- nbbuild/jdk.xml | 10 + nbbuild/licenses/Apache-2.0+BSD-INRIA | 231 ++++++++++++++ nbbuild/licenses/names.properties | 1 + nbbuild/templates/common.xml | 28 +- nbbuild/templates/projectized.xml | 48 ++- o.n.bootstrap/src/org/netbeans/ModuleManager.java | 2 +- .../profiler/nbimpl/javac/ElementUtilitiesEx.java | 4 +- .../profiler/nbimpl/javac/JavacClassInfo.java | 4 +- .../nbimpl/providers/JavaProfilerSourceImpl.java | 10 +- .../nbproject/project.properties | 1 + .../refactoring/java/api/JavaRefactoringUtils.java | 4 +- .../java/callhierarchy/CallHierarchyTasks.java | 4 +- .../java/plugins/ChangeParametersPlugin.java | 4 +- .../java/plugins/ChangeParamsTransformer.java | 10 +- .../ExtractSuperclassRefactoringPlugin.java | 2 +- .../java/plugins/FindUsagesVisitor.java | 4 +- .../refactoring/java/plugins/FindVisitor.java | 4 +- .../java/plugins/InlineMethodTransformer.java | 14 +- .../java/plugins/InlineRefactoringPlugin.java | 6 +- .../java/plugins/IntroduceParameterPlugin.java | 6 +- .../plugins/InvertBooleanRefactoringPlugin.java | 4 +- .../refactoring/java/plugins/LocalVarScanner.java | 4 +- .../java/plugins/MoveClassTransformer.java | 4 +- .../java/plugins/MoveMembersTransformer.java | 12 +- .../java/plugins/PullUpTransformer.java | 6 +- .../java/plugins/PushDownTransformer.java | 4 +- .../java/plugins/RenameRefactoringPlugin.java | 4 +- .../java/plugins/RenameTransformer.java | 4 +- .../refactoring/java/spi/RefactoringVisitor.java | 4 +- .../java/ui/InstantRefactoringUIImpl.java | 4 +- .../refactoring/java/ui/MoveMembersPanel.java | 4 +- .../modules/refactoring/java/ui/RenamePanel.java | 4 +- .../refactoring/java/test/RefactoringTestBase.java | 2 +- .../nbproject/project.properties | 1 + .../bindings/java/JavaSemanticTokenList.java | 4 +- .../external/binaries-list | 2 +- .../external/byte-buddy-1.7.9-license.txt | 238 ++++++++++++++ spi.java.hints/nbproject/project.properties | 1 + spi.java.hints/nbproject/project.xml | 18 +- .../netbeans/modules/java/hints/spiimpl/Hacks.java | 18 +- .../modules/java/hints/spiimpl/JackpotTrees.java | 77 +++++ .../modules/java/hints/spiimpl/Utilities.java | 48 +-- .../java/hints/spiimpl/pm/NFABasedBulkSearch.java | 1 - .../netbeans/spi/java/hints/JavaFixUtilities.java | 8 +- .../modules/java/hints/spiimpl/TestBase.java | 4 +- .../modules/java/hints/spiimpl/UtilitiesTest.java | 4 +- .../hints/spiimpl/pm/BulkSearchTestPerformer.java | 4 +- .../spi/java/hints/matching/CopyFinderTest.java | 4 +- testng.ui/nbproject/project.properties | 1 + .../updatecenters/resources/Bundle.properties | 2 +- .../nbproject/project.properties | 1 + .../api/whitelist/support/WhiteListSupport.java | 4 +- xml.jaxb/nbproject/project.properties | 1 + xml.tools.java/nbproject/project.properties | 1 + 356 files changed, 4025 insertions(+), 1884 deletions(-) -- To stop receiving notification emails like this one, please contact "[email protected]" <[email protected]>. --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected] For further information about the NetBeans mailing lists, visit: https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
