Remove unnecessary interface modifiers

Signed-off-by: Lars Grefer <eclipse@larsgrefer.de>

22 files changed, 388 insertions, 388 deletions

diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationAJ.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationAJ.java
index 311b12e1f..a5199164f 100644
--- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationAJ.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/AnnotationAJ.java
@@ -1,11 +1,11 @@
 /* *******************************************************************
  * Copyright (c) 2006-2008 Contributors
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- *  
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
  * ******************************************************************/
 package org.aspectj.weaver;
 
@@ -13,90 +13,90 @@ import java.util.Set;
 
 /**
  * Simple representation of an annotation that the weaver can work with.
- * 
+ *
  * @author AndyClement
  */
 public interface AnnotationAJ {
 
-	public static final AnnotationAJ[] EMPTY_ARRAY = new AnnotationAJ[0];
+	AnnotationAJ[] EMPTY_ARRAY = new AnnotationAJ[0];
 
 	/**
 	 * @return the signature for the annotation type, eg. Lcom/foo/MyAnno;
 	 */
-	public String getTypeSignature();
+	String getTypeSignature();
 
 	/**
 	 * @return the type name for the annotation, eg. com.foo.MyAnno
 	 */
-	public String getTypeName();
+	String getTypeName();
 
 	/**
 	 * @return the type of the annotation
 	 */
-	public ResolvedType getType();
+	ResolvedType getType();
 
 	/**
 	 * return true if this annotation can target an annotation type
 	 */
-	public boolean allowedOnAnnotationType();
+	boolean allowedOnAnnotationType();
 
 	/**
 	 * @return true if this annotation can be put on a field
 	 */
-	public boolean allowedOnField();
+	boolean allowedOnField();
 
 	/**
 	 * @return true if this annotation can target a 'regular' type. A 'regular' type is enum/class/interface - it is *not*
 	 *         annotation.
 	 */
-	public boolean allowedOnRegularType();
+	boolean allowedOnRegularType();
 
 	/**
 	 * @return for the @target annotation, this will return a set of the element-types it can be applied to. For other annotations ,
 	 *         it returns the empty set.
 	 */
-	public Set<String> getTargets();
+	Set<String> getTargets();
 
 	/**
 	 * @param name the name of the value
 	 * @return true if there is a value with that name
 	 */
-	public boolean hasNamedValue(String name);
+	boolean hasNamedValue(String name);
 
 	/**
 	 * @param name the name of the annotation field
 	 * @param value the value of the annotation field
 	 * @return true if there is a value with the specified name and value
 	 */
-	public boolean hasNameValuePair(String name, String value);
+	boolean hasNameValuePair(String name, String value);
 
 	/**
 	 * @return String representation of the valid targets for this annotation, eg. "{TYPE,FIELD}"
 	 */
-	public String getValidTargets();
+	String getValidTargets();
 
 	/**
 	 * @return String form of the annotation and any values, eg. @Foo(a=b,c=d)
 	 */
-	public String stringify();
+	String stringify();
 
 	/**
 	 * @return true if this annotation is marked with @target
 	 */
-	public boolean specifiesTarget();
+	boolean specifiesTarget();
 
 	/**
 	 * @return true if the annotation is marked for runtime visibility
 	 */
-	public boolean isRuntimeVisible();
+	boolean isRuntimeVisible();
 
 	/**
 	 * Determine the string representation of the value of a field. For example in @SuppressAjWarnings({"adviceDidNotMatch"}) the
 	 * return value for getStringFormOfValue("value") would be "[adviceDidNotMatch]".
-	 * 
+	 *
 	 * @param name the name of the annotation field being looked up
 	 * @return string representation of the value of that field, may be null if no such field set
 	 */
-	public String getStringFormOfValue(String name);
+	String getStringFormOfValue(String name);
 
 }
diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Constants.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Constants.java
index bdbde3853..6e99e33fa 100644
--- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Constants.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Constants.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2004 IBM 
+ * Copyright (c) 2004 IBM
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -12,18 +12,18 @@ package org.aspectj.weaver;
 
 /**
  * Some useful weaver constants.
- * 
+ *
  * Current uses: 1. Holds values that are necessary for working with 1.5 code but which don't exist in a 1.4 world.
  */
 public interface Constants {
 
-	public final static int ACC_BRIDGE = 0x0040;
-	public final static int ACC_VARARGS = 0x0080;
+	int ACC_BRIDGE = 0x0040;
+	int ACC_VARARGS = 0x0080;
 
-	public final static String RUNTIME_LEVEL_12 = "1.2";
-	public final static String RUNTIME_LEVEL_15 = "1.5";
-	public final static String RUNTIME_LEVEL_19 = "1.9";
+	String RUNTIME_LEVEL_12 = "1.2";
+	String RUNTIME_LEVEL_15 = "1.5";
+	String RUNTIME_LEVEL_19 = "1.9";
 
 	// Default for 1.5.0
-	public final static String RUNTIME_LEVEL_DEFAULT = RUNTIME_LEVEL_15;
+	String RUNTIME_LEVEL_DEFAULT = RUNTIME_LEVEL_15;
 }
diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/CustomMungerFactory.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/CustomMungerFactory.java
index 91bcbdf6b..f11e02451 100644
--- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/CustomMungerFactory.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/CustomMungerFactory.java
@@ -1,12 +1,12 @@
 /* *******************************************************************
  * Copyright (c) 2007 Contributors
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: 
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
  *     Linton Ye https://bugs.eclipse.org/bugs/show_bug.cgi?id=193065
  * ******************************************************************/
 
