@@ -30,10 +30,8 @@ import org.aspectj.org.eclipse.jdt.internal.compiler.ast.Annotation; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.ast.Argument; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.ast.TypeDeclaration; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.ast.TypeReference; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.codegen.CodeStream; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.ArrayBinding; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.Binding; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.ClassScope; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.ExtraCompilerModifiers; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.MethodBinding; |
@@ -14,19 +14,16 @@ | |||
package org.aspectj.ajdt.internal.compiler.ast; | |||
import org.aspectj.ajdt.internal.compiler.lookup.EclipseFactory; | |||
import org.aspectj.weaver.AjcMemberMaker; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.CompilationResult; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.ast.ASTNode; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.ast.Clinit; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.codegen.BranchLabel; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.codegen.CodeStream; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.codegen.ExceptionLabel; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.codegen.Label; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.impl.Constant; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.ClassScope; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.FieldBinding; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.LocalVariableBinding; | |||
import org.aspectj.weaver.AjcMemberMaker; | |||
public class AspectClinit extends Clinit { | |||
private boolean hasPre, hasPost; |
@@ -27,7 +27,6 @@ import org.aspectj.ajdt.internal.compiler.lookup.EclipseTypeMunger; | |||
import org.aspectj.ajdt.internal.compiler.lookup.HelperInterfaceBinding; | |||
import org.aspectj.ajdt.internal.compiler.lookup.InlineAccessFieldBinding; | |||
import org.aspectj.ajdt.internal.compiler.lookup.PrivilegedHandler; | |||
import org.aspectj.apache.bcel.classfile.Signature.BaseTypeSignature; | |||
import org.aspectj.org.eclipse.jdt.core.compiler.CharOperation; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.ClassFile; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.CompilationResult; | |||
@@ -39,8 +38,6 @@ import org.aspectj.org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.codegen.BranchLabel; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.codegen.CodeStream; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.codegen.ExceptionLabel; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.codegen.Label; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.env.IGenericType; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.BinaryTypeBinding; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.Binding; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.ClassScope; | |||
@@ -51,7 +48,6 @@ import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.ParameterizedTypeBin | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.Scope; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.SourceTypeBinding; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.SyntheticFieldBinding; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.TypeBinding; | |||
import org.aspectj.weaver.AjAttribute; | |||
import org.aspectj.weaver.AjcMemberMaker; | |||
@@ -67,7 +63,6 @@ import org.aspectj.weaver.patterns.PerClause; | |||
import org.aspectj.weaver.patterns.PerFromSuper; | |||
import org.aspectj.weaver.patterns.PerSingleton; | |||
import org.aspectj.weaver.patterns.TypePattern; | |||
//import org.aspectj.org.eclipse.jdt.internal.compiler.parser.Parser; | |||
// (we used to...) making all aspects member types avoids a nasty hierarchy pain |
@@ -15,24 +15,17 @@ | |||
package org.aspectj.ajdt.internal.compiler.ast; | |||
import org.aspectj.weaver.AdviceKind; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.ast.ASTNode; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.ast.CastExpression; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.ast.Expression; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.ast.MessageSend; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.impl.Constant; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.impl.ReferenceContext; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.Binding; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.BlockScope; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.ClassScope; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.ExtraCompilerModifiers; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.MethodBinding; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.MethodScope; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.ProblemMethodBinding; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.RawTypeBinding; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.ReferenceBinding; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.Scope; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.lookup.TypeBinding; | |||
import org.aspectj.weaver.AdviceKind; | |||
/** | |||
* Used to represent any method call to a method named <code>proceed</code>. During |
@@ -23,7 +23,6 @@ import org.aspectj.weaver.NameMangler; | |||
import org.aspectj.weaver.ResolvedMember; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.ASTVisitor; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.ast.AbstractMethodDeclaration; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.ast.ASTNode; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.ast.MessageSend; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.ast.ThisReference; | |||
import org.aspectj.org.eclipse.jdt.internal.compiler.classfmt.ClassFileConstants; |