More fixes for 1.9.2V1_9_2_RC2

- update to more recent JDT to pickup Nestmates fix
- bcel updated for NestMembers/NestHost attributes
- testcases for nestmates

2 files changed, 178 insertions, 54 deletions

diff --git a/bcel-builder/verifier-src/org/aspectj/apache/bcel/verifier/DescendingVisitor.java b/bcel-builder/verifier-src/org/aspectj/apache/bcel/verifier/DescendingVisitor.java
index 6dc3eae46..3335f1ea8 100644
--- a/bcel-builder/verifier-src/org/aspectj/apache/bcel/verifier/DescendingVisitor.java
+++ b/bcel-builder/verifier-src/org/aspectj/apache/bcel/verifier/DescendingVisitor.java
@@ -59,6 +59,7 @@ import org.aspectj.apache.bcel.classfile.AnnotationDefault;
 import org.aspectj.apache.bcel.classfile.Attribute;
 import org.aspectj.apache.bcel.classfile.AttributeUtils;
 import org.aspectj.apache.bcel.classfile.BootstrapMethods;
+import org.aspectj.apache.bcel.classfile.ClassVisitor;
 import org.aspectj.apache.bcel.classfile.Code;
 import org.aspectj.apache.bcel.classfile.CodeException;
 import org.aspectj.apache.bcel.classfile.Constant;
@@ -98,13 +99,14 @@ import org.aspectj.apache.bcel.classfile.MethodParameters;
 import org.aspectj.apache.bcel.classfile.Module;
 import org.aspectj.apache.bcel.classfile.ModuleMainClass;
 import org.aspectj.apache.bcel.classfile.ModulePackages;
+import org.aspectj.apache.bcel.classfile.NestHost;
+import org.aspectj.apache.bcel.classfile.NestMembers;
 import org.aspectj.apache.bcel.classfile.Signature;
 import org.aspectj.apache.bcel.classfile.SourceFile;
 import org.aspectj.apache.bcel.classfile.StackMap;
 import org.aspectj.apache.bcel.classfile.StackMapEntry;
 import org.aspectj.apache.bcel.classfile.Synthetic;
 import org.aspectj.apache.bcel.classfile.Unknown;
-import org.aspectj.apache.bcel.classfile.ClassVisitor;
 import org.aspectj.apache.bcel.classfile.annotation.RuntimeInvisAnnos;
 import org.aspectj.apache.bcel.classfile.annotation.RuntimeInvisParamAnnos;
 import org.aspectj.apache.bcel.classfile.annotation.RuntimeInvisTypeAnnos;
@@ -171,6 +173,7 @@ public class DescendingVisitor implements ClassVisitor {
 		clazz.accept(this);
 	}
 