@@ -28,9 +28,9 @@ import java.util.Collection;
  * weaver and participate the weaving process. For example, the match method of each custom shadow munger will be called against
  * each shadow.
  * </p>
- * 
+ *
  * @author lintonye
- * 
+ *
  */
 public interface CustomMungerFactory {
 
@@ -38,15 +38,15 @@ public interface CustomMungerFactory {
 	 * @param aspectType
 	 * @return a Collection&lt;ShadowMunger&gt; of custom shadow mungers for the given aspect
 	 */
-	public Collection<ShadowMunger> createCustomShadowMungers(ResolvedType aspectType);
+	Collection<ShadowMunger> createCustomShadowMungers(ResolvedType aspectType);
 
 	/**
 	 * @param aspectType
 	 * @return a Collection&lt;ConcreteTypeMunger&gt; of custom type mungers for the given aspect
 	 */
-	public Collection<ConcreteTypeMunger> createCustomTypeMungers(ResolvedType aspectType);
+	Collection<ConcreteTypeMunger> createCustomTypeMungers(ResolvedType aspectType);
 
-	public Collection<ShadowMunger> getAllCreatedCustomShadowMungers();
+	Collection<ShadowMunger> getAllCreatedCustomShadowMungers();
 
-	public Collection<ConcreteTypeMunger> getAllCreatedCustomTypeMungers();
+	Collection<ConcreteTypeMunger> getAllCreatedCustomTypeMungers();
 }
diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Dump.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Dump.java
index b177d7ec6..e6c4274e5 100644
--- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Dump.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Dump.java
@@ -1,12 +1,12 @@
 /* *******************************************************************
  * Copyright (c) 2004,2010 Contributors
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: 
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
  *     Matthew Webster, IBM
  * ******************************************************************/
 package org.aspectj.weaver;
@@ -505,15 +505,15 @@ public class Dump {
 
 	public interface INode {
 
-		public void accept(IVisitor visior);
+		void accept(IVisitor visior);
 
 	}
 
 	public interface IVisitor {
 
-		public void visitObject(Object s);
+		void visitObject(Object s);
 
-		public void visitList(List list);
+		void visitList(List list);
 	}
 
 }
diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IEclipseSourceContext.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IEclipseSourceContext.java
index d691c503d..95615d13a 100644
--- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IEclipseSourceContext.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IEclipseSourceContext.java
@@ -1,15 +1,15 @@
 /********************************************************************
- * Copyright (c) 2006 Contributors. All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: IBM Corporation - initial API and implementation 
+ * Copyright (c) 2006 Contributors. All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://eclipse.org/legal/epl-v10.html
+ *
+ * Contributors: IBM Corporation - initial API and implementation
  * 				 Helen Hawkins   - iniital version
  *******************************************************************/
 package org.aspectj.weaver;
 
 public interface IEclipseSourceContext extends ISourceContext {
-	public void removeUnnecessaryProblems(Member method, int problemLineNumber);
+	void removeUnnecessaryProblems(Member method, int problemLineNumber);
 }
diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ISourceContext.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ISourceContext.java
index 0f2f0aba1..5af15d6f5 100644
--- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ISourceContext.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ISourceContext.java
@@ -1,13 +1,13 @@
 /* *******************************************************************
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: 
- *     PARC     initial implementation 
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     PARC     initial implementation
  * ******************************************************************/
 
 package org.aspectj.weaver;
@@ -15,11 +15,11 @@ package org.aspectj.weaver;
 import org.aspectj.bridge.ISourceLocation;
 
 public interface ISourceContext {
-	public ISourceLocation makeSourceLocation(IHasPosition position);
+	ISourceLocation makeSourceLocation(IHasPosition position);
 
-	public ISourceLocation makeSourceLocation(int line, int offset);
+	ISourceLocation makeSourceLocation(int line, int offset);
 
-	public int getOffset();
+	int getOffset();
 
-	public void tidy();
+	void tidy();
 }
diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IWeavingSupport.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IWeavingSupport.java
index 3f259c66c..5fe48a520 100644
--- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IWeavingSupport.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/IWeavingSupport.java
@@ -1,13 +1,13 @@
 /* *******************************************************************
  * Copyright (c) 2008 Contributors
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: 
- *     Andy Clement     initial implementation 
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Andy Clement     initial implementation
  * ******************************************************************/
 package org.aspectj.weaver;
 
@@ -18,28 +18,28 @@ import org.aspectj.weaver.patterns.Pointcut;
 /**
  * Encapsulates operations that a world will need to support if it is actually going to modify bytecode rather than just match
  * against it. {@see BcelWeavingSupport}
- * 
+ *
  * @author Andy Clement
  */
 public interface IWeavingSupport {
 
-	public Advice createAdviceMunger(AjAttribute.AdviceAttribute attribute, Pointcut pointcut, Member signature,
-			ResolvedType concreteAspect);
+	Advice createAdviceMunger(AjAttribute.AdviceAttribute attribute, Pointcut pointcut, Member signature,
+							  ResolvedType concreteAspect);
 
-	public abstract ConcreteTypeMunger makeCflowStackFieldAdder(ResolvedMember cflowField);
+	ConcreteTypeMunger makeCflowStackFieldAdder(ResolvedMember cflowField);
 
-	public abstract ConcreteTypeMunger makeCflowCounterFieldAdder(ResolvedMember cflowField);
+	ConcreteTypeMunger makeCflowCounterFieldAdder(ResolvedMember cflowField);
 
 	/**
 	 * Register a munger for perclause @AJ aspect so that we add aspectOf(..) to them as needed
-	 * 
+	 *
 	 * @see org.aspectj.weaver.bcel.BcelWorld#makePerClauseAspect(ResolvedType, org.aspectj.weaver.patterns.PerClause.Kind)
 	 */
-	public abstract ConcreteTypeMunger makePerClauseAspect(ResolvedType aspect, PerClause.Kind kind);
+	ConcreteTypeMunger makePerClauseAspect(ResolvedType aspect, PerClause.Kind kind);
 
-	public abstract ConcreteTypeMunger concreteTypeMunger(ResolvedTypeMunger munger, ResolvedType aspectType);
+	ConcreteTypeMunger concreteTypeMunger(ResolvedTypeMunger munger, ResolvedType aspectType);
 
-	public ConcreteTypeMunger createAccessForInlineMunger(ResolvedType inAspect);
+	ConcreteTypeMunger createAccessForInlineMunger(ResolvedType inAspect);
 
-	public Var makeCflowAccessVar(ResolvedType formalType, Member cflowField, int arrayIndex);
+	Var makeCflowAccessVar(ResolvedType formalType, Member cflowField, int arrayIndex);
 }
diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Member.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Member.java
index 8134e8df2..c11dad556 100644
--- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Member.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/Member.java
@@ -1,10 +1,10 @@
 /* *******************************************************************
  * Copyright (c) 2002-2010
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
  * ******************************************************************/
 package org.aspectj.weaver;
 
@@ -12,82 +12,82 @@ import java.util.Collection;
 
 /**
  * Abstract representation of a member (field/constructor/method) within a type.
- * 
+ *
  * @author PARC
  * @author Adrian Colyer
  * @author Andy Clement
  */
 public interface Member extends Comparable<Member> {
 
-	public static final Member[] NONE = new Member[0];
+	Member[] NONE = new Member[0];
 
-	public static final MemberKind METHOD = new MemberKind("METHOD", 1);
-	public static final MemberKind FIELD = new MemberKind("FIELD", 2);
-	public static final MemberKind CONSTRUCTOR = new MemberKind("CONSTRUCTOR", 3);
-	public static final MemberKind STATIC_INITIALIZATION = new MemberKind("STATIC_INITIALIZATION", 4);
-	public static final MemberKind POINTCUT = new MemberKind("POINTCUT", 5);
-	public static final MemberKind ADVICE = new MemberKind("ADVICE", 6);
-	public static final MemberKind HANDLER = new MemberKind("HANDLER", 7);
-	public static final MemberKind MONITORENTER = new MemberKind("MONITORENTER", 8);
-	public static final MemberKind MONITOREXIT = new MemberKind("MONITOREXIT", 9);
+	MemberKind METHOD = new MemberKind("METHOD", 1);
+	MemberKind FIELD = new MemberKind("FIELD", 2);
+	MemberKind CONSTRUCTOR = new MemberKind("CONSTRUCTOR", 3);
+	MemberKind STATIC_INITIALIZATION = new MemberKind("STATIC_INITIALIZATION", 4);
+	MemberKind POINTCUT = new MemberKind("POINTCUT", 5);
+	MemberKind ADVICE = new MemberKind("ADVICE", 6);
+	MemberKind HANDLER = new MemberKind("HANDLER", 7);
+	MemberKind MONITORENTER = new MemberKind("MONITORENTER", 8);
+	MemberKind MONITOREXIT = new MemberKind("MONITOREXIT", 9);
 
-	public static final AnnotationAJ[][] NO_PARAMETER_ANNOTATIONXS = new AnnotationAJ[][] {};
-	public static final ResolvedType[][] NO_PARAMETER_ANNOTATION_TYPES = new ResolvedType[][] {};
+	AnnotationAJ[][] NO_PARAMETER_ANNOTATIONXS = new AnnotationAJ[][] {};
+	ResolvedType[][] NO_PARAMETER_ANNOTATION_TYPES = new ResolvedType[][] {};
 
 	/**
 	 * @return the kind of member from those listed as MemberKind instances
 	 */
-	public MemberKind getKind();
+	MemberKind getKind();
 
-	public String getName();
+	String getName();
 
-	public UnresolvedType getDeclaringType();
+	UnresolvedType getDeclaringType();
 
-	public UnresolvedType[] getParameterTypes();
+	UnresolvedType[] getParameterTypes();
 
-	public UnresolvedType[] getGenericParameterTypes();
+	UnresolvedType[] getGenericParameterTypes();
 
-	public UnresolvedType getType();
+	UnresolvedType getType();
 
-	public UnresolvedType getReturnType();
+	UnresolvedType getReturnType();
 
-	public UnresolvedType getGenericReturnType();
+	UnresolvedType getGenericReturnType();
 
 	/**
 	 * Return full signature, including return type, e.g. "()LFastCar;". For a signature without the return type, use
 	 * getParameterSignature() - it is important to choose the right one in the face of covariance.
 	 */
-	public String getSignature();
+	String getSignature();
 
-	public JoinPointSignatureIterator getJoinPointSignatures(World world);
+	JoinPointSignatureIterator getJoinPointSignatures(World world);
 
-	public int getArity();
+	int getArity();
 
 	/**
 	 * Return signature without return type, e.g. "()" for a signature *with* the return type, use getSignature() - it is important
 	 * to choose the right one in the face of covariance.
 	 */
-	public String getParameterSignature();
+	String getParameterSignature();
 
-	public int getModifiers(World world);
+	int getModifiers(World world);
 
-	public int getModifiers();
+	int getModifiers();
 
 	/**
 	 * Returns true iff the member is generic (NOT parameterized)
 	 */
-	public boolean canBeParameterized();
+	boolean canBeParameterized();
 
-	public AnnotationAJ[] getAnnotations();
+	AnnotationAJ[] getAnnotations();
 
-	public Collection<ResolvedType> getDeclaringTypes(World world);
+	Collection<ResolvedType> getDeclaringTypes(World world);
 
-	public String[] getParameterNames(World world);
+	String[] getParameterNames(World world);
 
-	public UnresolvedType[] getExceptions(World world);
+	UnresolvedType[] getExceptions(World world);
 
-	public ResolvedMember resolve(World world);
+	ResolvedMember resolve(World world);
 
-	public int compareTo(Member other);
+	int compareTo(Member other);
 
-}
\ No newline at end of file
+}
diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ReferenceTypeDelegate.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ReferenceTypeDelegate.java
index e07c032e6..3dcea23b9 100644
--- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ReferenceTypeDelegate.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ReferenceTypeDelegate.java
@@ -1,13 +1,13 @@
 /* *******************************************************************
  * Copyright (c) 2002 Contributors
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: 
- *     PARC     initial implementation 
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     PARC     initial implementation
  *     Andy Clement - June 2005 - separated out from ResolvedType
  * ******************************************************************/
 package org.aspectj.weaver;
