Index: src/org/aspectj/weaver/bcel/BcelClassWeaver.java
===================================================================
RCS file: /home/technology/org.aspectj/modules/weaver/src/org/aspectj/weaver/bcel/BcelClassWeaver.java,v
retrieving revision 1.56
diff -u -r1.56 BcelClassWeaver.java
--- src/org/aspectj/weaver/bcel/BcelClassWeaver.java	14 Oct 2005 17:58:36 -0000	1.56
+++ src/org/aspectj/weaver/bcel/BcelClassWeaver.java	19 Oct 2005 13:25:42 -0000
@@ -56,6 +56,7 @@
 import org.aspectj.apache.bcel.generic.annotation.AnnotationGen;
 import org.aspectj.bridge.IMessage;
 import org.aspectj.bridge.ISourceLocation;
+import org.aspectj.bridge.Message;
 import org.aspectj.bridge.WeaveMessage;
 import org.aspectj.bridge.context.CompilationAndWeavingContext;
 import org.aspectj.bridge.context.ContextToken;
@@ -82,6 +83,7 @@
 import org.aspectj.weaver.WeaverMetrics;
 import org.aspectj.weaver.WeaverStateInfo;
 import org.aspectj.weaver.patterns.DeclareAnnotation;
+import org.aspectj.weaver.patterns.ExactTypePattern;
 
 class BcelClassWeaver implements IClassWeaver {
     
@@ -467,6 +469,9 @@
 		List decaMs = getMatchingSubset(allDecams,clazz.getType());		
 		if (decaMs.isEmpty()) return false; // nothing to do
 		if (!members.isEmpty()) {
+			// HELEN
+		  Set unusedDecams = new HashSet();
+		  unusedDecams.addAll(decaMs);
           for (int memberCounter = 0;memberCounter<members.size();memberCounter++) {
             LazyMethodGen mg = (LazyMethodGen)members.get(memberCounter);
             if (!mg.getName().startsWith(NameMangler.PREFIX)) {
@@ -491,10 +496,12 @@
             			members.set(memberCounter,new LazyMethodGen(newMethod,clazz));
             			
             			AsmRelationshipProvider.getDefault().addDeclareAnnotationRelationship(decaM.getSourceLocation(),clazz.getName(),mg.getMethod());
-            			
             			reportMethodCtorWeavingMessage(clazz, mg, decaM);
             			isChanged = true;
             			modificationOccured = true;
+            			// HELEN
+            			unusedDecams.remove(decaM);
+            			
             		} else {
             			if (!decaM.isStarredAnnotationPattern()) 
             				worthRetrying.add(decaM); // an annotation is specified that might be put on by a subsequent decaf
@@ -515,12 +522,36 @@
             				isChanged = true;
             				modificationOccured = true;
             				forRemoval.add(decaM);
+            				// HELEN
+            				unusedDecams.remove(decaM);
             			}
             		}
             		worthRetrying.removeAll(forRemoval);
             	}
             }
           }
+          // HELEN
+	  	  for (Iterator iter = unusedDecams.iterator(); iter.hasNext();) {
+		  		DeclareAnnotation declA = (DeclareAnnotation) iter.next();
+		  		if ((declA.isExactPattern() || 
+						(declA.getSignaturePattern().getDeclaringType() instanceof ExactTypePattern))
+						&& !declA.getSignaturePattern().getName().isAny()) {
+		  			boolean itdMatch = false;
+		  			List lst = clazz.getType().getInterTypeMungers();
+		  			for (Iterator iterator = lst.iterator(); iterator.hasNext() && !itdMatch;) {
+						BcelTypeMunger element = (BcelTypeMunger) iterator.next();
+						NewMethodTypeMunger nmtm = (NewMethodTypeMunger)element.getMunger();
+						itdMatch = declA.getSignaturePattern().matches(nmtm.getSignature(),world,false);
+					}
+		  			if (!itdMatch) {		  			
+						IMessage message = new Message(
+							"The method " + clazz.getClassName() + "." + declA.getSignaturePattern().getName().toString() + 
+							" does not exist", declA.getSourceLocation() , true);
+						world.getMessageHandler().handleMessage(message);					
+					}
+		  			
+		  		}
+		  	  }
         }
 		return isChanged;
     }
