removed unused imports, local variables, and private methods (still there, just commented out).tags/v_preCompileLoopAlteration
@@ -15,7 +15,7 @@ package org.aspectj.weaver; | |||
import java.lang.reflect.Modifier; | |||
import org.aspectj.weaver.ResolvedTypeX.Name; | |||
//import org.aspectj.weaver.ResolvedTypeX.Name; | |||
public class AjcMemberMaker { |
@@ -73,7 +73,7 @@ public abstract class ConcreteTypeMunger implements PartialOrder.PartialComparab | |||
} | |||
public int fallbackCompareTo(Object other) { | |||
ConcreteTypeMunger o = (ConcreteTypeMunger) other; | |||
// ConcreteTypeMunger o = (ConcreteTypeMunger) other; | |||
return 0; | |||
} | |||
@@ -1539,7 +1539,7 @@ public class BcelShadow extends Shadow { | |||
InstructionList closureInstantiation = | |||
makeClosureInstantiation(constructorSig, closureHolder); | |||
LazyMethodGen constructor = | |||
/*LazyMethodGen constructor = */ | |||
makeClosureClassAndReturnConstructor( | |||
closureClassName, | |||
callbackMethod, |
@@ -571,7 +571,7 @@ public class BcelTypeMunger extends ConcreteTypeMunger { | |||
} | |||
private boolean mungeNewField(BcelClassWeaver weaver, NewFieldTypeMunger munger) { | |||
ResolvedMember initMethod = munger.getInitMethod(aspectType); | |||
/*ResolvedMember initMethod = */munger.getInitMethod(aspectType); | |||
LazyClassGen gen = weaver.getLazyClassGen(); | |||
ResolvedMember field = munger.getSignature(); |
@@ -468,7 +468,7 @@ public class BcelWeaver implements IWeaver { | |||
return null; | |||
} | |||
JavaClass javaClass = classType.getJavaClass(); | |||
// JavaClass javaClass = classType.getJavaClass(); | |||
List shadowMungers = fastMatch(shadowMungerList, classType.getResolvedTypeX()); | |||
List typeMungers = classType.getResolvedTypeX().getInterTypeMungers(); | |||
@@ -529,8 +529,8 @@ public final class LazyClassGen { | |||
new ObjectType("org.aspectj.lang.JoinPoint$StaticPart"); | |||
private static final ObjectType sigType = | |||
new ObjectType("org.aspectj.lang.Signature"); | |||
private static final ObjectType slType = | |||
new ObjectType("org.aspectj.lang.reflect.SourceLocation"); | |||
// private static final ObjectType slType = | |||
// new ObjectType("org.aspectj.lang.reflect.SourceLocation"); | |||
private static final ObjectType factoryType = | |||
new ObjectType("org.aspectj.runtime.reflect.Factory"); | |||
private static final ObjectType classType = |
@@ -70,9 +70,9 @@ public class PatternWeaveTestCase extends WeaveTestCase { | |||
checkPointcut("get(* java.lang.System.out)", getOutHello, getOutHello); | |||
} | |||
private Pointcut makePointcut(String s) { | |||
return new PatternParser(s).parsePointcut(); | |||
} | |||
// private Pointcut makePointcut(String s) { | |||
// return new PatternParser(s).parsePointcut(); | |||
// } | |||
private void checkPointcut(String pointcutSource, String[] expectedHelloShadows, | |||
String[] expectedFancyShadows) throws IOException |
@@ -38,7 +38,7 @@ public class WorldTestCase extends AbstractWorldTestCase { | |||
ResolvedTypeX trace = world.resolve(TypeX.forName("Trace")); | |||
fieldsTest(trace, Member.NONE); | |||
Member constr = Member.methodFromString("void Trace.<init>()"); | |||
/*Member constr = */Member.methodFromString("void Trace.<init>()"); | |||
//XXX need attribute fix - | |||
//methodsTest(trace, new Member[] { constr }); | |||
@@ -47,14 +47,14 @@ public class ThisOrTargetTestCase extends TestCase { | |||
} | |||
private Pointcut makePointcut(String pattern) { | |||
return new PatternParser(pattern).parsePointcut(); | |||
} | |||
// private Pointcut makePointcut(String pattern) { | |||
// return new PatternParser(pattern).parsePointcut(); | |||
// } | |||
private void checkEquals(String pattern, Pointcut p) throws IOException { | |||
assertEquals(pattern, p, makePointcut(pattern)); | |||
checkSerialization(pattern); | |||
} | |||
// private void checkEquals(String pattern, Pointcut p) throws IOException { | |||
// assertEquals(pattern, p, makePointcut(pattern)); | |||
// checkSerialization(pattern); | |||
// } | |||
// private void checkMatch(Pointcut p, Signature[] matches, boolean shouldMatch) { | |||
@@ -83,18 +83,18 @@ public class ThisOrTargetTestCase extends TestCase { | |||
* Method checkSerialization. | |||
* @param string | |||
*/ | |||
private void checkSerialization(String string) throws IOException { | |||
Pointcut p = makePointcut(string); | |||
ByteArrayOutputStream bo = new ByteArrayOutputStream(); | |||
DataOutputStream out = new DataOutputStream(bo); | |||
p.write(out); | |||
out.close(); | |||
ByteArrayInputStream bi = new ByteArrayInputStream(bo.toByteArray()); | |||
DataInputStream in = new DataInputStream(bi); | |||
Pointcut newP = Pointcut.read(in, null); | |||
assertEquals("write/read", p, newP); | |||
} | |||
// private void checkSerialization(String string) throws IOException { | |||
// Pointcut p = makePointcut(string); | |||
// ByteArrayOutputStream bo = new ByteArrayOutputStream(); | |||
// DataOutputStream out = new DataOutputStream(bo); | |||
// p.write(out); | |||
// out.close(); | |||
// | |||
// ByteArrayInputStream bi = new ByteArrayInputStream(bo.toByteArray()); | |||
// DataInputStream in = new DataInputStream(bi); | |||
// Pointcut newP = Pointcut.read(in, null); | |||
// | |||
// assertEquals("write/read", p, newP); | |||
// } | |||
} |
@@ -206,7 +206,7 @@ public class TypePatternTestCase extends TestCase { | |||
try { | |||
TypePattern p = makeTypePattern(pattern); | |||
ResolvedTypeX type = world.resolve(name); | |||
FuzzyBoolean result = p.matchesInstanceof(type); | |||
/*FuzzyBoolean result = */p.matchesInstanceof(type); | |||
} catch (AbortException e) { | |||
return; | |||
} |