@@ -25,124 +25,124 @@ import org.aspectj.weaver.patterns.PerClause;
 
 public interface ReferenceTypeDelegate {
 
-	public boolean isAspect();
+	boolean isAspect();
 
 	/**
 	 * @return true if the type is an annotation style aspect (a type marked @Aspect)
 	 */
-	public boolean isAnnotationStyleAspect();
+	boolean isAnnotationStyleAspect();
 
-	public boolean isInterface();
+	boolean isInterface();
 
-	public boolean isEnum();
+	boolean isEnum();
 
-	public boolean isAnnotation();
+	boolean isAnnotation();
 
-	public String getRetentionPolicy();
+	String getRetentionPolicy();
 
 	/**
 	 * @return true if this annotation type can be on a regular type (ie. it doesn't specify anything or it specifies TYPE)
 	 */
-	public boolean canAnnotationTargetType();
+	boolean canAnnotationTargetType();
 
 	/**
 	 * @return all the possible targets that this annotation can be placed upon
 	 */
-	public AnnotationTargetKind[] getAnnotationTargetKinds();
+	AnnotationTargetKind[] getAnnotationTargetKinds();
 
 	/**
 	 * @return true if this annotation type has a retention policy of RUNTIME
 	 */
-	public boolean isAnnotationWithRuntimeRetention();
+	boolean isAnnotationWithRuntimeRetention();
 
-	public boolean isClass();
+	boolean isClass();
 
-	public boolean isGeneric();
+	boolean isGeneric();
 
-	public boolean isAnonymous();
+	boolean isAnonymous();
 
 	/**
 	 * @return true if this class is nested (this includes: member classes, local classes, anonymous classes)
 	 */
-	public boolean isNested();
+	boolean isNested();
 
-	public boolean hasAnnotation(UnresolvedType ofType);
+	boolean hasAnnotation(UnresolvedType ofType);
 
-	public AnnotationAJ[] getAnnotations();
+	AnnotationAJ[] getAnnotations();
 
-	public ResolvedType[] getAnnotationTypes();
+	ResolvedType[] getAnnotationTypes();
 
-	public ResolvedMember[] getDeclaredFields();
+	ResolvedMember[] getDeclaredFields();
 
-	public ResolvedType[] getDeclaredInterfaces();
+	ResolvedType[] getDeclaredInterfaces();
 
-	public ResolvedMember[] getDeclaredMethods();
+	ResolvedMember[] getDeclaredMethods();
 
-	public ResolvedMember[] getDeclaredPointcuts();
+	ResolvedMember[] getDeclaredPointcuts();
 
-	public TypeVariable[] getTypeVariables();
+	TypeVariable[] getTypeVariables();
 
-	public int getModifiers();
+	int getModifiers();
 
 	// aspect declaration related members
 	/**
 	 * @return for an aspect declaration, return the
 	 */
-	public PerClause getPerClause();
+	PerClause getPerClause();
 
-	public Collection<Declare> getDeclares();
+	Collection<Declare> getDeclares();
 
-	public Collection<ConcreteTypeMunger> getTypeMungers();
+	Collection<ConcreteTypeMunger> getTypeMungers();
 
-	public Collection<ResolvedMember> getPrivilegedAccesses();
+	Collection<ResolvedMember> getPrivilegedAccesses();
 
 	// end of aspect declaration related members
 
-	public ResolvedType getSuperclass();
+	ResolvedType getSuperclass();
 
-	public WeaverStateInfo getWeaverState();
+	WeaverStateInfo getWeaverState();
 
-	public ReferenceType getResolvedTypeX();
+	ReferenceType getResolvedTypeX();
 
 	// needs renaming isWeavable or removing from here
-	public boolean isExposedToWeaver();
+	boolean isExposedToWeaver();
 
-	public boolean doesNotExposeShadowMungers();
+	boolean doesNotExposeShadowMungers();
 
-	public ISourceContext getSourceContext();
+	ISourceContext getSourceContext();
 
-	public String getSourcefilename();
+	String getSourcefilename();
 
-	public String getDeclaredGenericSignature();
+	String getDeclaredGenericSignature();
 
-	public ResolvedType getOuterClass();
+	ResolvedType getOuterClass();
 
-	public boolean copySourceContext();
+	boolean copySourceContext();
 
 	/**
 	 * TODO Caching of methods besides getDeclaredInterfaces() may also be dependent on this flag - which?
-	 * 
+	 *
 	 * @return true if something the result of getDeclaredInterfaces() can be cached by the caller
 	 */
-	public boolean isCacheable();
+	boolean isCacheable();
 
 	/**
 	 * If known, return the compiler/weaver version used to build this delegate. Default is the most recent level as specified in
 	 * {@link WeaverVersionInfo}.
-	 * 
+	 *
 	 * @return the major version
 	 */
-	public int getCompilerVersion();
+	int getCompilerVersion();
 
 	/**
 	 * Implementations need to clear state
 	 */
-	public void ensureConsistent();
+	void ensureConsistent();
 
-	public boolean isWeavable();
+	boolean isWeavable();
 
-	public boolean hasBeenWoven();
+	boolean hasBeenWoven();
 
-	public boolean hasAnnotations();
+	boolean hasAnnotations();
 
-}
\ No newline at end of file
+}
diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedMember.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedMember.java
index 0b5def29a..39ab054b2 100644
--- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedMember.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/ResolvedMember.java
@@ -1,15 +1,15 @@
 /* *******************************************************************
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
  *               2005 Contributors
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: 
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
  *     PARC     initial implementation
- *     AMC      extracted as interface 
+ *     AMC      extracted as interface
  * ******************************************************************/
 package org.aspectj.weaver;
 
