organized imports.

diff --git a/weaver/src/org/aspectj/weaver/MethodDelegateTypeMunger.java b/weaver/src/org/aspectj/weaver/MethodDelegateTypeMunger.java
index 1d4a2e84a9e81bca7ac12b5a6b4f6df55c2d0629..797e7ae7b497a28baefce3079db98bad42ced797 100644 (file)
--- a/weaver/src/org/aspectj/weaver/MethodDelegateTypeMunger.java
+++ b/weaver/src/org/aspectj/weaver/MethodDelegateTypeMunger.java
@@ -13,13 +13,10 @@
 
 package org.aspectj.weaver;
 
-import org.aspectj.bridge.ISourceLocation;
-import org.aspectj.weaver.patterns.TypePattern;
-
 import java.io.DataOutputStream;
 import java.io.IOException;
-import java.util.Set;
-import java.util.Iterator;
+
+import org.aspectj.weaver.patterns.TypePattern;
 
 /**
  * Type munger for @AspectJ ITD declare parents ie with an interface AND an implementation.

diff --git a/weaver/src/org/aspectj/weaver/bcel/AtAjAttributes.java b/weaver/src/org/aspectj/weaver/bcel/AtAjAttributes.java
index cdcc3ac598922c33bb233a52fa871a21a674fb65..1160ac79110fe8d07f41024b611a87f05c9f2d8f 100644 (file)
--- a/weaver/src/org/aspectj/weaver/bcel/AtAjAttributes.java
+++ b/weaver/src/org/aspectj/weaver/bcel/AtAjAttributes.java
@@ -12,11 +12,11 @@
 package org.aspectj.weaver.bcel;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Arrays;
 
 import org.aspectj.apache.bcel.Constants;
 import org.aspectj.apache.bcel.classfile.Attribute;
@@ -42,18 +42,19 @@ import org.aspectj.weaver.AjAttribute;
 import org.aspectj.weaver.AjcMemberMaker;
 import org.aspectj.weaver.IHasPosition;
 import org.aspectj.weaver.ISourceContext;
+import org.aspectj.weaver.MethodDelegateTypeMunger;
 import org.aspectj.weaver.NameMangler;
 import org.aspectj.weaver.ReferenceType;
+import org.aspectj.weaver.ResolvedMember;
 import org.aspectj.weaver.ResolvedPointcutDefinition;
 import org.aspectj.weaver.ResolvedType;
 import org.aspectj.weaver.UnresolvedType;
 import org.aspectj.weaver.WeaverMessages;
-import org.aspectj.weaver.ResolvedTypeMunger;
-import org.aspectj.weaver.ResolvedMember;
-import org.aspectj.weaver.MethodDelegateTypeMunger;
 import org.aspectj.weaver.patterns.AndPointcut;
 import org.aspectj.weaver.patterns.DeclareErrorOrWarning;
+import org.aspectj.weaver.patterns.DeclareParents;
 import org.aspectj.weaver.patterns.DeclarePrecedence;
+import org.aspectj.weaver.patterns.ExactTypePattern;
 import org.aspectj.weaver.patterns.FormalBinding;
 import org.aspectj.weaver.patterns.IScope;
 import org.aspectj.weaver.patterns.IdentityPointcutVisitor;
@@ -71,8 +72,6 @@ import org.aspectj.weaver.patterns.PerTypeWithin;
 import org.aspectj.weaver.patterns.Pointcut;
 import org.aspectj.weaver.patterns.SimpleScope;
 import org.aspectj.weaver.patterns.TypePattern;
-import org.aspectj.weaver.patterns.DeclareParents;
-import org.aspectj.weaver.patterns.ExactTypePattern;
 
 /**
  * Annotation defined aspect reader.