diff options
author | jay | 2018-09-26 07:06:28 +0000 |
---|---|---|
committer | jay | 2018-09-26 07:06:28 +0000 |
commit | 3ccd57c481cc77b3726464874886fdf9669c7a5c (patch) | |
tree | 8dfdfbd7e0bd3568fc04f02ff7fb2627706d883f /org.eclipse.jdt.apt.core | |
parent | 2a269a8600046558a3c0af2e8dcd9a733817dfd9 (diff) | |
parent | 1aa58eac3b0985df8c3358b7c4aec62fb9a6b2e8 (diff) | |
download | eclipse.jdt.core-3ccd57c481cc77b3726464874886fdf9669c7a5c.tar.gz eclipse.jdt.core-3ccd57c481cc77b3726464874886fdf9669c7a5c.tar.xz eclipse.jdt.core-3ccd57c481cc77b3726464874886fdf9669c7a5c.zip |
Merge branch 'BETA_JAVA11'
# Conflicts:
# org.eclipse.jdt.compiler.apt/src/org/eclipse/jdt/internal/compiler/apt/dispatch/BatchFilerImpl.java
# org.eclipse.jdt.compiler.apt/src/org/eclipse/jdt/internal/compiler/apt/util/EclipseFileManager.java
# org.eclipse.jdt.compiler.tool.tests/src/org/eclipse/jdt/compiler/tool/tests/CompilerToolTests.java
# org.eclipse.jdt.compiler.tool/src/org/eclipse/jdt/internal/compiler/tool/EclipseCompiler.java
# org.eclipse.jdt.compiler.tool/src/org/eclipse/jdt/internal/compiler/tool/EclipseFileManager.java
# org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AbstractNullAnnotationTest.java
# org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AmbiguousMethodTest.java
# org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/GenericTypeTest.java
# org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JEP286ReservedWordTest.java
# org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JEP286Test.java
# org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/MethodParametersAttributeTest.java
# org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/NegativeLambdaExpressionsTest.java
# org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/PolymorphicSignatureTest.java
# org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/ProblemConstructorTest.java
# org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/ProblemTypeAndMethodTest.java
# org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/StaticImportTest.java
# org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/junit/extension/TestCase.java
# org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/RunAllJava10Tests.java
# org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/ASTConverter10Test.java
# org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/CompletionTests10.java
# org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/JavaSearchBugs10Tests.java
# org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/model/NameLookupTests2.java
# org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/AllocationExpression.java
# org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/ExplicitConstructorCall.java
# org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/ast/MessageSend.java
# org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/classfmt/ClassFileConstants.java
# org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/env/ISourceModule.java
# org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/JavadocTagConstants.java
# org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/parser/ScannerHelper.java
# org.eclipse.jdt.core/compiler/org/eclipse/jdt/internal/compiler/problem/ProblemReporter.java
# org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IAttributeNamesConstants.java
# org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IClassFileReader.java
# org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IConstantPool.java
# org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IConstantPoolConstant.java
# org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IConstantPoolEntry.java
# org.eclipse.jdt.core/model/org/eclipse/jdt/core/util/IConstantPoolEntry2.java
# org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/ClassFileReader.java
# org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/ConstantPool.java
# org.eclipse.jdt.core/model/org/eclipse/jdt/internal/core/util/Disassembler.java
Change-Id: If63162fb2d7e2e3a57e078289a4b6cf31c31ab66
Diffstat (limited to 'org.eclipse.jdt.apt.core')
-rw-r--r-- | org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/BaseProcessorEnv.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/BaseProcessorEnv.java b/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/BaseProcessorEnv.java index 0fe930afe9..be0bd51346 100644 --- a/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/BaseProcessorEnv.java +++ b/org.eclipse.jdt.apt.core/src/org/eclipse/jdt/apt/core/internal/env/BaseProcessorEnv.java @@ -86,7 +86,7 @@ import com.sun.mirror.util.Types; public class BaseProcessorEnv implements AnnotationProcessorEnvironment { static{ - final AST ast = AST.newAST(AST.JLS10); + final AST ast = AST.newAST(AST.JLS11); EMPTY_AST_UNIT = ast.newCompilationUnit(); } public static final CompilationUnit EMPTY_AST_UNIT; @@ -508,7 +508,7 @@ public class BaseProcessorEnv implements AnnotationProcessorEnvironment } final BindingRequestor requestor = new BindingRequestor(); - final ASTParser parser = ASTParser.newParser(AST.JLS10); + final ASTParser parser = ASTParser.newParser(AST.JLS11); parser.setResolveBindings(true); parser.setBindingsRecovery(true); parser.setProject(_javaProject); @@ -719,7 +719,7 @@ public class BaseProcessorEnv implements AnnotationProcessorEnvironment if( astUnit != null ) return astUnit; else{ // Note: very expensive operation. we are re-compiling a file with binding information. - final ASTParser parser = ASTParser.newParser(AST.JLS10); + final ASTParser parser = ASTParser.newParser(AST.JLS11); parser.setResolveBindings(true); parser.setBindingsRecovery(true); parser.setSource(unit); @@ -868,7 +868,7 @@ public class BaseProcessorEnv implements AnnotationProcessorEnvironment String bogusKey = BindingKey.createTypeBindingKey("java.lang.Object"); //$NON-NLS-1$ String[] keys = new String[] {bogusKey}; - ASTParser p = ASTParser.newParser( AST.JLS10 ); + ASTParser p = ASTParser.newParser( AST.JLS11 ); p.setResolveBindings(true); p.setBindingsRecovery(true); p.setProject( javaProject ); @@ -898,7 +898,7 @@ public class BaseProcessorEnv implements AnnotationProcessorEnvironment } CompilationUnitRequestor requestor = new CompilationUnitRequestor(); - ASTParser p = ASTParser.newParser( AST.JLS10 ); + ASTParser p = ASTParser.newParser( AST.JLS11 ); p.setResolveBindings(true); p.setBindingsRecovery(true); p.setProject( javaProject ); |