@@ -21,138 +21,138 @@ import org.aspectj.bridge.ISourceLocation;
 
 public interface ResolvedMember extends Member, AnnotatedElement, TypeVariableDeclaringElement {
 
-	public static final ResolvedMember[] NONE = new ResolvedMember[0];
+	ResolvedMember[] NONE = new ResolvedMember[0];
 
-	public int getModifiers(World world);
+	int getModifiers(World world);
 
-	public int getModifiers();
+	int getModifiers();
 
-	public UnresolvedType[] getExceptions(World world);
+	UnresolvedType[] getExceptions(World world);
 
-	public UnresolvedType[] getExceptions();
+	UnresolvedType[] getExceptions();
 
-	public ShadowMunger getAssociatedShadowMunger();
+	ShadowMunger getAssociatedShadowMunger();
 
-	public boolean isAjSynthetic();
+	boolean isAjSynthetic();
 
-	public boolean isCompatibleWith(Member am);
+	boolean isCompatibleWith(Member am);
 
-	public boolean hasAnnotation(UnresolvedType ofType);
+	boolean hasAnnotation(UnresolvedType ofType);
 
-	public AnnotationAJ[] getAnnotations();
+	AnnotationAJ[] getAnnotations();
 
-	public ResolvedType[] getAnnotationTypes();
+	ResolvedType[] getAnnotationTypes();
 
-	public void setAnnotationTypes(ResolvedType[] annotationtypes);
+	void setAnnotationTypes(ResolvedType[] annotationtypes);
 
-	public void addAnnotation(AnnotationAJ annotation);
+	void addAnnotation(AnnotationAJ annotation);
 
-	public boolean isBridgeMethod();
+	boolean isBridgeMethod();
 
-	public boolean isVarargsMethod();
+	boolean isVarargsMethod();
 
-	public boolean isSynthetic();
+	boolean isSynthetic();
 
-	public void write(CompressingDataOutputStream s) throws IOException;
+	void write(CompressingDataOutputStream s) throws IOException;
 
-	public ISourceContext getSourceContext(World world);
+	ISourceContext getSourceContext(World world);
 
-	public String[] getParameterNames();
+	String[] getParameterNames();
 
-	public void setParameterNames(String[] names);
+	void setParameterNames(String[] names);
 
-	public AnnotationAJ[][] getParameterAnnotations();
+	AnnotationAJ[][] getParameterAnnotations();
 
-	public ResolvedType[][] getParameterAnnotationTypes();
+	ResolvedType[][] getParameterAnnotationTypes();
 
-	public String getAnnotationDefaultValue();
+	String getAnnotationDefaultValue();
 
-	public String getParameterSignatureErased();
+	String getParameterSignatureErased();
 
-	public String getSignatureErased();
+	String getSignatureErased();
 
-	public String[] getParameterNames(World world);
+	String[] getParameterNames(World world);
 
-	public AjAttribute.EffectiveSignatureAttribute getEffectiveSignature();
+	AjAttribute.EffectiveSignatureAttribute getEffectiveSignature();
 
-	public ISourceLocation getSourceLocation();
+	ISourceLocation getSourceLocation();
 
-	public int getStart();
+	int getStart();
 
-	public int getEnd();
+	int getEnd();
 
-	public ISourceContext getSourceContext();
+	ISourceContext getSourceContext();
 
-	public void setPosition(int sourceStart, int sourceEnd);
+	void setPosition(int sourceStart, int sourceEnd);
 
-	public void setSourceContext(ISourceContext sourceContext);
+	void setSourceContext(ISourceContext sourceContext);
 
-	public boolean isAbstract();
+	boolean isAbstract();
 
-	public boolean isPublic();
+	boolean isPublic();
 
-	public boolean isDefault();
+	boolean isDefault();
 
-	public boolean isVisible(ResolvedType fromType);
+	boolean isVisible(ResolvedType fromType);
 
-	public void setCheckedExceptions(UnresolvedType[] checkedExceptions);
+	void setCheckedExceptions(UnresolvedType[] checkedExceptions);
 
-	public void setAnnotatedElsewhere(boolean b);
+	void setAnnotatedElsewhere(boolean b);
 
-	public boolean isAnnotatedElsewhere();
+	boolean isAnnotatedElsewhere();
 
 	// like toString but include generic signature info
-	public String toGenericString();
+	String toGenericString();
 
-	public String toDebugString();
+	String toDebugString();
 
-	public boolean hasBackingGenericMember();
+	boolean hasBackingGenericMember();
 
-	public ResolvedMember getBackingGenericMember();
+	ResolvedMember getBackingGenericMember();
 
 	/**
 	 * Get the UnresolvedType for the return type, taking generic signature into account
 	 */
-	public UnresolvedType getGenericReturnType();
+	UnresolvedType getGenericReturnType();
 
 	/**
 	 * Get the TypeXs of the parameter types, taking generic signature into account
 	 */
-	public UnresolvedType[] getGenericParameterTypes();
+	UnresolvedType[] getGenericParameterTypes();
 
-	public boolean equalsApartFromDeclaringType(Object other);
+	boolean equalsApartFromDeclaringType(Object other);
 
 	// return a resolved member in which all type variables in the signature of
 	// this member have been replaced with the given bindings. the isParameterized flag tells us whether we are creating a raw type
 	// version or not
 	// if isParameterized List<T> will turn into List<String> (for example),
 	// but if !isParameterized List<T> will turn into List.
-	public ResolvedMemberImpl parameterizedWith(UnresolvedType[] typeParameters, ResolvedType newDeclaringType,
-			boolean isParameterized);
+	ResolvedMemberImpl parameterizedWith(UnresolvedType[] typeParameters, ResolvedType newDeclaringType,
+										 boolean isParameterized);
 
 	// this variant allows for aliases for type variables (i.e. allowing them to
 	// have another name)
 	// this is used for processing ITDs that share type variables with their
 	// target generic type
-	public ResolvedMemberImpl parameterizedWith(UnresolvedType[] typeParameters, ResolvedType newDeclaringType,
-			boolean isParameterized, List<String> aliases);
+	ResolvedMemberImpl parameterizedWith(UnresolvedType[] typeParameters, ResolvedType newDeclaringType,
+										 boolean isParameterized, List<String> aliases);
 
-	public void setTypeVariables(TypeVariable[] types);
+	void setTypeVariables(TypeVariable[] types);
 
-	public TypeVariable[] getTypeVariables();
+	TypeVariable[] getTypeVariables();
 
 	/**
 	 * Returns true if this member matches the other. The matching takes into account name and parameter types only. When comparing
 	 * parameter types, we allow any type variable to match any other type variable regardless of bounds.
 	 */
-	public boolean matches(ResolvedMember aCandidateMatch, boolean ignoreGenerics);
+	boolean matches(ResolvedMember aCandidateMatch, boolean ignoreGenerics);
 
-	public void evictWeavingState();
+	void evictWeavingState();
 
-	public ResolvedMember parameterizedWith(Map<String, UnresolvedType> m, World w);
+	ResolvedMember parameterizedWith(Map<String, UnresolvedType> m, World w);
 
-	public boolean isDefaultConstructor();
+	boolean isDefaultConstructor();
 
-	public void setAnnotations(AnnotationAJ[] annotations);
+	void setAnnotations(AnnotationAJ[] annotations);
 
-}
\ No newline at end of file
+}
diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeVariableDeclaringElement.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeVariableDeclaringElement.java
index ae41fd09c..a8729bae5 100644
--- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeVariableDeclaringElement.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/TypeVariableDeclaringElement.java
@@ -1,12 +1,12 @@
 /* *******************************************************************
  * Copyright (c) 2005 Contributors.
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: 
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
  *   Andy Clement			Initial implementation
  * ******************************************************************/
 
