spring cleaning in advance of 1.2 enhancements:

removed unused imports, local variables, and private methods
(still there, just commented out).

4 files changed, 25 insertions, 25 deletions

diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/PatternWeaveTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/PatternWeaveTestCase.java
index 4cea61148..db9248c84 100644
--- a/weaver/testsrc/org/aspectj/weaver/bcel/PatternWeaveTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/PatternWeaveTestCase.java
@@ -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
diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/WorldTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/WorldTestCase.java
index 428bdce9c..7fe8f84c9 100644
--- a/weaver/testsrc/org/aspectj/weaver/bcel/WorldTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/WorldTestCase.java
@@ -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 });
 
diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/ThisOrTargetTestCase.java b/weaver/testsrc/org/aspectj/weaver/patterns/ThisOrTargetTestCase.java
index d33d42daa..da8f3eecb 100644
--- a/weaver/testsrc/org/aspectj/weaver/patterns/ThisOrTargetTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/patterns/ThisOrTargetTestCase.java
@@ -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);	
+//	}
 	
 }
diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/TypePatternTestCase.java b/weaver/testsrc/org/aspectj/weaver/patterns/TypePatternTestCase.java
index 6d7ee2185..67615d944 100644
--- a/weaver/testsrc/org/aspectj/weaver/patterns/TypePatternTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/patterns/TypePatternTestCase.java
@@ -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;
 		}