+	@Override
 	public void visitJavaClass(JavaClass clazz) {
 		stack.push(clazz);
 		clazz.accept(visitor);
@@ -189,6 +192,7 @@ public class DescendingVisitor implements ClassVisitor {
 		stack.pop();
 	}
 
+	@Override
 	public void visitField(Field field) {
 		stack.push(field);
 		field.accept(visitor);
@@ -197,12 +201,14 @@ public class DescendingVisitor implements ClassVisitor {
 		stack.pop();
 	}
 
+	@Override
 	public void visitConstantValue(ConstantValue cv) {
 		stack.push(cv);
 		cv.accept(visitor);
 		stack.pop();
 	}
 
+	@Override
 	public void visitMethod(Method method) {
 		stack.push(method);
 		method.accept(visitor);
@@ -210,12 +216,14 @@ public class DescendingVisitor implements ClassVisitor {
 		stack.pop();
 	}
 
+	@Override
 	public void visitExceptionTable(ExceptionTable table) {
 		stack.push(table);
 		table.accept(visitor);
 		stack.pop();
 	}
 
+	@Override
 	public void visitCode(Code code) {
 		stack.push(code);
 		code.accept(visitor);
@@ -230,12 +238,14 @@ public class DescendingVisitor implements ClassVisitor {
 		stack.pop();
 	}
 
+	@Override
 	public void visitCodeException(CodeException ce) {
 		stack.push(ce);
 		ce.accept(visitor);
 		stack.pop();
 	}
 
+	@Override
 	public void visitLineNumberTable(LineNumberTable table) {
 		stack.push(table);
 		table.accept(visitor);
@@ -246,12 +256,14 @@ public class DescendingVisitor implements ClassVisitor {
 		stack.pop();
 	}
 
+	@Override
 	public void visitLineNumber(LineNumber number) {
 		stack.push(number);
 		number.accept(visitor);
 		stack.pop();
 	}
 
+	@Override
 	public void visitLocalVariableTable(LocalVariableTable table) {
 		stack.push(table);
 		table.accept(visitor);
@@ -262,6 +274,7 @@ public class DescendingVisitor implements ClassVisitor {
 		stack.pop();
 	}
 
+	@Override
 	public void visitStackMap(StackMap table) {
 		stack.push(table);
 		table.accept(visitor);
@@ -273,18 +286,21 @@ public class DescendingVisitor implements ClassVisitor {
 		stack.pop();
 	}
 
+	@Override
 	public void visitStackMapEntry(StackMapEntry var) {
 		stack.push(var);
 		var.accept(visitor);
 		stack.pop();
 	}
 
+	@Override
 	public void visitLocalVariable(LocalVariable var) {
 		stack.push(var);
 		var.accept(visitor);
 		stack.pop();
 	}
 
+	@Override
 	public void visitConstantPool(ConstantPool cp) {
 		stack.push(cp);
 		cp.accept(visitor);
@@ -298,104 +314,123 @@ public class DescendingVisitor implements ClassVisitor {
 		stack.pop();
 	}
 
+	@Override
 	public void visitConstantClass(ConstantClass constant) {
 		stack.push(constant);
 		constant.accept(visitor);
 		stack.pop();
 	}
 
+	@Override
 	public void visitConstantDouble(ConstantDouble constant) {
 		stack.push(constant);
 		constant.accept(visitor);
 		stack.pop();
 	}
 
+	@Override
 	public void visitConstantFieldref(ConstantFieldref constant) {
 		stack.push(constant);
 		constant.accept(visitor);
 		stack.pop();
 	}
 
+	@Override
 	public void visitConstantFloat(ConstantFloat constant) {
 		stack.push(constant);
 		constant.accept(visitor);
 		stack.pop();
 	}
 
+	@Override
 	public void visitConstantInteger(ConstantInteger constant) {
 		stack.push(constant);
 		constant.accept(visitor);
 		stack.pop();
 	}
 
+	@Override
 	public void visitConstantInterfaceMethodref(ConstantInterfaceMethodref constant) {
 		stack.push(constant);
 		constant.accept(visitor);
 		stack.pop();
 	}
 
+	@Override
 	public void visitConstantLong(ConstantLong constant) {
 		stack.push(constant);
 		constant.accept(visitor);
 		stack.pop();
 	}
 
+	@Override
 	public void visitConstantMethodref(ConstantMethodref constant) {
 		stack.push(constant);
 		constant.accept(visitor);
 		stack.pop();
 	}
 
+	@Override
 	public void visitConstantMethodHandle(ConstantMethodHandle constant) {
 		throw new IllegalStateException("nyi");
 	}
 
+	@Override
 	public void visitConstantMethodType(ConstantMethodType obj) {
 		throw new IllegalStateException("nyi");
 	}
 
+	@Override
 	public void visitConstantInvokeDynamic(ConstantInvokeDynamic obj) {
 		throw new IllegalStateException("nyi");
 	}
 
+	@Override
 	public void visitConstantDynamic(ConstantDynamic obj) {
 		throw new IllegalStateException("nyi");
 	}
 
+	@Override
 	public void visitBootstrapMethods(BootstrapMethods obj) {
 		throw new IllegalStateException("nyi");
 	}
 
+	@Override
 	public void visitConstantNameAndType(ConstantNameAndType constant) {
 		stack.push(constant);
 		constant.accept(visitor);
 		stack.pop();
 	}
 
+	@Override
 	public void visitConstantString(ConstantString constant) {
 		stack.push(constant);
 		constant.accept(visitor);
 		stack.pop();
 	}
 
+	@Override
 	public void visitConstantModule(ConstantModule constant) {
 		stack.push(constant);
 		constant.accept(visitor);
 		stack.pop();
 	}
 
+	@Override
 	public void visitConstantPackage(ConstantPackage constant) {
 		stack.push(constant);
 		constant.accept(visitor);
 		stack.pop();
 	}
 
+	@Override
 	public void visitConstantUtf8(ConstantUtf8 constant) {
 		stack.push(constant);
 		constant.accept(visitor);
 		stack.pop();
 	}
 
+	@Override
 	public void visitInnerClasses(InnerClasses ic) {
 		stack.push(ic);
 		ic.accept(visitor);
@@ -406,18 +441,21 @@ public class DescendingVisitor implements ClassVisitor {
 		stack.pop();
 	}
 
+	@Override
 	public void visitInnerClass(InnerClass inner) {
 		stack.push(inner);
 		inner.accept(visitor);
 		stack.pop();
 	}
 
+	@Override
 	public void visitDeprecated(Deprecated attribute) {
 		stack.push(attribute);
 		attribute.accept(visitor);
 		stack.pop();
 	}
 
+	@Override
 	public void visitSignature(Signature attribute) {
 		stack.push(attribute);
 		attribute.accept(visitor);
@@ -425,60 +463,70 @@ public class DescendingVisitor implements ClassVisitor {
 	}
 
 	// J5SUPPORT:
+	@Override
 	public void visitEnclosingMethod(EnclosingMethod attribute) {
 		stack.push(attribute);
 		attribute.accept(visitor);
 		stack.pop();
 	}
 
+	@Override
 	public void visitRuntimeVisibleAnnotations(RuntimeVisAnnos attribute) {
 		stack.push(attribute);
 		attribute.accept(visitor);
 		stack.pop();
 	}
 
+	@Override
 	public void visitRuntimeInvisibleAnnotations(RuntimeInvisAnnos attribute) {
 		stack.push(attribute);
 		attribute.accept(visitor);
 		stack.pop();
 	}
 
+	@Override
 	public void visitRuntimeVisibleParameterAnnotations(RuntimeVisParamAnnos attribute) {
 		stack.push(attribute);
 		attribute.accept(visitor);
 		stack.pop();
 	}
 
+	@Override
 	public void visitRuntimeInvisibleParameterAnnotations(RuntimeInvisParamAnnos attribute) {
 		stack.push(attribute);
 		attribute.accept(visitor);
 		stack.pop();
 	}
 
+	@Override
 	public void visitRuntimeVisibleTypeAnnotations(RuntimeVisTypeAnnos attribute) {
 		stack.push(attribute);
 		attribute.accept(visitor);
 		stack.pop();
 	}
 
+	@Override
 	public void visitMethodParameters(MethodParameters attribute) {
 		stack.push(attribute);
 		attribute.accept(visitor);
 		stack.pop();
 	}
 
+	@Override
 	public void visitRuntimeInvisibleTypeAnnotations(RuntimeInvisTypeAnnos attribute) {
 		stack.push(attribute);
 		attribute.accept(visitor);
 		stack.pop();
 	}
 
+	@Override
 	public void visitAnnotationDefault(AnnotationDefault attribute) {
 		stack.push(attribute);
 		attribute.accept(visitor);
 		stack.pop();
 	}
 
+	@Override
 	public void visitLocalVariableTypeTable(LocalVariableTypeTable table) {
 		stack.push(table);
 		table.accept(visitor);
@@ -489,39 +537,59 @@ public class DescendingVisitor implements ClassVisitor {
 		stack.pop();
 	}
 
+	@Override
 	public void visitSourceFile(SourceFile attribute) {
 		stack.push(attribute);
 		attribute.accept(visitor);
 		stack.pop();
 	}
 
+	@Override
 	public void visitSynthetic(Synthetic attribute) {
 		stack.push(attribute);
 		attribute.accept(visitor);
 		stack.pop();
 	}
 
+	@Override
 	public void visitUnknown(Unknown attribute) {
 		stack.push(attribute);
 		attribute.accept(visitor);
 		stack.pop();
 	}
 
+	@Override
 	public void visitModule(Module attribute) {
 		stack.push(attribute);
 		attribute.accept(visitor);
 		stack.pop();
 	}
 
+	@Override
 	public void visitModulePackages(ModulePackages attribute) {
 		stack.push(attribute);
 		attribute.accept(visitor);
 		stack.pop();
 	}
 
+	@Override
 	public void visitModuleMainClass(ModuleMainClass attribute) {
 		stack.push(attribute);
 		attribute.accept(visitor);
 		stack.pop();
 	}
+
+	@Override
+	public void visitNestHost(NestHost attribute) {
+		stack.push(attribute);
+		attribute.accept(visitor);
+		stack.pop();
+	}
+
+	@Override
+	public void visitNestMembers(NestMembers attribute) {
+		stack.push(attribute);
+		attribute.accept(visitor);
+		stack.pop();
+	}
 }
diff --git a/bcel-builder/verifier-src/org/aspectj/apache/bcel/verifier/EmptyClassVisitor.java b/bcel-builder/verifier-src/org/aspectj/apache/bcel/verifier/EmptyClassVisitor.java
index aca992fbf..1ca901650 100644
--- a/bcel-builder/verifier-src/org/aspectj/apache/bcel/verifier/EmptyClassVisitor.java
+++ b/bcel-builder/verifier-src/org/aspectj/apache/bcel/verifier/EmptyClassVisitor.java
@@ -55,6 +55,7 @@ package org.aspectj.apache.bcel.verifier;
 
 import org.aspectj.apache.bcel.classfile.AnnotationDefault;
 import org.aspectj.apache.bcel.classfile.BootstrapMethods;
+import org.aspectj.apache.bcel.classfile.ClassVisitor;
 import org.aspectj.apache.bcel.classfile.Code;
 import org.aspectj.apache.bcel.classfile.CodeException;
 import org.aspectj.apache.bcel.classfile.ConstantClass;
@@ -93,13 +94,14 @@ import org.aspectj.apache.bcel.classfile.MethodParameters;
 import org.aspectj.apache.bcel.classfile.Module;
 import org.aspectj.apache.bcel.classfile.ModuleMainClass;
 import org.aspectj.apache.bcel.classfile.ModulePackages;
+import org.aspectj.apache.bcel.classfile.NestHost;
+import org.aspectj.apache.bcel.classfile.NestMembers;
 import org.aspectj.apache.bcel.classfile.Signature;
 import org.aspectj.apache.bcel.classfile.SourceFile;
 import org.aspectj.apache.bcel.classfile.StackMap;
 import org.aspectj.apache.bcel.classfile.StackMapEntry;
 import org.aspectj.apache.bcel.classfile.Synthetic;
 import org.aspectj.apache.bcel.classfile.Unknown;
-import org.aspectj.apache.bcel.classfile.ClassVisitor;
 import org.aspectj.apache.bcel.classfile.annotation.RuntimeInvisAnnos;
 import org.aspectj.apache.bcel.classfile.annotation.RuntimeInvisParamAnnos;
 import org.aspectj.apache.bcel.classfile.annotation.RuntimeInvisTypeAnnos;
@@ -120,64 +122,118 @@ import org.aspectj.apache.bcel.classfile.annotation.RuntimeVisTypeAnnos;
 public class EmptyClassVisitor implements ClassVisitor {
   protected EmptyClassVisitor() { }
 
-  public void visitCode(Code obj) {}
-  public void visitCodeException(CodeException obj) {}
-  public void visitConstantClass(ConstantClass obj) {}
-  public void visitConstantDouble(ConstantDouble obj) {}
-  public void visitConstantFieldref(ConstantFieldref obj) {}
-  public void visitConstantFloat(ConstantFloat obj) {}
-  public void visitConstantInteger(ConstantInteger obj) {}
-  public void visitConstantInterfaceMethodref(ConstantInterfaceMethodref obj) {}
-  public void visitConstantLong(ConstantLong obj) {}
-  public void visitConstantMethodref(ConstantMethodref obj) {}
-  public void visitConstantMethodHandle(ConstantMethodHandle obj) {}
-  public void visitConstantMethodType(ConstantMethodType obj) {}
-  public void visitConstantInvokeDynamic(ConstantInvokeDynamic obj) {}
-  public void visitConstantNameAndType(ConstantNameAndType obj) {}
-  public void visitConstantPool(ConstantPool obj) {}
-  public void visitConstantString(ConstantString obj) {}
-  public void visitConstantModule(ConstantModule obj) {}
-  public void visitConstantPackage(ConstantPackage obj) {}
-  public void visitConstantUtf8(ConstantUtf8 obj) {}
-  public void visitConstantValue(ConstantValue obj) {}
-  public void visitDeprecated(Deprecated obj) {}
-  public void visitExceptionTable(ExceptionTable obj) {}
-  public void visitField(Field obj) {}
-  public void visitInnerClass(InnerClass obj) {}
-  public void visitInnerClasses(InnerClasses obj) {}
-  public void visitJavaClass(JavaClass obj) {}
-  public void visitLineNumber(LineNumber obj) {}
-  public void visitBootstrapMethods(BootstrapMethods obj) {}
-  public void visitLineNumberTable(LineNumberTable obj) {}
-  public void visitLocalVariable(LocalVariable obj) {}
-  public void visitLocalVariableTable(LocalVariableTable obj) {}
-  public void visitMethod(Method obj) {}
-  public void visitSignature(Signature obj) {}
-  public void visitSourceFile(SourceFile obj) {}
-  public void visitSynthetic(Synthetic obj) {}
-  public void visitUnknown(Unknown obj) {}
-  public void visitStackMap(StackMap obj) {}
-  public void visitStackMapEntry(StackMapEntry obj) {}
+  @Override
+public void visitCode(Code obj) {}
+  @Override
+public void visitCodeException(CodeException obj) {}
+  @Override
+public void visitConstantClass(ConstantClass obj) {}
+  @Override
+public void visitConstantDouble(ConstantDouble obj) {}
+  @Override
+public void visitConstantFieldref(ConstantFieldref obj) {}
+  @Override
+public void visitConstantFloat(ConstantFloat obj) {}
+  @Override
+public void visitConstantInteger(ConstantInteger obj) {}
+  @Override
+public void visitConstantInterfaceMethodref(ConstantInterfaceMethodref obj) {}
+  @Override
+public void visitConstantLong(ConstantLong obj) {}
+  @Override
+public void visitConstantMethodref(ConstantMethodref obj) {}
+  @Override
+public void visitConstantMethodHandle(ConstantMethodHandle obj) {}
+  @Override
+public void visitConstantMethodType(ConstantMethodType obj) {}
+  @Override
+public void visitConstantInvokeDynamic(ConstantInvokeDynamic obj) {}
+  @Override
+public void visitConstantNameAndType(ConstantNameAndType obj) {}
+  @Override
+public void visitConstantPool(ConstantPool obj) {}
+  @Override
+public void visitConstantString(ConstantString obj) {}
+  @Override
+public void visitConstantModule(ConstantModule obj) {}
+  @Override
+public void visitConstantPackage(ConstantPackage obj) {}
+  @Override
+public void visitConstantUtf8(ConstantUtf8 obj) {}
+  @Override
+public void visitConstantValue(ConstantValue obj) {}
+  @Override
+public void visitDeprecated(Deprecated obj) {}
+  @Override
+public void visitExceptionTable(ExceptionTable obj) {}
+  @Override
+public void visitField(Field obj) {}
+  @Override
+public void visitInnerClass(InnerClass obj) {}
+  @Override
+public void visitInnerClasses(InnerClasses obj) {}
+  @Override
+public void visitJavaClass(JavaClass obj) {}
+  @Override
+public void visitLineNumber(LineNumber obj) {}
+  @Override
+public void visitBootstrapMethods(BootstrapMethods obj) {}
+  @Override
+public void visitLineNumberTable(LineNumberTable obj) {}
+  @Override
+public void visitLocalVariable(LocalVariable obj) {}
+  @Override
+public void visitLocalVariableTable(LocalVariableTable obj) {}
+  @Override
+public void visitMethod(Method obj) {}
+  @Override
+public void visitSignature(Signature obj) {}
+  @Override
+public void visitSourceFile(SourceFile obj) {}
+  @Override
+public void visitSynthetic(Synthetic obj) {}
+  @Override
+public void visitUnknown(Unknown obj) {}
+  @Override
+public void visitStackMap(StackMap obj) {}
+  @Override
+public void visitStackMapEntry(StackMapEntry obj) {}
 
   // J5:
-  public void visitEnclosingMethod(EnclosingMethod obj) {}
-  public void visitRuntimeVisibleAnnotations(RuntimeVisAnnos attribute) {}
-  public void visitRuntimeInvisibleAnnotations(RuntimeInvisAnnos attribute) {}
-  public void visitRuntimeVisibleParameterAnnotations(RuntimeVisParamAnnos attribute) {}
-  public void visitRuntimeInvisibleParameterAnnotations(RuntimeInvisParamAnnos attribute) {}
-  public void visitAnnotationDefault(AnnotationDefault attribute) {}
-  public void visitLocalVariableTypeTable(LocalVariableTypeTable obj) {}
+  @Override
+public void visitEnclosingMethod(EnclosingMethod obj) {}
+  @Override
+public void visitRuntimeVisibleAnnotations(RuntimeVisAnnos attribute) {}
+  @Override
+public void visitRuntimeInvisibleAnnotations(RuntimeInvisAnnos attribute) {}
+  @Override
+public void visitRuntimeVisibleParameterAnnotations(RuntimeVisParamAnnos attribute) {}
+  @Override
+public void visitRuntimeInvisibleParameterAnnotations(RuntimeInvisParamAnnos attribute) {}
+  @Override
+public void visitAnnotationDefault(AnnotationDefault attribute) {}
+  @Override
+public void visitLocalVariableTypeTable(LocalVariableTypeTable obj) {}
   	 
   // J8:
-  public void visitRuntimeVisibleTypeAnnotations(RuntimeVisTypeAnnos attribute) {}
-  public void visitRuntimeInvisibleTypeAnnotations(RuntimeInvisTypeAnnos attribute) {}
-  public void visitMethodParameters(MethodParameters attribute) {}
+  @Override
+public void visitRuntimeVisibleTypeAnnotations(RuntimeVisTypeAnnos attribute) {}
+  @Override
+public void visitRuntimeInvisibleTypeAnnotations(RuntimeInvisTypeAnnos attribute) {}
+  @Override
+public void visitMethodParameters(MethodParameters attribute) {}
 
   // J9:
-  public void visitModule(Module attribute) {}
-  public void visitModulePackages(ModulePackages attribute) {}
-  public void visitModuleMainClass(ModuleMainClass attribute) {}
+  @Override
+public void visitModule(Module attribute) {}
+  @Override
+public void visitModulePackages(ModulePackages attribute) {}
+  @Override
+public void visitModuleMainClass(ModuleMainClass attribute) {}
 
-  public void visitConstantDynamic(ConstantDynamic obj) {}
+  // J11:
+  @Override public void visitConstantDynamic(ConstantDynamic attribute) {}
+  @Override public void visitNestHost(NestHost attribute) { }
+  @Override public void visitNestMembers(NestMembers attribute) { }
  
 }