@@ -17,5 +17,5 @@ package org.aspectj.weaver;
  * declaring element
  */
 public interface TypeVariableDeclaringElement {
-	public TypeVariable getTypeVariableNamed(String name);
+	TypeVariable getTypeVariableNamed(String name);
 }
diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/IToken.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/IToken.java
index aa925fd69..824bc602f 100644
--- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/IToken.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/IToken.java
@@ -1,13 +1,13 @@
 /* *******************************************************************
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: 
- *     PARC     initial implementation 
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     PARC     initial implementation
  * ******************************************************************/
 
 
@@ -16,38 +16,38 @@ package org.aspectj.weaver.patterns;
 import org.aspectj.weaver.IHasPosition;
 
 public interface IToken extends IHasPosition {
-	public static final IToken EOF = BasicToken.makeOperator("<eof>", 0, 0);
-	
+	IToken EOF = BasicToken.makeOperator("<eof>", 0, 0);
+
 	/**
 	 * Returns the string value of this token.
-	 * 
+	 *
 	 * If isIdentifier is false, then this string must be intern'd
 	 * so that == matching can be used.
-	 * 
+	 *
 	 * If isIdentifier is true, interning is not required.
 	 */
-    public String getString();
-    
+	String getString();
+
     /**
      * Whether this should be treated as a token or a generic identifier
      */
-    public boolean isIdentifier();
-    
+	boolean isIdentifier();
+
     /**
      * Whether this should be treated as a literal value
-     * 
+     *
      * Kinds == "string", ???
-     * 
+     *
      * returns null if this isn't a literal
      */
-    public String getLiteralKind();
-    
-    
+	String getLiteralKind();
+
+
     /**
      * If this token represents a pre-parsed Pointcut, then return it;
      * otherwise returns null.
-     * 
+     *
      * Needed for the implementation of 'if'
      */
-    public Pointcut maybeGetParsedPointcut();
+	Pointcut maybeGetParsedPointcut();
 }
diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ITokenSource.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ITokenSource.java
index 4649b046f..577c97b2c 100644
--- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ITokenSource.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/ITokenSource.java
@@ -1,13 +1,13 @@
 /* *******************************************************************
  * Copyright (c) 2002 Palo Alto Research Center, Incorporated (PARC).
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: 
- *     PARC     initial implementation 
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     PARC     initial implementation
  * ******************************************************************/
 
 
@@ -17,11 +17,11 @@ import org.aspectj.weaver.ISourceContext;
 
 
 public interface ITokenSource {
-	public IToken next();
-	public IToken peek();
-	public IToken peek(int offset);
-	public int getIndex();
-	public void setIndex(int newIndex);
-	public ISourceContext getSourceContext();
-	public boolean hasMoreTokens();
+	IToken next();
+	IToken peek();
+	IToken peek(int offset);
+	int getIndex();
+	void setIndex(int newIndex);
+	ISourceContext getSourceContext();
+	boolean hasMoreTokens();
 }
diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/IVerificationRequired.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/IVerificationRequired.java
index f1ce19eff..4247f6714 100644
--- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/IVerificationRequired.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/patterns/IVerificationRequired.java
@@ -1,13 +1,13 @@
 /* *******************************************************************
  * Copyright (c) 2006 Contributors
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: 
- *     Andy Clement IBM     initial implementation 
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Andy Clement IBM     initial implementation
  * ******************************************************************/
 package org.aspectj.weaver.patterns;
 
