1.9.2.RC1 changesV1_9_2_RC1

6 files changed, 17 insertions, 11 deletions

diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties
index 516af38f6..4d53d7f3d 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/ajc/messages.properties
@@ -4,8 +4,8 @@
      The -Xlintfile:lint.properties allows fine-grained control. In tools.jar, see
      org/aspectj/weaver/XlintDefault.properties for the default behavior and a template to copy. 
 ### AspectJ-specific messages 
-compiler.name = AspectJ Compiler 1.9.1
-compiler.version = Eclipse Compiler #abe06abe4ce1(Apr2018), 3.14
+compiler.name = AspectJ Compiler 1.9.2
+compiler.version = Eclipse Compiler #BETA_JAVA11(20Sep2018), 3.14
 compiler.copyright = 
 
 
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/problem/AjProblemReporter.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/problem/AjProblemReporter.java
index 2cb035a70..c80bbb5e9 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/problem/AjProblemReporter.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/compiler/problem/AjProblemReporter.java
@@ -54,6 +54,7 @@ import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.LocalVariableBinding
 import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.MethodBinding;
 import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.ParameterizedMethodBinding;
 import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding;
+import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.Scope;
 import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.SourceTypeBinding;
 import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.TagBits;
 import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.TypeBinding;
@@ -68,6 +69,7 @@ import org.aspectj.weaver.ResolvedType;
 import org.aspectj.weaver.ResolvedTypeMunger;
 import org.aspectj.weaver.Shadow;
 import org.aspectj.weaver.UnresolvedType;
+import org.aspectj.weaver.patterns.Declare;
 import org.aspectj.weaver.patterns.DeclareAnnotation;
 import org.aspectj.weaver.patterns.DeclareParents;
 import org.aspectj.weaver.patterns.DeclareSoft;
