mavenized org.aspectj.matcher module - wip

302 files changed, 47 insertions, 45 deletions

diff --git a/org.aspectj.matcher/.classpath b/org.aspectj.matcher/.classpath
deleted file mode 100644
index 856780f91..000000000
--- a/org.aspectj.matcher/.classpath
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="testsrc"/>
-	<classpathentry kind="lib" path="/lib/junit/junit.jar" sourcepath="/lib/junit/src.jar"/>
-	<classpathentry kind="src" path="/util"/>
-	<classpathentry kind="src" path="/testing-util"/>
-	<classpathentry kind="src" path="/bridge"/>
-	<classpathentry kind="lib" path="/lib/commons/commons.jar" sourcepath="/lib/commons/commons-src.zip"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/org.aspectj.matcher/.cvsignore b/org.aspectj.matcher/.cvsignore
deleted file mode 100644
index e1b17a04f..000000000
--- a/org.aspectj.matcher/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-out
-bin
-default.lst
-default.ajsym
-.clover
-bintest
diff --git a/org.aspectj.matcher/.isJava5 b/org.aspectj.matcher/.isJava5
deleted file mode 100644
index c18a7b867..000000000
--- a/org.aspectj.matcher/.isJava5
+++ /dev/null
@@ -1 +0,0 @@
-.isJava5
\ No newline at end of file
diff --git a/org.aspectj.matcher/.project b/org.aspectj.matcher/.project
deleted file mode 100644
index 787cfd0b6..000000000
--- a/org.aspectj.matcher/.project
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.aspectj.matcher</name>
-	<comment></comment>
-	<projects>
-		<project>asm</project>
-		<project>bridge</project>
-		<project>runtime</project>
-		<project>testing-util</project>
-		<project>util</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/org.aspectj.matcher/.settings/org.eclipse.jdt.ui.prefs b/org.aspectj.matcher/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index e591fe798..000000000
--- a/org.aspectj.matcher/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,3 +0,0 @@
-#Thu Sep 22 08:32:30 PDT 2005
-eclipse.preferences.version=1
-internal.default.compliance=default
diff --git a/org.aspectj.matcher/pom.xml b/org.aspectj.matcher/pom.xml
new file mode 100644
index 000000000..d2b02f44a
--- /dev/null
+++ b/org.aspectj.matcher/pom.xml
@@ -0,0 +1,42 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.aspectj</groupId>
+    <artifactId>aspectj-parent</artifactId>
+    <version>1.9.3.BUILD-SNAPSHOT</version>
+    <relativePath>..</relativePath>
+  </parent>
+
+  <artifactId>org.aspectj.matcher</artifactId>
+  <packaging>jar</packaging>
+  <name>org.aspectj.matcher</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>util</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>bridge</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.aspectj</groupId>
+      <artifactId>testing-util</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>commons</groupId>
+      <artifactId>commons</artifactId>
+      <version>1.0</version>
+      <scope>system</scope>
+      <systemPath>${project.basedir}/../lib/commons/commons.jar</systemPath>
+    </dependency>
+  </dependencies>
+
+</project>
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/AbstractAnnotationAJ.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AbstractAnnotationAJ.java
index 503d6b3b5..503d6b3b5 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/AbstractAnnotationAJ.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AbstractAnnotationAJ.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/AbstractReferenceTypeDelegate.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AbstractReferenceTypeDelegate.java
index 7f3fb60ee..7f3fb60ee 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/AbstractReferenceTypeDelegate.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AbstractReferenceTypeDelegate.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/Advice.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Advice.java
index d6c8ea87f..d6c8ea87f 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/Advice.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Advice.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/AdviceKind.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AdviceKind.java
index af0646935..af0646935 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/AdviceKind.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AdviceKind.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/AjAttribute.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AjAttribute.java
index 781227141..781227141 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/AjAttribute.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AjAttribute.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/AjcMemberMaker.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AjcMemberMaker.java
index 1ba711baa..1ba711baa 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/AjcMemberMaker.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AjcMemberMaker.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/AnnotatedElement.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotatedElement.java
index 86297b85b..86297b85b 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/AnnotatedElement.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotatedElement.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/AnnotationAJ.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationAJ.java
index 311b12e1f..311b12e1f 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/AnnotationAJ.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationAJ.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/AnnotationAnnotationValue.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationAnnotationValue.java
index c25c33cd2..c25c33cd2 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/AnnotationAnnotationValue.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationAnnotationValue.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/AnnotationNameValuePair.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationNameValuePair.java
index 17824ac69..17824ac69 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/AnnotationNameValuePair.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationNameValuePair.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/AnnotationOnTypeMunger.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationOnTypeMunger.java
index 6390ed311..6390ed311 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/AnnotationOnTypeMunger.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationOnTypeMunger.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/AnnotationTargetKind.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationTargetKind.java
index fe2104484..fe2104484 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/AnnotationTargetKind.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationTargetKind.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/AnnotationValue.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationValue.java
index 32f366774..32f366774 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/AnnotationValue.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationValue.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ArrayAnnotationValue.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ArrayAnnotationValue.java
index f4ef760bb..f4ef760bb 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/ArrayAnnotationValue.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ArrayAnnotationValue.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ArrayReferenceType.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ArrayReferenceType.java
index aa4fa55c0..aa4fa55c0 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/ArrayReferenceType.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ArrayReferenceType.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/BCException.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/BCException.java
index 81bf607ed..81bf607ed 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/BCException.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/BCException.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/BindingScope.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/BindingScope.java
index d97fb8fb6..d97fb8fb6 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/BindingScope.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/BindingScope.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/BoundedReferenceType.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/BoundedReferenceType.java
index 62bd4d23a..62bd4d23a 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/BoundedReferenceType.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/BoundedReferenceType.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/BoundedReferenceTypeDelegate.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/BoundedReferenceTypeDelegate.java
index f928b729b..f928b729b 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/BoundedReferenceTypeDelegate.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/BoundedReferenceTypeDelegate.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/Checker.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Checker.java
index 4a765a9e5..4a765a9e5 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/Checker.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Checker.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ClassAnnotationValue.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ClassAnnotationValue.java
index cb7476c32..cb7476c32 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/ClassAnnotationValue.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ClassAnnotationValue.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/CompressingDataOutputStream.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/CompressingDataOutputStream.java
index 43a66ff4f..43a66ff4f 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/CompressingDataOutputStream.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/CompressingDataOutputStream.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ConcreteTypeMunger.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ConcreteTypeMunger.java
index 81cf351a9..81cf351a9 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/ConcreteTypeMunger.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ConcreteTypeMunger.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ConstantPoolReader.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ConstantPoolReader.java
index 1345e7e09..1345e7e09 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/ConstantPoolReader.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ConstantPoolReader.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ConstantPoolWriter.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ConstantPoolWriter.java
index 2b145a1de..2b145a1de 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/ConstantPoolWriter.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ConstantPoolWriter.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/Constants.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Constants.java
index bdbde3853..bdbde3853 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/Constants.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Constants.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/CrosscuttingMembers.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/CrosscuttingMembers.java
index 8e41c0a82..8e41c0a82 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/CrosscuttingMembers.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/CrosscuttingMembers.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/CrosscuttingMembersSet.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/CrosscuttingMembersSet.java
index 969f96ece..969f96ece 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/CrosscuttingMembersSet.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/CrosscuttingMembersSet.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/CustomMungerFactory.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/CustomMungerFactory.java
index 91bcbdf6b..91bcbdf6b 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/CustomMungerFactory.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/CustomMungerFactory.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/Dump.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Dump.java
index 103e9fec2..103e9fec2 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/Dump.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Dump.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/EnumAnnotationValue.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/EnumAnnotationValue.java
index f15968b8d..f15968b8d 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/EnumAnnotationValue.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/EnumAnnotationValue.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ExposeTypeMunger.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ExposeTypeMunger.java
index f5b842011..f5b842011 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/ExposeTypeMunger.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ExposeTypeMunger.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/GeneratedReferenceTypeDelegate.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/GeneratedReferenceTypeDelegate.java
index 5d08467d0..5d08467d0 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/GeneratedReferenceTypeDelegate.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/GeneratedReferenceTypeDelegate.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/IClassWeaver.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IClassWeaver.java
index ad65eedf9..ad65eedf9 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/IClassWeaver.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IClassWeaver.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ICrossReferenceHandler.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ICrossReferenceHandler.java
index e38338ae1..e38338ae1 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/ICrossReferenceHandler.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ICrossReferenceHandler.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/IEclipseSourceContext.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IEclipseSourceContext.java
index d691c503d..d691c503d 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/IEclipseSourceContext.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IEclipseSourceContext.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/IHasPosition.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IHasPosition.java
index 8efb55828..8efb55828 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/IHasPosition.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IHasPosition.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/IHasSourceLocation.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IHasSourceLocation.java
index 5b011f246..5b011f246 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/IHasSourceLocation.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IHasSourceLocation.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ISourceContext.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ISourceContext.java
index 0f2f0aba1..0f2f0aba1 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/ISourceContext.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ISourceContext.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/IUnwovenClassFile.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IUnwovenClassFile.java
index 85ab7a16d..85ab7a16d 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/IUnwovenClassFile.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IUnwovenClassFile.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/IWeaveRequestor.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IWeaveRequestor.java
index 60037c2e6..60037c2e6 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/IWeaveRequestor.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IWeaveRequestor.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/IWeavingSupport.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IWeavingSupport.java
index 3f259c66c..3f259c66c 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/IWeavingSupport.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IWeavingSupport.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/IntMap.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IntMap.java
index c0af738ba..c0af738ba 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/IntMap.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IntMap.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/Iterators.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Iterators.java
index 1a2e82006..1a2e82006 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/Iterators.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Iterators.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/JoinPointSignature.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/JoinPointSignature.java
index 57171dd13..57171dd13 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/JoinPointSignature.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/JoinPointSignature.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/JoinPointSignatureIterator.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/JoinPointSignatureIterator.java
index 50332c1c0..50332c1c0 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/JoinPointSignatureIterator.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/JoinPointSignatureIterator.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/Lint.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Lint.java
index aab34b8f6..aab34b8f6 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/Lint.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Lint.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/LintMessage.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/LintMessage.java
index f54e20e7d..f54e20e7d 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/LintMessage.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/LintMessage.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/Member.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Member.java
index 8134e8df2..8134e8df2 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/Member.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Member.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/MemberImpl.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/MemberImpl.java
index fbf497ed2..fbf497ed2 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/MemberImpl.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/MemberImpl.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/MemberKind.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/MemberKind.java
index f1d5dfa0f..f1d5dfa0f 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/MemberKind.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/MemberKind.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/MemberUtils.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/MemberUtils.java
index 201eb758f..201eb758f 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/MemberUtils.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/MemberUtils.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/MethodDelegateTypeMunger.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/MethodDelegateTypeMunger.java
index 79eab7d4d..79eab7d4d 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/MethodDelegateTypeMunger.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/MethodDelegateTypeMunger.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/MissingResolvedTypeWithKnownSignature.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/MissingResolvedTypeWithKnownSignature.java
index da61ffd8b..da61ffd8b 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/MissingResolvedTypeWithKnownSignature.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/MissingResolvedTypeWithKnownSignature.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/NameMangler.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/NameMangler.java
index f9162684a..f9162684a 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/NameMangler.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/NameMangler.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/NewConstructorTypeMunger.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/NewConstructorTypeMunger.java
index d7d1ba18d..d7d1ba18d 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/NewConstructorTypeMunger.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/NewConstructorTypeMunger.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/NewFieldTypeMunger.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/NewFieldTypeMunger.java
index ed8afc1e0..ed8afc1e0 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/NewFieldTypeMunger.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/NewFieldTypeMunger.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/NewMemberClassTypeMunger.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/NewMemberClassTypeMunger.java
index c086c2c86..c086c2c86 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/NewMemberClassTypeMunger.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/NewMemberClassTypeMunger.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/NewMethodTypeMunger.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/NewMethodTypeMunger.java
index a6e0ffce7..a6e0ffce7 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/NewMethodTypeMunger.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/NewMethodTypeMunger.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/NewParentTypeMunger.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/NewParentTypeMunger.java
index cb3110073..cb3110073 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/NewParentTypeMunger.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/NewParentTypeMunger.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/PerObjectInterfaceTypeMunger.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/PerObjectInterfaceTypeMunger.java
index ce4348241..ce4348241 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/PerObjectInterfaceTypeMunger.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/PerObjectInterfaceTypeMunger.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/PerTypeWithinTargetTypeMunger.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/PerTypeWithinTargetTypeMunger.java
index ad549417a..ad549417a 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/PerTypeWithinTargetTypeMunger.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/PerTypeWithinTargetTypeMunger.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/PersistenceSupport.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/PersistenceSupport.java
index d98c7678d..d98c7678d 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/PersistenceSupport.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/PersistenceSupport.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/PoliceExtensionUse.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/PoliceExtensionUse.java
index e35a9b8a3..e35a9b8a3 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/PoliceExtensionUse.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/PoliceExtensionUse.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/Position.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Position.java
index af9f38328..af9f38328 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/Position.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Position.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/PrivilegedAccessMunger.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/PrivilegedAccessMunger.java
index 3acbf9b4b..3acbf9b4b 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/PrivilegedAccessMunger.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/PrivilegedAccessMunger.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ReferenceType.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ReferenceType.java
index 7dc162a16..7dc162a16 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/ReferenceType.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ReferenceType.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ReferenceTypeDelegate.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ReferenceTypeDelegate.java
index e07c032e6..e07c032e6 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/ReferenceTypeDelegate.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ReferenceTypeDelegate.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ResolvableTypeList.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvableTypeList.java
index 34e17b44a..34e17b44a 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/ResolvableTypeList.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvableTypeList.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedMember.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedMember.java
index 0b5def29a..0b5def29a 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedMember.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedMember.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedMemberImpl.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedMemberImpl.java
index cfd0508c4..cfd0508c4 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedMemberImpl.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedMemberImpl.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedPointcutDefinition.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedPointcutDefinition.java
index 500b30cd0..500b30cd0 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedPointcutDefinition.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedPointcutDefinition.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedType.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedType.java
index 98400ebdc..98400ebdc 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedType.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedType.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedTypeMunger.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedTypeMunger.java
index 2ba3cbc36..2ba3cbc36 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/ResolvedTypeMunger.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedTypeMunger.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/RuntimeVersion.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/RuntimeVersion.java
index 0cf90a9a2..0cf90a9a2 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/RuntimeVersion.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/RuntimeVersion.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/Shadow.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Shadow.java
index 587d19c15..587d19c15 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/Shadow.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Shadow.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ShadowMunger.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ShadowMunger.java
index c07d7e8e7..c07d7e8e7 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/ShadowMunger.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ShadowMunger.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/SignatureUtils.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/SignatureUtils.java
index d32f7d99f..d32f7d99f 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/SignatureUtils.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/SignatureUtils.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/SimpleAnnotationValue.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/SimpleAnnotationValue.java
index 312f7726b..312f7726b 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/SimpleAnnotationValue.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/SimpleAnnotationValue.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/SourceContextImpl.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/SourceContextImpl.java
index 2ae91c649..2ae91c649 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/SourceContextImpl.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/SourceContextImpl.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/StandardAnnotation.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/StandardAnnotation.java
index 475b0977f..475b0977f 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/StandardAnnotation.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/StandardAnnotation.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/StaticJoinPointFactory.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/StaticJoinPointFactory.java
index 591e6c470..591e6c470 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/StaticJoinPointFactory.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/StaticJoinPointFactory.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/TemporaryTypeMunger.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TemporaryTypeMunger.java
index 0e0a89fce..0e0a89fce 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/TemporaryTypeMunger.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TemporaryTypeMunger.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/TypeFactory.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeFactory.java
index e565e5bc8..e565e5bc8 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/TypeFactory.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeFactory.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/TypeVariable.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeVariable.java
index d67bbd8dc..d67bbd8dc 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/TypeVariable.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeVariable.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/TypeVariableDeclaringElement.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeVariableDeclaringElement.java
index ae41fd09c..ae41fd09c 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/TypeVariableDeclaringElement.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeVariableDeclaringElement.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/TypeVariableReference.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeVariableReference.java
index 138fbced7..138fbced7 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/TypeVariableReference.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeVariableReference.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/TypeVariableReferenceType.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeVariableReferenceType.java
index 1e867ab5e..1e867ab5e 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/TypeVariableReferenceType.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeVariableReferenceType.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/UnresolvedType.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/UnresolvedType.java
index d8d46176d..d8d46176d 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/UnresolvedType.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/UnresolvedType.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/UnresolvedTypeVariableReferenceType.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/UnresolvedTypeVariableReferenceType.java
index fbeb47164..fbeb47164 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/UnresolvedTypeVariableReferenceType.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/UnresolvedTypeVariableReferenceType.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/Utils.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Utils.java
index 8053af0c0..8053af0c0 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/Utils.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Utils.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/VersionedDataInputStream.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/VersionedDataInputStream.java
index 38b2081b0..38b2081b0 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/VersionedDataInputStream.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/VersionedDataInputStream.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/WeakClassLoaderReference.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/WeakClassLoaderReference.java
index ddca93202..ddca93202 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/WeakClassLoaderReference.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/WeakClassLoaderReference.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/WeaverMessages.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/WeaverMessages.java
index 5a64a77e8..5a64a77e8 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/WeaverMessages.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/WeaverMessages.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/WeaverStateInfo.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/WeaverStateInfo.java
index f0dcbf270..f0dcbf270 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/WeaverStateInfo.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/WeaverStateInfo.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/WildcardedUnresolvedType.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/WildcardedUnresolvedType.java
index d3e609e7f..d3e609e7f 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/WildcardedUnresolvedType.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/WildcardedUnresolvedType.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/World.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/World.java
index 644f232ac..644f232ac 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/World.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/World.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/XlintDefault.properties b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/XlintDefault.properties
index 416fc2d55..416fc2d55 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/XlintDefault.properties
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/XlintDefault.properties
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ast/ASTNode.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/ASTNode.java
index 7e8b08347..7e8b08347 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/ast/ASTNode.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/ASTNode.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ast/And.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/And.java
index 8679d48d0..8679d48d0 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/ast/And.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/And.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ast/Call.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Call.java
index 1a1b52abe..1a1b52abe 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/ast/Call.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Call.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ast/CallExpr.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/CallExpr.java
index e8191a42e..e8191a42e 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/ast/CallExpr.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/CallExpr.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ast/Expr.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Expr.java
index 1b22c8f42..1b22c8f42 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/ast/Expr.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Expr.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ast/FieldGet.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/FieldGet.java
index 2e145e3c2..2e145e3c2 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/ast/FieldGet.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/FieldGet.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ast/FieldGetCall.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/FieldGetCall.java
index 64aaf4b1a..64aaf4b1a 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/ast/FieldGetCall.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/FieldGetCall.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ast/HasAnnotation.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/HasAnnotation.java
index 885e9d083..885e9d083 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/ast/HasAnnotation.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/HasAnnotation.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ast/IExprVisitor.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/IExprVisitor.java
index 89e0b3d74..89e0b3d74 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/ast/IExprVisitor.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/IExprVisitor.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ast/ITestVisitor.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/ITestVisitor.java
index fc99272af..fc99272af 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/ast/ITestVisitor.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/ITestVisitor.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ast/Instanceof.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Instanceof.java
index feec6a2be..feec6a2be 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/ast/Instanceof.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Instanceof.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ast/Literal.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Literal.java
index bb7968eb5..bb7968eb5 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/ast/Literal.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Literal.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ast/Not.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Not.java
index 366a193a4..366a193a4 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/ast/Not.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Not.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ast/Or.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Or.java
index b3143df73..b3143df73 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/ast/Or.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Or.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ast/Test.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Test.java
index 8da7694e6..8da7694e6 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/ast/Test.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Test.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/ast/Var.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Var.java
index 77fddb557..77fddb557 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/ast/Var.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ast/Var.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/internal/tools/MatchingContextBasedTest.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/internal/tools/MatchingContextBasedTest.java
index b5a78e0e6..b5a78e0e6 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/internal/tools/MatchingContextBasedTest.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/internal/tools/MatchingContextBasedTest.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/internal/tools/PointcutDesignatorHandlerBasedPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/internal/tools/PointcutDesignatorHandlerBasedPointcut.java
index e5672dede..e5672dede 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/internal/tools/PointcutDesignatorHandlerBasedPointcut.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/internal/tools/PointcutDesignatorHandlerBasedPointcut.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/internal/tools/PointcutExpressionImpl.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/internal/tools/PointcutExpressionImpl.java
index 822c78d9a..822c78d9a 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/internal/tools/PointcutExpressionImpl.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/internal/tools/PointcutExpressionImpl.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/internal/tools/StandardPointcutExpressionImpl.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/internal/tools/StandardPointcutExpressionImpl.java
index a767ed18b..a767ed18b 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/internal/tools/StandardPointcutExpressionImpl.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/internal/tools/StandardPointcutExpressionImpl.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/internal/tools/TypePatternMatcherImpl.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/internal/tools/TypePatternMatcherImpl.java
index 8ce4bceea..8ce4bceea 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/internal/tools/TypePatternMatcherImpl.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/internal/tools/TypePatternMatcherImpl.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/AbstractPatternNodeVisitor.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AbstractPatternNodeVisitor.java
index 34efee3ee..34efee3ee 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/AbstractPatternNodeVisitor.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AbstractPatternNodeVisitor.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/AbstractSignaturePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AbstractSignaturePattern.java
index cb87ee431..cb87ee431 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/AbstractSignaturePattern.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AbstractSignaturePattern.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/AndAnnotationTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AndAnnotationTypePattern.java
index c14f36025..c14f36025 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/AndAnnotationTypePattern.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AndAnnotationTypePattern.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/AndPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AndPointcut.java
index 20fc74734..20fc74734 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/AndPointcut.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AndPointcut.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/AndSignaturePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AndSignaturePattern.java
index c05995377..c05995377 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/AndSignaturePattern.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AndSignaturePattern.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/AndTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AndTypePattern.java
index 781a5881a..781a5881a 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/AndTypePattern.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AndTypePattern.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/AnnotationPatternList.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnnotationPatternList.java
index 0b93b48d1..0b93b48d1 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/AnnotationPatternList.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnnotationPatternList.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/AnnotationPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnnotationPointcut.java
index e829d3772..e829d3772 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/AnnotationPointcut.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnnotationPointcut.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/AnnotationTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnnotationTypePattern.java
index 82fb33854..82fb33854 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/AnnotationTypePattern.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnnotationTypePattern.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/AnyAnnotationTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnyAnnotationTypePattern.java
index 769424311..769424311 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/AnyAnnotationTypePattern.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnyAnnotationTypePattern.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/AnyTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnyTypePattern.java
index db9ba5130..db9ba5130 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/AnyTypePattern.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnyTypePattern.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/AnyWithAnnotationTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnyWithAnnotationTypePattern.java
index 8306ff6d0..8306ff6d0 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/AnyWithAnnotationTypePattern.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/AnyWithAnnotationTypePattern.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ArgsAnnotationPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ArgsAnnotationPointcut.java
index db612b8cd..db612b8cd 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ArgsAnnotationPointcut.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ArgsAnnotationPointcut.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ArgsPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ArgsPointcut.java
index 56b1a4dc5..56b1a4dc5 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ArgsPointcut.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ArgsPointcut.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/BasicToken.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BasicToken.java
index e6e201daf..e6e201daf 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/BasicToken.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BasicToken.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/BasicTokenSource.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BasicTokenSource.java
index 0a099529b..0a099529b 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/BasicTokenSource.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BasicTokenSource.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/BindingAnnotationFieldTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BindingAnnotationFieldTypePattern.java
index 707f1e79e..707f1e79e 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/BindingAnnotationFieldTypePattern.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BindingAnnotationFieldTypePattern.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/BindingAnnotationTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BindingAnnotationTypePattern.java
index 142f6155e..142f6155e 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/BindingAnnotationTypePattern.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BindingAnnotationTypePattern.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/BindingPattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BindingPattern.java
index 4d909ede5..4d909ede5 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/BindingPattern.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BindingPattern.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/BindingTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BindingTypePattern.java
index 900285038..900285038 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/BindingTypePattern.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/BindingTypePattern.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/Bindings.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/Bindings.java
index 4853dd049..4853dd049 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/Bindings.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/Bindings.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/CflowPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/CflowPointcut.java
index a83236e5c..a83236e5c 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/CflowPointcut.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/CflowPointcut.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ConcreteCflowPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ConcreteCflowPointcut.java
index 09208f9c2..09208f9c2 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ConcreteCflowPointcut.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ConcreteCflowPointcut.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/Declare.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/Declare.java
index 48769fcb6..48769fcb6 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/Declare.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/Declare.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/DeclareAnnotation.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareAnnotation.java
index ba1d29415..ba1d29415 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/DeclareAnnotation.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareAnnotation.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/DeclareErrorOrWarning.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareErrorOrWarning.java
index 0a46fa1e9..0a46fa1e9 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/DeclareErrorOrWarning.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareErrorOrWarning.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/DeclareParents.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareParents.java
index 53553afb3..53553afb3 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/DeclareParents.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareParents.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/DeclareParentsMixin.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareParentsMixin.java
index 9c2db1156..9c2db1156 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/DeclareParentsMixin.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareParentsMixin.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/DeclarePrecedence.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclarePrecedence.java
index 678ea89e6..678ea89e6 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/DeclarePrecedence.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclarePrecedence.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/DeclareSoft.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareSoft.java
index 3714d5fdc..3714d5fdc 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/DeclareSoft.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareSoft.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/DeclareTypeErrorOrWarning.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareTypeErrorOrWarning.java
index daaf84496..daaf84496 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/DeclareTypeErrorOrWarning.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/DeclareTypeErrorOrWarning.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/EllipsisTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/EllipsisTypePattern.java
index 2abc51327..2abc51327 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/EllipsisTypePattern.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/EllipsisTypePattern.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ExactAnnotationFieldTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ExactAnnotationFieldTypePattern.java
index 627b622eb..627b622eb 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ExactAnnotationFieldTypePattern.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ExactAnnotationFieldTypePattern.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ExactAnnotationTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ExactAnnotationTypePattern.java
index b51d72df9..b51d72df9 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ExactAnnotationTypePattern.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ExactAnnotationTypePattern.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ExactTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ExactTypePattern.java
index 68353422f..68353422f 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ExactTypePattern.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ExactTypePattern.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ExposedState.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ExposedState.java
index 2a9807118..2a9807118 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ExposedState.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ExposedState.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/FastMatchInfo.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/FastMatchInfo.java
index a18830832..a18830832 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/FastMatchInfo.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/FastMatchInfo.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/FormalBinding.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/FormalBinding.java
index 73693f07c..73693f07c 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/FormalBinding.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/FormalBinding.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/HandlerPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/HandlerPointcut.java
index 3f92ab04a..3f92ab04a 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/HandlerPointcut.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/HandlerPointcut.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/HasMemberTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/HasMemberTypePattern.java
index 2b1f28fd4..2b1f28fd4 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/HasMemberTypePattern.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/HasMemberTypePattern.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/HasMemberTypePatternFinder.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/HasMemberTypePatternFinder.java
index 5fb59503f..5fb59503f 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/HasMemberTypePatternFinder.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/HasMemberTypePatternFinder.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/HasMemberTypePatternForPerThisMatching.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/HasMemberTypePatternForPerThisMatching.java
index 128338f8e..128338f8e 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/HasMemberTypePatternForPerThisMatching.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/HasMemberTypePatternForPerThisMatching.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/HasThisTypePatternTriedToSneakInSomeGenericOrParameterizedTypePatternMatchingStuffAnywhereVisitor.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/HasThisTypePatternTriedToSneakInSomeGenericOrParameterizedTypePatternMatchingStuffAnywhereVisitor.java
index 0b2b9b5fc..0b2b9b5fc 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/HasThisTypePatternTriedToSneakInSomeGenericOrParameterizedTypePatternMatchingStuffAnywhereVisitor.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/HasThisTypePatternTriedToSneakInSomeGenericOrParameterizedTypePatternMatchingStuffAnywhereVisitor.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/IScope.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/IScope.java
index 69ba19686..69ba19686 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/IScope.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/IScope.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ISignaturePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ISignaturePattern.java
index 99ad99377..99ad99377 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ISignaturePattern.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ISignaturePattern.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/IToken.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/IToken.java
index aa925fd69..aa925fd69 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/IToken.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/IToken.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ITokenSource.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ITokenSource.java
index 4649b046f..4649b046f 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ITokenSource.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ITokenSource.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/IVerificationRequired.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/IVerificationRequired.java
index f1ce19eff..f1ce19eff 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/IVerificationRequired.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/IVerificationRequired.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/IfPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/IfPointcut.java
index a845153f9..a845153f9 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/IfPointcut.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/IfPointcut.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/KindedPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/KindedPointcut.java
index 968c420e9..56a45892d 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/KindedPointcut.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/KindedPointcut.java
@@ -174,7 +174,11 @@ public class KindedPointcut extends Pointcut {
 							}
 						}
 					}