@@ -536,17 +567,23 @@
 				if (s.lastIndexOf(".")!=-1) s =s.substring(s.lastIndexOf(".")+1);
 				parmString.append(s);
 				if ((i+1)<args.length) parmString.append(",");
+				System.out.println(">> args: " + s);
 			}
 			parmString.append(")");
 			String methodName = mg.getMethod().getName();
 			StringBuffer sig = new StringBuffer();
+			System.out.println(">> modifiers:" + org.aspectj.apache.bcel.classfile.Utility.accessToString(mg.getMethod().getAccessFlags()));
 			sig.append(org.aspectj.apache.bcel.classfile.Utility.accessToString(mg.getMethod().getAccessFlags()) );
 			sig.append(" ");
+			System.out.println(">> returnType: " + mg.getMethod().getReturnType().toString());
 			sig.append(mg.getMethod().getReturnType().toString());
 			sig.append(" ");
+			System.out.println(">> className: " + clazz.getName());
 			sig.append(clazz.getName());
 			sig.append(".");
+			System.out.println(">> blah:  " + (methodName.equals("<init>")?"new":methodName));
 			sig.append(methodName.equals("<init>")?"new":methodName);
+			System.out.println(">> parmString: " + parmString);
 			sig.append(parmString);
 			
 			StringBuffer loc = new StringBuffer();
@@ -554,10 +591,88 @@
 				loc.append("no debug info available");
 			} else {
 				loc.append(clazz.getFileName());
+				System.out.println(">> declarationLineNumber: " + mg.getDeclarationLineNumber());
 				if (mg.getDeclarationLineNumber()!=-1) {
 					loc.append(":"+mg.getDeclarationLineNumber());
 				}
 			}
