@@ -14,8 +14,6 @@ | |||
package org.aspectj.lang.reflect; | |||
import org.aspectj.lang.Signature; | |||
public interface FieldSignature extends MemberSignature { | |||
public Class getFieldType(); | |||
} |
@@ -19,7 +19,6 @@ import org.aspectj.runtime.CFlow; | |||
import java.util.Stack; | |||
import java.util.Hashtable; | |||
import java.util.Vector; | |||
import java.util.Enumeration; | |||
public class CFlowStack { |
@@ -14,11 +14,7 @@ | |||
package org.aspectj.runtime.internal; | |||
import org.aspectj.runtime.CFlow; | |||
// REQUIRES JAVA 2!!!!!!!!!!!!!!!! | |||
import java.util.WeakHashMap; | |||
import java.util.WeakHashMap; // XXX REQUIRES JAVA 2!!!!!!!!!!!!!!!! | |||
public class PerObjectMap { | |||
private WeakHashMap map = new WeakHashMap(); |
@@ -14,10 +14,7 @@ | |||
package org.aspectj.runtime.reflect; | |||
import org.aspectj.lang.*; | |||
import org.aspectj.lang.reflect.*; | |||
import java.lang.reflect.Modifier; | |||
import org.aspectj.lang.reflect.AdviceSignature; | |||
class AdviceSignatureImpl extends CodeSignatureImpl implements AdviceSignature { | |||
Class returnType; |
@@ -14,8 +14,7 @@ | |||
package org.aspectj.runtime.reflect; | |||
import org.aspectj.lang.*; | |||
import org.aspectj.lang.reflect.*; | |||
import org.aspectj.lang.reflect.CatchClauseSignature; | |||
class CatchClauseSignatureImpl extends SignatureImpl implements CatchClauseSignature { | |||
Class parameterType; |
@@ -14,8 +14,7 @@ | |||
package org.aspectj.runtime.reflect; | |||
import org.aspectj.lang.*; | |||
import org.aspectj.lang.reflect.*; | |||
import org.aspectj.lang.reflect.CodeSignature; | |||
abstract class CodeSignatureImpl extends MemberSignatureImpl implements CodeSignature { | |||
Class[] parameterTypes; |
@@ -14,8 +14,7 @@ | |||
package org.aspectj.runtime.reflect; | |||
import org.aspectj.lang.reflect.*; | |||
import org.aspectj.lang.*; | |||
import org.aspectj.lang.reflect.ConstructorSignature; | |||
class ConstructorSignatureImpl extends CodeSignatureImpl implements ConstructorSignature { | |||
ConstructorSignatureImpl(int modifiers, Class declaringType, |
@@ -14,10 +14,7 @@ | |||
package org.aspectj.runtime.reflect; | |||
import org.aspectj.lang.reflect.*; | |||
import org.aspectj.lang.*; | |||
import java.lang.reflect.Modifier; | |||
import org.aspectj.lang.reflect.FieldSignature; | |||
public class FieldSignatureImpl extends MemberSignatureImpl implements FieldSignature { | |||
Class fieldType; |
@@ -14,8 +14,7 @@ | |||
package org.aspectj.runtime.reflect; | |||
import org.aspectj.lang.reflect.*; | |||
import org.aspectj.lang.*; | |||
import org.aspectj.lang.reflect.InitializerSignature; | |||
import java.lang.reflect.Modifier; | |||
@@ -14,8 +14,7 @@ | |||
package org.aspectj.runtime.reflect; | |||
import org.aspectj.lang.*; | |||
import org.aspectj.lang.reflect.*; | |||
import org.aspectj.lang.reflect.MemberSignature; | |||
abstract class MemberSignatureImpl extends SignatureImpl implements MemberSignature { | |||
MemberSignatureImpl(int modifiers, String name, Class declaringType) { |
@@ -14,9 +14,7 @@ | |||
package org.aspectj.runtime.reflect; | |||
import org.aspectj.lang.*; | |||
import org.aspectj.lang.reflect.*; | |||
import java.lang.reflect.Modifier; | |||
import org.aspectj.lang.reflect.MethodSignature; | |||
class MethodSignatureImpl extends CodeSignatureImpl implements MethodSignature { | |||
Class returnType; |
@@ -14,10 +14,10 @@ | |||
package org.aspectj.runtime.reflect; | |||
import org.aspectj.lang.*; | |||
import org.aspectj.lang.reflect.*; | |||
import org.aspectj.lang.Signature; | |||
import java.util.*; | |||
import java.util.Hashtable; | |||
import java.util.StringTokenizer; | |||
abstract class SignatureImpl implements Signature { | |||
int modifiers = -1; |
@@ -14,8 +14,7 @@ | |||
package org.aspectj.runtime.reflect; | |||
import org.aspectj.lang.*; | |||
import org.aspectj.lang.reflect.*; | |||
import org.aspectj.lang.reflect.SourceLocation; | |||
class SourceLocationImpl implements SourceLocation { | |||
Class withinType; |
@@ -14,9 +14,6 @@ | |||
package org.aspectj.runtime.reflect; | |||
import org.aspectj.lang.*; | |||
import org.aspectj.lang.reflect.*; | |||
import java.lang.reflect.Modifier; | |||
class StringMaker { |
@@ -12,31 +12,30 @@ | |||
package org.aspectj.tools.ant.taskdefs; | |||
import org.apache.tools.ant.*; | |||
import org.apache.tools.ant.types.*; | |||
import org.apache.tools.ant.BuildException; | |||
import org.apache.tools.ant.Location; | |||
import org.apache.tools.ant.Project; | |||
import org.apache.tools.ant.taskdefs.MatchingTask; | |||
import org.apache.tools.ant.types.Commandline; | |||
import org.apache.tools.ant.types.Path; | |||
import org.apache.tools.ant.types.Reference; | |||
import org.aspectj.bridge.AbortException; | |||
import org.aspectj.bridge.IMessage; | |||
import org.aspectj.bridge.IMessageHandler; | |||
import org.aspectj.bridge.IMessageHolder; | |||
import org.aspectj.bridge.MessageHandler; | |||
import org.aspectj.bridge.MessageUtil; | |||
import org.aspectj.tools.ajc.Main; | |||
import org.aspectj.tools.ajc.Main.MessagePrinter; | |||
import org.apache.tools.ant.taskdefs.*; | |||
import org.apache.tools.ant.taskdefs.compilers.*; | |||
import java.io.*; | |||
import java.io.File; | |||
import java.util.Arrays; | |||
import java.util.Collections; | |||
import java.util.HashSet; | |||
import java.util.Iterator; | |||
import java.util.List; | |||
import java.util.Set; | |||
import java.util.Vector; | |||
import java.util.Iterator; | |||
import java.util.ArrayList; | |||
import java.util.StringTokenizer; | |||
import java.lang.reflect.*; | |||
import java.net.*; | |||
import java.util.Vector; | |||
/** | |||
* Main taskdef class for the AspectJ 1.0 compiler, <code>ajc</code>. |
@@ -14,13 +14,11 @@ | |||
package org.aspectj.tools.ant.taskdefs; | |||
import org.apache.tools.ant.Project; | |||
import org.apache.tools.ant.BuildException; | |||
import org.apache.tools.ant.types.Commandline; | |||
import org.apache.tools.ant.taskdefs.compilers.DefaultCompilerAdapter; | |||
import java.io.File; | |||
import java.lang.reflect.Method; | |||
import java.util.ArrayList; | |||
import java.util.Arrays; | |||
import java.util.Iterator; |
@@ -16,13 +16,11 @@ import org.apache.tools.ant.*; | |||
import org.apache.tools.ant.types.*; | |||
import org.apache.tools.ant.types.Path; | |||
import org.apache.tools.ant.taskdefs.*; | |||
import org.apache.tools.ant.taskdefs.compilers.*; | |||
import java.io.*; | |||
import java.util.List; | |||
import java.util.Iterator; | |||
import java.util.ArrayList; | |||
import java.util.StringTokenizer; | |||
import java.lang.reflect.*; | |||
/** | |||
* Ant task for the AspectJ compiler -- AJC. |
@@ -14,22 +14,13 @@ | |||
package org.aspectj.tools.ant.taskdefs; | |||
import java.io.File; | |||
import java.util.ArrayList; | |||
import java.util.Arrays; | |||
import java.util.Collections; | |||
import java.util.Iterator; | |||
import java.util.List; | |||
import java.util.StringTokenizer; | |||
import java.util.Vector; | |||
import org.apache.tools.ant.BuildException; | |||
import org.apache.tools.ant.Location; | |||
import org.apache.tools.ant.Project; | |||
import org.apache.tools.ant.taskdefs.MatchingTask; | |||
import org.apache.tools.ant.types.Commandline; | |||
import org.apache.tools.ant.types.Path; | |||
import org.apache.tools.ant.types.Reference; | |||
import org.aspectj.bridge.CountingMessageHandler; | |||
import org.aspectj.bridge.IMessage; | |||
import org.aspectj.bridge.IMessageHandler; | |||
import org.aspectj.bridge.IMessageHolder; | |||
@@ -38,6 +29,15 @@ import org.aspectj.tools.ajc.Main; | |||
import org.aspectj.tools.ajc.Main.MessagePrinter; | |||
import org.aspectj.util.LangUtil; | |||
import java.io.File; | |||
import java.util.ArrayList; | |||
import java.util.Arrays; | |||
import java.util.Collections; | |||
import java.util.Iterator; | |||
import java.util.List; | |||
import java.util.StringTokenizer; | |||
import java.util.Vector; | |||
/** | |||
* This runs the AspectJ 1.1 compiler. | |||
@@ -243,15 +243,14 @@ public class AjcTask extends MatchingTask { | |||
} | |||
/** | |||
* -Xlint:file={lint.properties} - enable or disable specific forms | |||
* -Xlintfile {lint.properties} - enable or disable specific forms | |||
* of -Xlint messages based on a lint properties file | |||
* (default is | |||
* <code>org/aspectj/weaver/XLintDefault.properties</code>) | |||
* @param xlintFile the File with lint properties | |||
*/ | |||
public void setXlintfile(File xlintFile) { | |||
String flag = "-Xlintfile:" + xlintFile.getAbsolutePath(); | |||
addFlag(flag, true); | |||
addFlagged("-Xlintfile", xlintFile.getAbsolutePath()); | |||
} | |||
public void setPreserveAllLocals(boolean preserveAllLocals) { | |||
@@ -549,7 +548,7 @@ public class AjcTask extends MatchingTask { | |||
try { | |||
if (0 < ignored.size()) { | |||
for (Iterator iter = ignored.iterator(); iter.hasNext();) { | |||
log("ignored: " + iter.next(), project.MSG_INFO); | |||
log("ignored: " + iter.next(), Project.MSG_INFO); | |||
} | |||
} | |||
Main main = new Main(); | |||
@@ -557,7 +556,7 @@ public class AjcTask extends MatchingTask { | |||
addListArgs(); | |||
String[] args = cmd.getArguments(); | |||
if (verbose) { | |||
log("ajc " + Arrays.asList(args), project.MSG_VERBOSE); | |||
log("ajc " + Arrays.asList(args), Project.MSG_VERBOSE); | |||
} | |||
main.runMain(args, false); | |||
@@ -12,19 +12,19 @@ | |||
package org.aspectj.tools.ant.taskdefs.compilers; | |||
import org.apache.tools.ant.*; | |||
import org.apache.tools.ant.types.*; | |||
import org.apache.tools.ant.types.Path; | |||
import org.apache.tools.ant.taskdefs.*; | |||
import org.apache.tools.ant.taskdefs.compilers.*; | |||
import java.io.*; | |||
import java.util.Iterator; | |||
import java.util.List; | |||
import org.apache.tools.ant.BuildException; | |||
import org.apache.tools.ant.Project; | |||
import org.apache.tools.ant.taskdefs.Javac; | |||
import org.apache.tools.ant.taskdefs.LogOutputStream; | |||
import org.apache.tools.ant.taskdefs.compilers.DefaultCompilerAdapter; | |||
import org.apache.tools.ant.types.Commandline; | |||
import java.io.File; | |||
import java.io.PrintStream; | |||
import java.util.ArrayList; | |||
import java.lang.reflect.*; | |||
//XXX | |||
import java.util.*; | |||
import java.util.Arrays; | |||
import java.util.Collections; | |||
import java.util.List; | |||
/** | |||
* Ajc uses this as the CompilerAdapter. |
@@ -13,14 +13,10 @@ | |||
package org.aspectj.tools.ant.taskdefs; | |||
import org.apache.tools.ant.BuildException; | |||
import org.apache.tools.ant.Project; | |||
import org.apache.tools.ant.Task; | |||
import org.apache.tools.ant.taskdefs.Ant; | |||
import org.apache.tools.ant.types.Path; | |||
import org.apache.tools.ant.types.selectors.FilenameSelector; | |||
import org.aspectj.bridge.IMessage; | |||
import org.aspectj.bridge.IMessageHandler; | |||
import org.aspectj.bridge.IMessageHolder; | |||
import org.aspectj.bridge.MessageHandler; | |||
import org.aspectj.bridge.MessageUtil; |
@@ -14,7 +14,6 @@ | |||
package org.aspectj.tools.ant.taskdefs; | |||
import org.apache.tools.ant.Project; | |||
import org.apache.tools.ant.types.Path; | |||
import java.io.File; | |||