@@ -18,5 +18,5 @@ package org.aspectj.weaver.patterns;
  * @see WildTypePattern.VerifyBoundsForTypePattern
  */
 public interface IVerificationRequired {
-	public void verify();
-}
\ No newline at end of file
+	void verify();
+}
diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/AnnotationFinder.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/AnnotationFinder.java
index 90ce368d9..040d73d49 100644
--- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/AnnotationFinder.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/AnnotationFinder.java
@@ -1,12 +1,12 @@
 /* *******************************************************************
  * Copyright (c) 2005, 2017 Contributors.
- * 
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://eclipse.org/legal/epl-v10.html 
- *  
+ *
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://eclipse.org/legal/epl-v10.html
+ *
  * ******************************************************************/
 package org.aspectj.weaver.reflect;
 
@@ -31,9 +31,9 @@ public interface AnnotationFinder {
 
 	Object getAnnotationFromMember(ResolvedType annotationType, Member aMember);
 
-	public AnnotationAJ getAnnotationOfType(UnresolvedType ofType, Member onMember);
+	AnnotationAJ getAnnotationOfType(UnresolvedType ofType, Member onMember);
 
-	public String getAnnotationDefaultValue(Member onMember);
+	String getAnnotationDefaultValue(Member onMember);
 
 	Object getAnnotationFromClass(ResolvedType annotationType, Class<?> aClass);
 
diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/IReflectionWorld.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/IReflectionWorld.java
index 60d90d357..e835c4664 100644
--- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/IReflectionWorld.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/reflect/IReflectionWorld.java
@@ -1,19 +1,19 @@
 /* *******************************************************************
  * Copyright (c) 2005 Contributors
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: 
- *    Ron Bodkin     initial implementation 
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Ron Bodkin     initial implementation
  * ******************************************************************/
  package org.aspectj.weaver.reflect;
 
 import org.aspectj.weaver.ResolvedType;
 
 public interface IReflectionWorld {
-	public AnnotationFinder getAnnotationFinder();
-	public ResolvedType resolve(Class aClass);
+	AnnotationFinder getAnnotationFinder();
+	ResolvedType resolve(Class aClass);
 }
diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/GeneratedClassHandler.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/GeneratedClassHandler.java
index 6dd4fec18..97fc994b3 100644
--- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/GeneratedClassHandler.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/GeneratedClassHandler.java
@@ -1,14 +1,14 @@
 /* *******************************************************************
  * Copyright (c) 2004 IBM Corporation
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: 
- *     Matthew Webster, Adrian Colyer, 
- *     Martin Lippert     initial implementation 
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Matthew Webster, Adrian Colyer,
+ *     Martin Lippert     initial implementation
  * ******************************************************************/
 package org.aspectj.weaver.tools;
 
@@ -17,7 +17,7 @@ package org.aspectj.weaver.tools;
  * the weaving process to be defined.
  */
 public interface GeneratedClassHandler {
-	
+
 	/**
 	 * Accept class generated by WeavingAdaptor. The class loader should store
 	 * the class definition in its local cache until called upon to load it.
@@ -25,6 +25,6 @@ public interface GeneratedClassHandler {
 	 * @param originalBytes original class bytes
 	 * @param weavedBytes woven class bytes
 	 */
-	public void acceptClass (String name, byte[] originalBytes, byte[] weavedBytes);
+	void acceptClass(String name, byte[] originalBytes, byte[] weavedBytes);
 
 }
diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/ISupportsMessageContext.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/ISupportsMessageContext.java
index 69e55b143..2201964e4 100644
--- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/ISupportsMessageContext.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/ISupportsMessageContext.java
@@ -1,10 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
+ * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *     Matthew Webster - initial implementation
  *******************************************************************************/
@@ -14,5 +14,5 @@ import org.aspectj.bridge.IMessageContext;
 
 public interface ISupportsMessageContext {
 
-	public void setMessageContext (IMessageContext messageContext);
+	void setMessageContext(IMessageContext messageContext);
 }
diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/Trace.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/Trace.java
index 8b20032aa..c0ce182a2 100644
--- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/Trace.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/Trace.java
@@ -1,10 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
+ * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *     Matthew Webster - initial implementation
  *******************************************************************************/
@@ -12,47 +12,47 @@ package org.aspectj.weaver.tools;
 
 public interface Trace {
 
-	public void enter(String methodName, Object thiz, Object[] args);
+	void enter(String methodName, Object thiz, Object[] args);
 
-	public void enter(String methodName, Object thiz);
+	void enter(String methodName, Object thiz);
 
-	public void exit(String methodName, Object ret);
+	void exit(String methodName, Object ret);
 
-	public void exit(String methodName, Throwable th);
+	void exit(String methodName, Throwable th);
 
-	public void exit(String methodName);
+	void exit(String methodName);
 
-	public void event(String methodName);
+	void event(String methodName);
 
-	public void event(String methodName, Object thiz, Object[] args);
+	void event(String methodName, Object thiz, Object[] args);
 
-	public void debug(String message);
+	void debug(String message);
 
-	public void info(String message);
+	void info(String message);
 
-	public void warn(String message);
+	void warn(String message);
 
-	public void warn(String message, Throwable th);
+	void warn(String message, Throwable th);
 
-	public void error(String message);
+	void error(String message);
 
-	public void error(String message, Throwable th);
+	void error(String message, Throwable th);
 
-	public void fatal(String message);
+	void fatal(String message);
 
-	public void fatal(String message, Throwable th);
+	void fatal(String message, Throwable th);
 
-	public void enter(String methodName, Object thiz, Object arg);
+	void enter(String methodName, Object thiz, Object arg);
 
-	public void enter(String methodName, Object thiz, boolean z);
+	void enter(String methodName, Object thiz, boolean z);
 
-	public void exit(String methodName, boolean b);
+	void exit(String methodName, boolean b);
 
-	public void exit(String methodName, int i);
+	void exit(String methodName, int i);
 
-	public void event(String methodName, Object thiz, Object arg);
+	void event(String methodName, Object thiz, Object arg);
 
-	public boolean isTraceEnabled();
+	boolean isTraceEnabled();
 
-	public void setTraceEnabled(boolean b);
-}
\ No newline at end of file
+	void setTraceEnabled(boolean b);
+}
diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/Traceable.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/Traceable.java
index 957786e48..5971e9eb4 100644
--- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/Traceable.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/Traceable.java
@@ -1,10 +1,10 @@
 /*******************************************************************************
  * Copyright (c) 2006 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials 
+ * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  *     Matthew Webster - initial implementation
  *******************************************************************************/
@@ -12,6 +12,6 @@ package org.aspectj.weaver.tools;
 
 public interface Traceable {
 
-	public String toTraceString ();
-	
+	String toTraceString();
+
 }
diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/TypePatternMatcher.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/TypePatternMatcher.java
index be3b84025..3ea8a756e 100644
--- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/TypePatternMatcher.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/TypePatternMatcher.java
@@ -1,11 +1,11 @@
 /* *******************************************************************
  * Copyright (c) 2004 IBM Corporation.
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- *  
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
  * ******************************************************************/
 package org.aspectj.weaver.tools;
 
@@ -19,5 +19,5 @@ public interface TypePatternMatcher {
 	 * Does this type pattern matcher match the
 	 * given type (Class).
 	 */
-	public boolean matches(Class aClass);
+	boolean matches(Class aClass);
 }
diff --git a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/WeavingClassLoader.java b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/WeavingClassLoader.java
index 84987e19b..38e801616 100644
--- a/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/WeavingClassLoader.java
+++ b/org.aspectj.matcher/src/main/java/org/aspectj/weaver/tools/WeavingClassLoader.java
@@ -1,14 +1,14 @@
 /* *******************************************************************
  * Copyright (c) 2004 IBM Corporation
- * All rights reserved. 
- * This program and the accompanying materials are made available 
- * under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- *  
- * Contributors: 
- *     Matthew Webster, Adrian Colyer, 
- *     Martin Lippert     initial implementation 
+ * All rights reserved.
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Matthew Webster, Adrian Colyer,
+ *     Martin Lippert     initial implementation
  * ******************************************************************/
 
 package org.aspectj.weaver.tools;
@@ -20,12 +20,12 @@ import java.net.URL;
  * WeavingAdaptor.
  */
 public interface WeavingClassLoader extends GeneratedClassHandler {
-	
+
 	/**
 	 * Returns the aspects to be used by a WeavingAdaptor to weave classes
 	 * defined by the class loader.
 	 * @return the aspects used for weaving classes.
 	 */
-	public URL[] getAspectURLs ();
+	URL[] getAspectURLs();
 
 }