+			System.out.println(">> fullString: " + sig.toString() + ", " + loc.toString() + ", " + 
+					decaM.getAnnotationString() + ", " + (methodName.startsWith("<init>")?"constructor":"method") +
+					", " + decaM.getAspect().toString() + ", " + Utility.beautifyLocation(decaM.getSourceLocation()));
+			getWorld().getMessageHandler().handleMessage(
+					WeaveMessage.constructWeavingMessage(WeaveMessage.WEAVEMESSAGE_ANNOTATES,
+							new String[]{
+							sig.toString(),
+							loc.toString(),
+							decaM.getAnnotationString(),
+							methodName.startsWith("<init>")?"constructor":"method",
+							decaM.getAspect().toString(),
+							Utility.beautifyLocation(decaM.getSourceLocation())
+							}));	
+		}
+	}
+	
+    // TAG: WeavingMessage
+	private void reportMethodCtorWeavingMessage(LazyClassGen clazz, ResolvedMember member, DeclareAnnotation decaM) {
+		if (!getWorld().getMessageHandler().isIgnoring(IMessage.WEAVEINFO)){
+			StringBuffer parmString = new StringBuffer("(");
+			UnresolvedType[] paramTypes = member.getParameterTypes();
+			for (int i = 0; i < paramTypes.length; i++) {
+				UnresolvedType type = paramTypes[i];
+				String s = org.aspectj.apache.bcel.classfile.Utility.signatureToString(type.getSignature());
+				if (s.lastIndexOf(".")!=-1) s =s.substring(s.lastIndexOf(".")+1);
+				parmString.append(s);
+				if ((i+1)<paramTypes.length) parmString.append(",");
+				System.out.println("test: args " + s);
+			}
+//			Type[] args = mg.getMethod().getArgumentTypes();
+//			for (int i = 0; i < args.length; i++) {
+//				Type type2 = args[i];
+//				String s = org.aspectj.apache.bcel.classfile.Utility.signatureToString(type2.getSignature());
+//				if (s.lastIndexOf(".")!=-1) s =s.substring(s.lastIndexOf(".")+1);
+//				parmString.append(s);
+//				if ((i+1)<args.length) parmString.append(",");
+//			}
+			parmString.append(")");
+			//String methodName = mg.getMethod().getName();
+			String methodName = member.getName();
+			System.out.println("test: methodName: " + methodName);
+			StringBuffer sig = new StringBuffer();
+			String modifiers = org.aspectj.apache.bcel.classfile.Utility.accessToString(member.getModifiers());
+			System.out.println("test: modifiers:" + modifiers);
+			sig.append(modifiers);
+			//sig.append(org.aspectj.apache.bcel.classfile.Utility.accessToString(mg.getMethod().getAccessFlags()) );
+			//mg.getSignature().
+			sig.append(" ");
+			String returnType = member.getReturnType().toString();
+			System.out.println("test: returnType: " + returnType);
+			//sig.append(mg.getMethod().getReturnType().toString());
+			sig.append(returnType);
+			sig.append(" ");
+			//sig.append(clazz.getName());
+			String className = member.getDeclaringType().toString();
+			System.out.println("test: className: " + className);
+			sig.append(className);
+			sig.append(".");
+			System.out.println("test: blah: " + (methodName.equals("<init>")?"new":methodName));
+			sig.append(methodName.equals("<init>")?"new":methodName);
+			sig.append(parmString);
+			System.out.println("test: parmString: " + parmString);
+			
+			StringBuffer loc = new StringBuffer();
+			if (clazz.getFileName()==null) {
+				loc.append("no debug info available");
+			} else {
+				loc.append(clazz.getFileName());
+				System.out.println("test: lineNumber: " + member.getSourceLocation().getLine());
+//				if (mg.getDeclarationLineNumber()!=-1) {
+//					loc.append(":"+mg.getDeclarationLineNumber());
+//				}
+			}
+			System.out.println("test: fullString: " + sig.toString() + ", " + loc.toString() + ", " + 
+					decaM.getAnnotationString() + ", " + (methodName.startsWith("<init>")?"constructor":"method") +
+					", " + decaM.getAspect().toString() + ", " + Utility.beautifyLocation(decaM.getSourceLocation()));
+
 			getWorld().getMessageHandler().handleMessage(
 					WeaveMessage.constructWeavingMessage(WeaveMessage.WEAVEMESSAGE_ANNOTATES,
 							new String[]{
@@ -715,6 +830,8 @@
 					annotationHolder.addAnnotation(decaMC.getAnnotationX());
 					isChanged=true;
 					AsmRelationshipProvider.getDefault().addDeclareAnnotationRelationship(decaMC.getSourceLocation(),unMangledInterMethod.getSourceLocation());
+					// HELEN - trying something...
+					reportMethodCtorWeavingMessage(clazz, unMangledInterMethod, decaMC);
 					modificationOccured = true;					
 				} else {
 					if (!decaMC.isStarredAnnotationPattern()) 
@@ -790,79 +907,106 @@
 		if (decaFs.isEmpty()) return false; // nothing more to do
 		Field[] fields = clazz.getFieldGens();
 		if (fields!=null) {
-		  
+		  Set unusedDecafs = new HashSet();
+		  unusedDecafs.addAll(decaFs);
           for (int fieldCounter = 0;fieldCounter<fields.length;fieldCounter++) {
             BcelField aBcelField = new BcelField(clazz.getBcelObjectType(),fields[fieldCounter]);
 			if (!aBcelField.getName().startsWith(NameMangler.PREFIX)) {				
-            // Single first pass
-            List worthRetrying = new ArrayList();
-            boolean modificationOccured = false;
-            
-            Annotation [] dontAddMeTwice = fields[fieldCounter].getAnnotations();
-            
-            // go through all the declare @field statements
-            for (Iterator iter = decaFs.iterator(); iter.hasNext();) {
-				DeclareAnnotation decaF = (DeclareAnnotation) iter.next();
-				if (decaF.matches(aBcelField,world)) {
-					
-					if (!dontAddTwice(decaF,dontAddMeTwice)){
-						if (doesAlreadyHaveAnnotation(aBcelField,decaF,reportedProblems)){
-							continue;
-						}
+	            // Single first pass
+	            List worthRetrying = new ArrayList();
+	            boolean modificationOccured = false;
+	            
+	            Annotation [] dontAddMeTwice = fields[fieldCounter].getAnnotations();
+	            
+	            // go through all the declare @field statements
+	            for (Iterator iter = decaFs.iterator(); iter.hasNext();) {
+					DeclareAnnotation decaF = (DeclareAnnotation) iter.next();
+					if (decaF.matches(aBcelField,world)) {
 						
-						if(decaF.getAnnotationX().isRuntimeVisible()){ // isAnnotationWithRuntimeRetention(clazz.getJavaClass(world))){
-						//if(decaF.getAnnotationTypeX().isAnnotationWithRuntimeRetention(world)){						
-							// it should be runtime visible, so put it on the Field
-							Annotation a = decaF.getAnnotationX().getBcelAnnotation();
-							AnnotationGen ag = new AnnotationGen(a,clazz.getConstantPoolGen(),true);
-							FieldGen myGen = new FieldGen(fields[fieldCounter],clazz.getConstantPoolGen());
-							myGen.addAnnotation(ag);
-							Field newField = myGen.getField();
+						if (!dontAddTwice(decaF,dontAddMeTwice)){
+							if (doesAlreadyHaveAnnotation(aBcelField,decaF,reportedProblems)){
+								continue;
+							}
 							
-							aBcelField.addAnnotation(decaF.getAnnotationX());
-							clazz.replaceField(fields[fieldCounter],newField);
-							fields[fieldCounter]=newField;
-							
-						} else{
-							aBcelField.addAnnotation(decaF.getAnnotationX());
+							if(decaF.getAnnotationX().isRuntimeVisible()){ // isAnnotationWithRuntimeRetention(clazz.getJavaClass(world))){
+							//if(decaF.getAnnotationTypeX().isAnnotationWithRuntimeRetention(world)){						
+								// it should be runtime visible, so put it on the Field
+								Annotation a = decaF.getAnnotationX().getBcelAnnotation();
+								AnnotationGen ag = new AnnotationGen(a,clazz.getConstantPoolGen(),true);
+								FieldGen myGen = new FieldGen(fields[fieldCounter],clazz.getConstantPoolGen());
+								myGen.addAnnotation(ag);
+								Field newField = myGen.getField();
+								
+								aBcelField.addAnnotation(decaF.getAnnotationX());
+								clazz.replaceField(fields[fieldCounter],newField);
+								fields[fieldCounter]=newField;
+								
+							} else{
+								aBcelField.addAnnotation(decaF.getAnnotationX());
+							}
 						}
+						
+						AsmRelationshipProvider.getDefault().addDeclareAnnotationRelationship(decaF.getSourceLocation(),clazz.getName(),fields[fieldCounter]);
+						reportFieldAnnotationWeavingMessage(clazz, fields, fieldCounter, decaF);		
+						isChanged = true;
+						modificationOccured = true;
+						// remove the declare @ field since have matched against it
+						unusedDecafs.remove(decaF);
+					} else {
+						if (!decaF.isStarredAnnotationPattern())
+							worthRetrying.add(decaF); // an annotation is specified that might be put on by a subsequent decaf
 					}
-					
-					AsmRelationshipProvider.getDefault().addDeclareAnnotationRelationship(decaF.getSourceLocation(),clazz.getName(),fields[fieldCounter]);
-					reportFieldAnnotationWeavingMessage(clazz, fields, fieldCounter, decaF);		
-					isChanged = true;
-					modificationOccured = true;
-				} else {
-					if (!decaF.isStarredAnnotationPattern()) 
-						worthRetrying.add(decaF); // an annotation is specified that might be put on by a subsequent decaf
 				}
-			}
-			
-            // Multiple secondary passes
-            while (!worthRetrying.isEmpty() && modificationOccured) {
-              modificationOccured = false;
-              // lets have another go
-              List forRemoval = new ArrayList();
-              for (Iterator iter = worthRetrying.iterator(); iter.hasNext();) {
-				DeclareAnnotation decaF = (DeclareAnnotation) iter.next();
-				if (decaF.matches(aBcelField,world)) {
-					// below code is for recursive things
-					if (doesAlreadyHaveAnnotation(aBcelField,decaF,reportedProblems)) continue; // skip this one...
-					aBcelField.addAnnotation(decaF.getAnnotationX());
-					AsmRelationshipProvider.getDefault().addDeclareAnnotationRelationship(decaF.getSourceLocation(),clazz.getName(),fields[fieldCounter]);
-					isChanged = true;
-					modificationOccured = true;
-					forRemoval.add(decaF);
-				}
-			  }
-			  worthRetrying.removeAll(forRemoval);
-            }
+				
+	            // Multiple secondary passes
+	            while (!worthRetrying.isEmpty() && modificationOccured) {
+	              modificationOccured = false;
+	              // lets have another go
+	              List forRemoval = new ArrayList();
+	              for (Iterator iter = worthRetrying.iterator(); iter.hasNext();) {
+					DeclareAnnotation decaF = (DeclareAnnotation) iter.next();
+					if (decaF.matches(aBcelField,world)) {
+						// below code is for recursive things
+						if (doesAlreadyHaveAnnotation(aBcelField,decaF,reportedProblems)) continue; // skip this one...
+						aBcelField.addAnnotation(decaF.getAnnotationX());
+						AsmRelationshipProvider.getDefault().addDeclareAnnotationRelationship(decaF.getSourceLocation(),clazz.getName(),fields[fieldCounter]);
+						isChanged = true;
+						modificationOccured = true;
+						forRemoval.add(decaF);
+						// remove the declare @ field since have matched against it
+						unusedDecafs.remove(decaF);
+					}
+				  }
+				  worthRetrying.removeAll(forRemoval);
+	            }
 			}
           }
+	  	  for (Iterator iter = unusedDecafs.iterator(); iter.hasNext();) {
+	  		DeclareAnnotation declA = (DeclareAnnotation) iter.next();
+	  		if ((declA.isExactPattern() || 
+					(declA.getSignaturePattern().getDeclaringType() instanceof ExactTypePattern))
+					&& !declA.getSignaturePattern().getName().isAny()) {
+	  			boolean itdMatch = false;
+	  			List lst = clazz.getType().getInterTypeMungers();
+	  			for (Iterator iterator = lst.iterator(); iterator.hasNext() && !itdMatch;) {
+					BcelTypeMunger element = (BcelTypeMunger) iterator.next();
+					NewFieldTypeMunger nftm = (NewFieldTypeMunger)element.getMunger();
+					itdMatch = declA.getSignaturePattern().matches(nftm.getSignature(),world,false);
+				}
+	  			if (!itdMatch) {		  			
+					IMessage message = new Message(
+						"The field " + clazz.getClassName() + "." + declA.getSignaturePattern().getName().toString() + 
+						" does not exist", declA.getSourceLocation() , true);
+					world.getMessageHandler().handleMessage(message);					
+				}
+	  			
+	  		}
+	  	  }
         }
+
 		return isChanged;
 	}
-
+	
 	// TAG: WeavingMessage
 	private void reportFieldAnnotationWeavingMessage(LazyClassGen clazz, Field[] fields, int fieldCounter, DeclareAnnotation decaF) {
 		if (!getWorld().getMessageHandler().isIgnoring(IMessage.WEAVEINFO)){
Index: src/org/aspectj/weaver/patterns/DeclareAnnotation.java
===================================================================
RCS file: /home/technology/org.aspectj/modules/weaver/src/org/aspectj/weaver/patterns/DeclareAnnotation.java,v
retrieving revision 1.8
diff -u -r1.8 DeclareAnnotation.java
--- src/org/aspectj/weaver/patterns/DeclareAnnotation.java	6 Oct 2005 22:10:54 -0000	1.8
+++ src/org/aspectj/weaver/patterns/DeclareAnnotation.java	19 Oct 2005 13:25:43 -0000
@@ -288,6 +288,10 @@
 		return typePattern;
 	}
 	
+	public SignaturePattern getSignaturePattern() {
+		return sigPattern;
+	}
+	
 	public boolean isStarredAnnotationPattern() {
 		if (typePattern!=null) return typePattern.isStarAnnotation();
 		if (sigPattern!=null)  return sigPattern.isStarAnnotation();