-				}
+				} else  if (this.getSignature().getDeclaringType() instanceof WildTypePattern) {
+					final WildTypePattern pattern = (WildTypePattern) this.getSignature().getDeclaringType();
+					final ResolvedType type = info.getType();
+					return pattern.matches(type, TypePattern.STATIC);
+				}				
 			}
 		}
 
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ModifiersPattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ModifiersPattern.java
index 6c1d0557e..6c1d0557e 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ModifiersPattern.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ModifiersPattern.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/NameBindingPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NameBindingPointcut.java
index 34b25e207..34b25e207 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/NameBindingPointcut.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NameBindingPointcut.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/NamePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NamePattern.java
index 561b99197..561b99197 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/NamePattern.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NamePattern.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/NoTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NoTypePattern.java
index e5be0a969..e5be0a969 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/NoTypePattern.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NoTypePattern.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/NotAnnotationTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NotAnnotationTypePattern.java
index 0317b85a5..0317b85a5 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/NotAnnotationTypePattern.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NotAnnotationTypePattern.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/NotPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NotPointcut.java
index 85d2cdb7a..85d2cdb7a 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/NotPointcut.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NotPointcut.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/NotSignaturePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NotSignaturePattern.java
index b6140ece1..b6140ece1 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/NotSignaturePattern.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NotSignaturePattern.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/NotTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NotTypePattern.java
index 0f8f82c21..0f8f82c21 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/NotTypePattern.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/NotTypePattern.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/OrAnnotationTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/OrAnnotationTypePattern.java
index 3cfe1de8b..3cfe1de8b 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/OrAnnotationTypePattern.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/OrAnnotationTypePattern.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/OrPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/OrPointcut.java
index dde02f726..dde02f726 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/OrPointcut.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/OrPointcut.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/OrSignaturePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/OrSignaturePattern.java
index 67346f444..67346f444 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/OrSignaturePattern.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/OrSignaturePattern.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/OrTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/OrTypePattern.java
index b31a4e9ad..b31a4e9ad 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/OrTypePattern.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/OrTypePattern.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ParserException.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ParserException.java
index 036061f15..036061f15 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ParserException.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ParserException.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/PatternNode.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PatternNode.java
index 8a7aae097..8a7aae097 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/PatternNode.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PatternNode.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/PatternNodeVisitor.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PatternNodeVisitor.java
index 336a33e51..336a33e51 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/PatternNodeVisitor.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PatternNodeVisitor.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/PatternParser.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PatternParser.java
index effecfeaf..effecfeaf 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/PatternParser.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PatternParser.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/PerCflow.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerCflow.java
index 1ad834e06..1ad834e06 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/PerCflow.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerCflow.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/PerClause.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerClause.java
index 62b2b1b85..62b2b1b85 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/PerClause.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerClause.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/PerFromSuper.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerFromSuper.java
index 9875291f3..9875291f3 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/PerFromSuper.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerFromSuper.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/PerObject.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerObject.java
index 237a64a8e..237a64a8e 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/PerObject.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerObject.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/PerSingleton.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerSingleton.java
index f53c3a4a5..f53c3a4a5 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/PerSingleton.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerSingleton.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/PerThisOrTargetPointcutVisitor.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerThisOrTargetPointcutVisitor.java
index 0020cefdc..0020cefdc 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/PerThisOrTargetPointcutVisitor.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerThisOrTargetPointcutVisitor.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/PerTypeWithin.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerTypeWithin.java
index d912b52ed..d912b52ed 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/PerTypeWithin.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PerTypeWithin.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/Pointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/Pointcut.java
index f927286ec..f927286ec 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/Pointcut.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/Pointcut.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/PointcutEvaluationExpenseComparator.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PointcutEvaluationExpenseComparator.java
index 5f3a3291f..5f3a3291f 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/PointcutEvaluationExpenseComparator.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PointcutEvaluationExpenseComparator.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/PointcutRewriter.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PointcutRewriter.java
index 81ff33bab..81ff33bab 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/PointcutRewriter.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/PointcutRewriter.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ReferencePointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ReferencePointcut.java
index 6e74a1a2f..6e74a1a2f 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ReferencePointcut.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ReferencePointcut.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ScopeWithTypeVariables.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ScopeWithTypeVariables.java
index 537fb2c22..537fb2c22 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ScopeWithTypeVariables.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ScopeWithTypeVariables.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/SignaturePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/SignaturePattern.java
index 365b5b7a7..365b5b7a7 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/SignaturePattern.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/SignaturePattern.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/SimpleScope.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/SimpleScope.java
index 119103d84..119103d84 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/SimpleScope.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/SimpleScope.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ThisOrTargetAnnotationPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ThisOrTargetAnnotationPointcut.java
index dfb509195..dfb509195 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ThisOrTargetAnnotationPointcut.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ThisOrTargetAnnotationPointcut.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ThisOrTargetPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ThisOrTargetPointcut.java
index a278e76c6..a278e76c6 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ThisOrTargetPointcut.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ThisOrTargetPointcut.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ThrowsPattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ThrowsPattern.java
index 93557d8c1..93557d8c1 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/ThrowsPattern.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ThrowsPattern.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/TypeCategoryTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypeCategoryTypePattern.java
index 80ffc7556..80ffc7556 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/TypeCategoryTypePattern.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypeCategoryTypePattern.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/TypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypePattern.java
index 2d657dee2..2d657dee2 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/TypePattern.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypePattern.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/TypePatternList.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypePatternList.java
index da9d6e15a..da9d6e15a 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/TypePatternList.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypePatternList.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/TypePatternQuestions.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypePatternQuestions.java
index d4bdf2e58..d4bdf2e58 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/TypePatternQuestions.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypePatternQuestions.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/TypeVariablePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypeVariablePattern.java
index c2d4bd0ec..c2d4bd0ec 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/TypeVariablePattern.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypeVariablePattern.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/TypeVariablePatternList.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypeVariablePatternList.java
index 7bbe67872..7bbe67872 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/TypeVariablePatternList.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/TypeVariablePatternList.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/WildAnnotationTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WildAnnotationTypePattern.java
index 0941462d1..0941462d1 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/WildAnnotationTypePattern.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WildAnnotationTypePattern.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/WildChildFinder.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WildChildFinder.java
index 500d281e2..500d281e2 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/WildChildFinder.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WildChildFinder.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/WildTypePattern.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WildTypePattern.java
index 9081c5c02..9081c5c02 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/WildTypePattern.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WildTypePattern.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/WithinAnnotationPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WithinAnnotationPointcut.java
index 42ec11dc2..42ec11dc2 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/WithinAnnotationPointcut.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WithinAnnotationPointcut.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/WithinCodeAnnotationPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WithinCodeAnnotationPointcut.java
index 408c829f5..408c829f5 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/WithinCodeAnnotationPointcut.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WithinCodeAnnotationPointcut.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/WithinPointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WithinPointcut.java
index e5461b67e..e5461b67e 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/WithinPointcut.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WithinPointcut.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/WithincodePointcut.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WithincodePointcut.java
index bb4a1e72c..bb4a1e72c 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/patterns/WithincodePointcut.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/WithincodePointcut.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/reflect/AnnotationFinder.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/AnnotationFinder.java
index 90ce368d9..90ce368d9 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/reflect/AnnotationFinder.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/AnnotationFinder.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/reflect/GenericSignatureInformationProvider.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/GenericSignatureInformationProvider.java
index fce972348..fce972348 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/reflect/GenericSignatureInformationProvider.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/GenericSignatureInformationProvider.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/reflect/IReflectionWorld.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/IReflectionWorld.java
index 60d90d357..60d90d357 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/reflect/IReflectionWorld.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/IReflectionWorld.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/reflect/Java14GenericSignatureInformationProvider.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/Java14GenericSignatureInformationProvider.java
index 91b32ff0e..91b32ff0e 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/reflect/Java14GenericSignatureInformationProvider.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/Java14GenericSignatureInformationProvider.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/reflect/JoinPointMatchImpl.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/JoinPointMatchImpl.java
index 69a5f4577..69a5f4577 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/reflect/JoinPointMatchImpl.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/JoinPointMatchImpl.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/reflect/PointcutParameterImpl.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/PointcutParameterImpl.java
index 722d64839..722d64839 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/reflect/PointcutParameterImpl.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/PointcutParameterImpl.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegate.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegate.java
index 2aa83c957..2aa83c957 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegate.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegate.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegateFactory.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegateFactory.java
index eee1b6f32..eee1b6f32 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegateFactory.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionBasedReferenceTypeDelegateFactory.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/reflect/ReflectionBasedResolvedMemberImpl.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionBasedResolvedMemberImpl.java
index ba8f1330e..ba8f1330e 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/reflect/ReflectionBasedResolvedMemberImpl.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionBasedResolvedMemberImpl.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/reflect/ReflectionFastMatchInfo.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionFastMatchInfo.java
index eb891c3bf..eb891c3bf 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/reflect/ReflectionFastMatchInfo.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionFastMatchInfo.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/reflect/ReflectionShadow.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionShadow.java
index 0c6277e59..0c6277e59 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/reflect/ReflectionShadow.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionShadow.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/reflect/ReflectionVar.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionVar.java
index 59876a737..59876a737 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/reflect/ReflectionVar.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionVar.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/reflect/ReflectionWorld.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionWorld.java
index c784ff288..c784ff288 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/reflect/ReflectionWorld.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ReflectionWorld.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/reflect/ShadowMatchImpl.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ShadowMatchImpl.java
index 350a77ba9..350a77ba9 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/reflect/ShadowMatchImpl.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/ShadowMatchImpl.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/reflect/StandardShadow.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/StandardShadow.java
index c151b228e..c151b228e 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/reflect/StandardShadow.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/StandardShadow.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/reflect/StandardShadowMatchImpl.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/StandardShadowMatchImpl.java
index baeab0334..baeab0334 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/reflect/StandardShadowMatchImpl.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/StandardShadowMatchImpl.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/AbstractTrace.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/AbstractTrace.java
index 52217f880..52217f880 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/tools/AbstractTrace.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/AbstractTrace.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/CommonsTrace.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/CommonsTrace.java
index 25562c050..25562c050 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/tools/CommonsTrace.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/CommonsTrace.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/CommonsTraceFactory.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/CommonsTraceFactory.java
index 8f9f91e98..8f9f91e98 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/tools/CommonsTraceFactory.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/CommonsTraceFactory.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/ContextBasedMatcher.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/ContextBasedMatcher.java
index fc247dc90..fc247dc90 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/tools/ContextBasedMatcher.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/ContextBasedMatcher.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/DefaultMatchingContext.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/DefaultMatchingContext.java
index fa47a87a3..fa47a87a3 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/tools/DefaultMatchingContext.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/DefaultMatchingContext.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/DefaultTrace.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/DefaultTrace.java
index 7e2ab0d8f..7e2ab0d8f 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/tools/DefaultTrace.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/DefaultTrace.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/DefaultTraceFactory.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/DefaultTraceFactory.java
index c7860589a..c7860589a 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/tools/DefaultTraceFactory.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/DefaultTraceFactory.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/FuzzyBoolean.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/FuzzyBoolean.java
index 77079c094..77079c094 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/tools/FuzzyBoolean.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/FuzzyBoolean.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/GeneratedClassHandler.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/GeneratedClassHandler.java
index 6dd4fec18..6dd4fec18 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/tools/GeneratedClassHandler.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/GeneratedClassHandler.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/ISupportsMessageContext.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/ISupportsMessageContext.java
index 69e55b143..69e55b143 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/tools/ISupportsMessageContext.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/ISupportsMessageContext.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/JoinPointMatch.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/JoinPointMatch.java
index 588b3c0bc..588b3c0bc 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/tools/JoinPointMatch.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/JoinPointMatch.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/MatchingContext.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/MatchingContext.java
index e668a30b7..e668a30b7 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/tools/MatchingContext.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/MatchingContext.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/PointcutDesignatorHandler.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/PointcutDesignatorHandler.java
index 63f4a81e2..63f4a81e2 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/tools/PointcutDesignatorHandler.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/PointcutDesignatorHandler.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/PointcutExpression.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/PointcutExpression.java
index 6b598a50c..6b598a50c 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/tools/PointcutExpression.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/PointcutExpression.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/PointcutParameter.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/PointcutParameter.java
index a0eaa108a..a0eaa108a 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/tools/PointcutParameter.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/PointcutParameter.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/PointcutParser.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/PointcutParser.java
index ca0fa3aca..ca0fa3aca 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/tools/PointcutParser.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/PointcutParser.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/PointcutPrimitive.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/PointcutPrimitive.java
index ae3f607ff..ae3f607ff 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/tools/PointcutPrimitive.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/PointcutPrimitive.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/ShadowMatch.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/ShadowMatch.java
index 55e2581df..55e2581df 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/tools/ShadowMatch.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/ShadowMatch.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/StandardPointcutExpression.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/StandardPointcutExpression.java
index 63d908bd2..63d908bd2 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/tools/StandardPointcutExpression.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/StandardPointcutExpression.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/StandardPointcutParser.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/StandardPointcutParser.java
index e549325af..e549325af 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/tools/StandardPointcutParser.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/StandardPointcutParser.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/Trace.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/Trace.java
index 8b20032aa..8b20032aa 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/tools/Trace.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/Trace.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/TraceFactory.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/TraceFactory.java
index 6d819de50..6d819de50 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/tools/TraceFactory.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/TraceFactory.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/Traceable.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/Traceable.java
index 957786e48..957786e48 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/tools/Traceable.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/Traceable.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/TypePatternMatcher.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/TypePatternMatcher.java
index be3b84025..be3b84025 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/tools/TypePatternMatcher.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/TypePatternMatcher.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/UnsupportedPointcutPrimitiveException.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/UnsupportedPointcutPrimitiveException.java
index 6e0bbd661..6e0bbd661 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/tools/UnsupportedPointcutPrimitiveException.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/UnsupportedPointcutPrimitiveException.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/tools/WeavingClassLoader.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/WeavingClassLoader.java
index 84987e19b..84987e19b 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/tools/WeavingClassLoader.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/WeavingClassLoader.java
diff --git a/org.aspectj.matcher/src/org/aspectj/weaver/weaver-messages.properties b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/weaver-messages.properties
index 2745ae9e7..2745ae9e7 100644
--- a/org.aspectj.matcher/src/org/aspectj/weaver/weaver-messages.properties
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/weaver-messages.properties
diff --git a/org.aspectj.matcher/testsrc/org/aspectj/matcher/tools/CommonAdvancedPointcutExpressionTests.java b/org.aspectj.matcher/src/test/java/org/aspectj/matcher/tools/CommonAdvancedPointcutExpressionTests.java
index 532588363..532588363 100644
--- a/org.aspectj.matcher/testsrc/org/aspectj/matcher/tools/CommonAdvancedPointcutExpressionTests.java
+++ b/org.aspectj.matcher/src/test/java/org/aspectj/matcher/tools/CommonAdvancedPointcutExpressionTests.java
diff --git a/org.aspectj.matcher/testsrc/org/aspectj/matcher/tools/CommonPointcutExpressionTests.java b/org.aspectj.matcher/src/test/java/org/aspectj/matcher/tools/CommonPointcutExpressionTests.java
index 8fccfbf99..8fccfbf99 100644
--- a/org.aspectj.matcher/testsrc/org/aspectj/matcher/tools/CommonPointcutExpressionTests.java
+++ b/org.aspectj.matcher/src/test/java/org/aspectj/matcher/tools/CommonPointcutExpressionTests.java
diff --git a/org.aspectj.matcher/testsrc/org/aspectj/matcher/tools/ReflectionWorldPointcutExpressionTests.java b/org.aspectj.matcher/src/test/java/org/aspectj/matcher/tools/ReflectionWorldPointcutExpressionTests.java
index 1a5f9be43..1a5f9be43 100644
--- a/org.aspectj.matcher/testsrc/org/aspectj/matcher/tools/ReflectionWorldPointcutExpressionTests.java
+++ b/org.aspectj.matcher/src/test/java/org/aspectj/matcher/tools/ReflectionWorldPointcutExpressionTests.java
diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/CommonWorldTests.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/CommonWorldTests.java
index ff6c56a34..ff6c56a34 100644
--- a/org.aspectj.matcher/testsrc/org/aspectj/weaver/CommonWorldTests.java
+++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/CommonWorldTests.java
diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/MatcherModuleTests.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/MatcherModuleTests.java
index 234e387de..234e387de 100644
--- a/org.aspectj.matcher/testsrc/org/aspectj/weaver/MatcherModuleTests.java
+++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/MatcherModuleTests.java
diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/TestShadow.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/TestShadow.java
index 0a5249245..0a5249245 100644
--- a/org.aspectj.matcher/testsrc/org/aspectj/weaver/TestShadow.java
+++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/TestShadow.java
diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/TestUtils.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/TestUtils.java
index ac4c46cb7..ac4c46cb7 100644
--- a/org.aspectj.matcher/testsrc/org/aspectj/weaver/TestUtils.java
+++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/TestUtils.java
diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/TypeFactoryTests.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/TypeFactoryTests.java
index 40fed411a..40fed411a 100644
--- a/org.aspectj.matcher/testsrc/org/aspectj/weaver/TypeFactoryTests.java
+++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/TypeFactoryTests.java
diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/AndOrNotTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/AndOrNotTestCase.java
index 909db8e6a..909db8e6a 100644
--- a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/AndOrNotTestCase.java
+++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/AndOrNotTestCase.java
diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/ArgsTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ArgsTestCase.java
index 705674cb3..705674cb3 100644
--- a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/ArgsTestCase.java
+++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ArgsTestCase.java
diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/BindingTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/BindingTestCase.java
index 7303191dd..7303191dd 100644
--- a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/BindingTestCase.java
+++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/BindingTestCase.java
diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/ConstantPoolSimulator.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ConstantPoolSimulator.java
index 57f971665..57f971665 100644
--- a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/ConstantPoolSimulator.java
+++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ConstantPoolSimulator.java
diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/DeclareErrorOrWarningTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/DeclareErrorOrWarningTestCase.java
index ab5f6e6f2..ab5f6e6f2 100644
--- a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/DeclareErrorOrWarningTestCase.java
+++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/DeclareErrorOrWarningTestCase.java
diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/DumpPointcutVisitor.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/DumpPointcutVisitor.java
index 665f4bdda..665f4bdda 100644
--- a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/DumpPointcutVisitor.java
+++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/DumpPointcutVisitor.java
diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/ModifiersPatternTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ModifiersPatternTestCase.java
index 265ee4b0a..265ee4b0a 100644
--- a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/ModifiersPatternTestCase.java
+++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ModifiersPatternTestCase.java
diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/NamePatternParserTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/NamePatternParserTestCase.java
index fe3b0f2d4..fe3b0f2d4 100644
--- a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/NamePatternParserTestCase.java
+++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/NamePatternParserTestCase.java
diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/NamePatternTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/NamePatternTestCase.java
index e1876cc3b..e1876cc3b 100644
--- a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/NamePatternTestCase.java
+++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/NamePatternTestCase.java
diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/ParserTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ParserTestCase.java
index 7ffad81d5..7ffad81d5 100644
--- a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/ParserTestCase.java
+++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ParserTestCase.java
diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/PatternsTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/PatternsTestCase.java
index 62a3c0566..62a3c0566 100644
--- a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/PatternsTestCase.java
+++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/PatternsTestCase.java
diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/PatternsTests.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/PatternsTests.java
index afd75eab3..afd75eab3 100644
--- a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/PatternsTests.java
+++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/PatternsTests.java
diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/PointcutRewriterTest.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/PointcutRewriterTest.java
index d2a8fd245..d2a8fd245 100644
--- a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/PointcutRewriterTest.java
+++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/PointcutRewriterTest.java
diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/SignaturePatternMatchSpeedTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/SignaturePatternMatchSpeedTestCase.java
index 52f82bfd7..52f82bfd7 100644
--- a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/SignaturePatternMatchSpeedTestCase.java
+++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/SignaturePatternMatchSpeedTestCase.java
diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/SignaturePatternTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/SignaturePatternTestCase.java
index 6c6f1f985..6c6f1f985 100644
--- a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/SignaturePatternTestCase.java
+++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/SignaturePatternTestCase.java
diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/SimpleScopeTests.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/SimpleScopeTests.java
index 8df97e2f3..8df97e2f3 100644
--- a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/SimpleScopeTests.java
+++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/SimpleScopeTests.java
diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/TestScope.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/TestScope.java
index e65bf2797..e65bf2797 100644
--- a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/TestScope.java
+++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/TestScope.java
diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/ThisOrTargetTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ThisOrTargetTestCase.java
index 6c8d70be8..6c8d70be8 100644
--- a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/ThisOrTargetTestCase.java
+++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/ThisOrTargetTestCase.java
diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/TypePatternListTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/TypePatternListTestCase.java
index a141e2b0c..a141e2b0c 100644
--- a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/TypePatternListTestCase.java
+++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/TypePatternListTestCase.java
diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/TypePatternTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/TypePatternTestCase.java
index 058bd2450..058bd2450 100644
--- a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/TypePatternTestCase.java
+++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/TypePatternTestCase.java
diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/VisitorTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/VisitorTestCase.java
index 7fd131528..7fd131528 100644
--- a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/VisitorTestCase.java
+++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/VisitorTestCase.java
diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/WithinTestCase.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/WithinTestCase.java
index b8138b067..b8138b067 100644
--- a/org.aspectj.matcher/testsrc/org/aspectj/weaver/patterns/WithinTestCase.java
+++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/patterns/WithinTestCase.java
diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/reflect/ReflectionWorldBasicTest.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/reflect/ReflectionWorldBasicTest.java
index 7325bcfc9..7325bcfc9 100644
--- a/org.aspectj.matcher/testsrc/org/aspectj/weaver/reflect/ReflectionWorldBasicTest.java
+++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/reflect/ReflectionWorldBasicTest.java
diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/reflect/ReflectionWorldSpecificTest.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/reflect/ReflectionWorldSpecificTest.java
index 1d3083602..1d3083602 100644
--- a/org.aspectj.matcher/testsrc/org/aspectj/weaver/reflect/ReflectionWorldSpecificTest.java
+++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/reflect/ReflectionWorldSpecificTest.java
diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/testcode/Aspect.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/testcode/Aspect.java
index 95140c792..95140c792 100644
--- a/org.aspectj.matcher/testsrc/org/aspectj/weaver/testcode/Aspect.java
+++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/testcode/Aspect.java
diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/testcode/Base.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/testcode/Base.java
index e580242be..e580242be 100644
--- a/org.aspectj.matcher/testsrc/org/aspectj/weaver/testcode/Base.java
+++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/testcode/Base.java
diff --git a/org.aspectj.matcher/testsrc/org/aspectj/weaver/testcode/Derived.java b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/testcode/Derived.java
index 5d616d79d..5d616d79d 100644
--- a/org.aspectj.matcher/testsrc/org/aspectj/weaver/testcode/Derived.java
+++ b/org.aspectj.matcher/src/test/java/org/aspectj/weaver/testcode/Derived.java
diff --git a/org.aspectj.matcher/testsrc/testdata/AnnotatedClass.java b/org.aspectj.matcher/src/test/java/testdata/AnnotatedClass.java
index 80dbda413..80dbda413 100644
--- a/org.aspectj.matcher/testsrc/testdata/AnnotatedClass.java
+++ b/org.aspectj.matcher/src/test/java/testdata/AnnotatedClass.java
diff --git a/org.aspectj.matcher/testsrc/testdata/MethodLevelAnnotation.java b/org.aspectj.matcher/src/test/java/testdata/MethodLevelAnnotation.java
index 2f46dd8ab..2f46dd8ab 100644
--- a/org.aspectj.matcher/testsrc/testdata/MethodLevelAnnotation.java
+++ b/org.aspectj.matcher/src/test/java/testdata/MethodLevelAnnotation.java
diff --git a/org.aspectj.matcher/testsrc/testdata/SomeAnnotation.java b/org.aspectj.matcher/src/test/java/testdata/SomeAnnotation.java
index 25a4991d6..25a4991d6 100644
--- a/org.aspectj.matcher/testsrc/testdata/SomeAnnotation.java
+++ b/org.aspectj.matcher/src/test/java/testdata/SomeAnnotation.java