@@ -489,8 +491,8 @@ public class AjProblemReporter extends ProblemReporter {
 		if (typeDecl.enclosingType != null && (typeDecl.enclosingType instanceof AspectDeclaration)) {
 			AspectDeclaration ad = (AspectDeclaration) typeDecl.enclosingType;
 			if (ad.concreteName != null) {
-				List declares = ad.concreteName.declares;
-				for (Iterator iter = declares.iterator(); iter.hasNext();) {
+				List<Declare> declares = ad.concreteName.declares;
+				for (Iterator<Declare> iter = declares.iterator(); iter.hasNext();) {
 					Object dec = iter.next();
 					if (dec instanceof DeclareParents) {
 						DeclareParents decp = (DeclareParents) dec;
@@ -514,8 +516,9 @@ public class AjProblemReporter extends ProblemReporter {
 	private final static char[] thisJoinPointStaticPartName = "thisJoinPointStaticPart".toCharArray();
 	private final static char[] thisEnclosingJoinPointStaticPartName = "thisEnclosingJoinPointStaticPart".toCharArray();
 	private final static char[] thisAspectInstanceName = "thisAspectInstance".toCharArray();
-	
-	public void uninitializedLocalVariable(LocalVariableBinding binding, ASTNode location) {
+
+	@Override
+	public void uninitializedLocalVariable(LocalVariableBinding binding, ASTNode location, Scope scope) {
 		if (CharOperation.equals(binding.name, thisJoinPointName) ||
 			CharOperation.equals(binding.name, thisJoinPointStaticPartName) ||
 			CharOperation.equals(binding.name, thisAspectInstanceName) || 
@@ -526,7 +529,7 @@ public class AjProblemReporter extends ProblemReporter {
 				return;
 			}
 		}			
-		super.uninitializedLocalVariable(binding, location);
+		super.uninitializedLocalVariable(binding, location, scope);
 	}
 	
 	public void abstractMethodInConcreteClass(SourceTypeBinding type) {
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java
index 11a0b3eab..1b6343fef 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildConfig.java
@@ -253,7 +253,7 @@ public class AjBuildConfig implements CompilerConfigurationChangeFlags {
 	private List<Classpath> processFilePath(List<File> path, java.lang.String encoding) {
 		List<Classpath> entries = new ArrayList<Classpath>();
 		for (File file: path) {
-			entries.add(FileSystem.getClasspath(file.getAbsolutePath(), encoding, null, ClasspathLocation.BINARY));
+			entries.add(FileSystem.getClasspath(file.getAbsolutePath(), encoding, null, ClasspathLocation.BINARY, null));
 		}
 		return entries;
 	}
@@ -261,7 +261,7 @@ public class AjBuildConfig implements CompilerConfigurationChangeFlags {
 	private List<Classpath> processStringPath(List<String> path, java.lang.String encoding) {
 		List<Classpath> entries = new ArrayList<Classpath>();
 		for (String file: path) {
-			entries.add(FileSystem.getClasspath(file, encoding, null, ClasspathLocation.BINARY));
+			entries.add(FileSystem.getClasspath(file, encoding, null, ClasspathLocation.BINARY, null));
 		}
 		return entries;
 	}
diff --git a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
index c9ce44abf..9c58c24a0 100644
--- a/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
+++ b/org.aspectj.ajdt.core/src/org/aspectj/ajdt/internal/core/builder/AjBuildManager.java
@@ -954,7 +954,7 @@ public class AjBuildManager implements IOutputClassFileNameProvider, IBinarySour
 		// 'classpaths' object it isn't recording where the code came from. This will be an issue later for
 		// weaving, the distinction will need to be maintained for proper 'module aware/respecting' weaving.
 		if (buildConfig.getCheckedClasspaths() == null) {
-			nameEnvironment = new FileSystem(classpaths, filenames, defaultEncoding, ClasspathLocation.BINARY);
+			nameEnvironment = new FileSystem(classpaths, filenames, defaultEncoding, ClasspathLocation.BINARY, null);
 		} else {
 			nameEnvironment = new FileSystem(buildConfig.getCheckedClasspaths(), filenames, false, null);
 		}
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/JavadocTest.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/JavadocTest.java
index 1f76a7476..8101dc1fd 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/JavadocTest.java
+++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/ajdt/internal/compiler/batch/JavadocTest.java
@@ -17,6 +17,7 @@ import java.util.List;
 import org.aspectj.bridge.IMessage;
 import org.aspectj.tools.ajc.AjcTestCase;
 import org.aspectj.tools.ajc.CompilationResult;
+import org.aspectj.util.LangUtil;
 
 public class JavadocTest extends AjcTestCase {
 	public static final String PROJECT_DIR = "javadoc";
@@ -56,6 +57,8 @@ public class JavadocTest extends AjcTestCase {
 		// Basically that the javadoc on a public member refers to something that is not public
 		warningMessages.add(new Message(6,"'public' visibility for malformed doc comments hides this 'default' reference"));
 		warningMessages.add(new Message(32,"'public' visibility for malformed doc comments hides this 'default' reference"));
+		warningMessages.add(new Message(22,"'public' visibility for malformed doc comments hides this 'default' reference"));
+		warningMessages.add(new Message(48,"'public' visibility for malformed doc comments hides this 'default' reference"));
 		MessageSpec spec = new MessageSpec(warningMessages, null);
 
 		CompilationResult result = ajc(baseDir, args);
diff --git a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjcTestCase.java b/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjcTestCase.java
index e88ae0251..988b8a284 100644
--- a/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjcTestCase.java
+++ b/org.aspectj.ajdt.core/testsrc/org/aspectj/tools/ajc/AjcTestCase.java
@@ -91,7 +91,7 @@ public class AjcTestCase extends TestCase {
 			+ File.separator
 			+ "bcel-verifier.jar"
 			
-			+ File.pathSeparator + ".." +  File.separator + "lib" + File.separator + "asm" + File.separator + "asm-6.1.1.renamed.jar"
+			+ File.pathSeparator + ".." +  File.separator + "lib" + File.separator + "asm" + File.separator + "asm-6.2.1.renamed.jar"
 
 			// When the build machine executes the tests, it is using code built into jars rather than code build into
 			// bin directories. This means for the necessary types to be found we have to put these jars on the classpath: