eclipse: addressed unnecessary casts, unused code, invalid null checks

13 files changed, 83 insertions, 61 deletions

diff --git a/weaver/testsrc/org/aspectj/weaver/CommonsTraceTest.java b/weaver/testsrc/org/aspectj/weaver/CommonsTraceTest.java
index 1ff47c45a..ac6a8cec3 100644
--- a/weaver/testsrc/org/aspectj/weaver/CommonsTraceTest.java
+++ b/weaver/testsrc/org/aspectj/weaver/CommonsTraceTest.java
@@ -21,7 +21,8 @@ public class CommonsTraceTest extends AbstractTraceTest {
 	}
 	
 	public void testCommonsTrace() {
-		CommonsTrace trace = new CommonsTrace(getClass());
+//		CommonsTrace trace = 
+			new CommonsTrace(getClass());
 	}
 
 	public void testSetTraceEnabled() {
diff --git a/weaver/testsrc/org/aspectj/weaver/DefaultTraceTest.java b/weaver/testsrc/org/aspectj/weaver/DefaultTraceTest.java
index fef476c49..a8313c4fb 100644
--- a/weaver/testsrc/org/aspectj/weaver/DefaultTraceTest.java
+++ b/weaver/testsrc/org/aspectj/weaver/DefaultTraceTest.java
@@ -21,7 +21,8 @@ public class DefaultTraceTest extends AbstractTraceTest {
 	}
 
 	public void testDefaultTrace() {
-		DefaultTrace trace = new DefaultTrace(getClass());
+//		DefaultTrace trace = 
+			new DefaultTrace(getClass());
 	}
 
 	public void testSetTraceEnabled() {
diff --git a/weaver/testsrc/org/aspectj/weaver/WeaverMessagesTestCase.java b/weaver/testsrc/org/aspectj/weaver/WeaverMessagesTestCase.java
index 59fb884ca..ea5dd9d67 100644
--- a/weaver/testsrc/org/aspectj/weaver/WeaverMessagesTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/WeaverMessagesTestCase.java
@@ -33,7 +33,7 @@ public class WeaverMessagesTestCase extends TestCase {
 			if (f.getType() == String.class) {
 				try {
 					String key = (String) f.get(null);
-					String value = WeaverMessages.format(key);
+//					String value = WeaverMessages.format(key);
 					assertFalse("Each key should be unique",fieldList.contains(key));
 					fieldList.add(key);
 //					System.out.println(key + "," + value);
diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/BcelGenericSignatureToTypeXTestCase.java b/weaver/testsrc/org/aspectj/weaver/bcel/BcelGenericSignatureToTypeXTestCase.java
index 28cf82f5a..168400e91 100644
--- a/weaver/testsrc/org/aspectj/weaver/bcel/BcelGenericSignatureToTypeXTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/BcelGenericSignatureToTypeXTestCase.java
@@ -61,7 +61,8 @@ public class BcelGenericSignatureToTypeXTestCase extends TestCase {
 				cSig.formalTypeParameters,
 				world);
 		assertEquals("Ljava/lang/Object;",resolved.getSignature());
-		UnresolvedType resolvedInt = BcelGenericSignatureToTypeXConverter.classTypeSignature2TypeX(
+//		UnresolvedType resolvedInt = 
+			BcelGenericSignatureToTypeXConverter.classTypeSignature2TypeX(
 				cSig.superInterfaceSignatures[0],
 				cSig.formalTypeParameters,
 				world);
diff --git a/weaver/testsrc/org/aspectj/weaver/bcel/ClassLoaderRepositoryTests.java b/weaver/testsrc/org/aspectj/weaver/bcel/ClassLoaderRepositoryTests.java
index ce7666e84..664b0c783 100644
--- a/weaver/testsrc/org/aspectj/weaver/bcel/ClassLoaderRepositoryTests.java
+++ b/weaver/testsrc/org/aspectj/weaver/bcel/ClassLoaderRepositoryTests.java
@@ -77,19 +77,19 @@ public class ClassLoaderRepositoryTests extends TestCase {
 		System.err.println(rep2.report());
     }
 
-	 private void loadOnce() throws Exception {
-		ClassLoaderRepository rep = setupRepository();
-		while (entries.hasMoreElements()) {
-			ZipEntry zfe = (ZipEntry) entries.nextElement();
-			String classfileName = zfe.getName();
-			if (classfileName.endsWith(".class")) {
-				String clazzname = classfileName.substring(0,
-						classfileName.length() - 6).replace('/', '.');
-
-				rep.loadClass(clazzname);
-			}
-		}
-	}
+//	 private void loadOnce() throws Exception {
+//		ClassLoaderRepository rep = setupRepository();
+//		while (entries.hasMoreElements()) {
+//			ZipEntry zfe = (ZipEntry) entries.nextElement();
+//			String classfileName = zfe.getName();
+//			if (classfileName.endsWith(".class")) {
+//				String clazzname = classfileName.substring(0,
+//						classfileName.length() - 6).replace('/', '.');
+//
+//				rep.loadClass(clazzname);
+//			}
+//		}
+//	}
 
 	 public void testMultiThreaded() throws Throwable {		 
 		 ClassLoaderRepository.useSharedCache=true;
diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/AndOrNotTestCase.java b/weaver/testsrc/org/aspectj/weaver/patterns/AndOrNotTestCase.java
index 74969929c..481f3a0c1 100644
--- a/weaver/testsrc/org/aspectj/weaver/patterns/AndOrNotTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/patterns/AndOrNotTestCase.java
@@ -27,10 +27,6 @@ import org.aspectj.weaver.bcel.BcelWorld;
 /**
  * @author hugunin
  *
- * To change this generated comment edit the template variable "typecomment":
- * Window>Preferences>Java>Templates.
- * To enable and disable the creation of type comments go to
- * Window>Preferences>Java>Code Generation.
  */
 public class AndOrNotTestCase extends TestCase {		
 	/**
@@ -41,6 +37,9 @@ public class AndOrNotTestCase extends TestCase {
 		super(name);
 	}
 	
+	static {
+		new Foo();new Bar();new C(); // just to touch them and so eclipse thinks they are used
+	}
 	World world;
 	                          	
 	
@@ -97,8 +96,8 @@ public class AndOrNotTestCase extends TestCase {
 		assertEquals("write/read", p, newP);	
 	}
 	
-	private static class Foo{};
-	private static class Bar{};
-	private static class C{};
+	private static class Foo{}
+	private static class Bar{}
+	private static class C{}
 	
 }
diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/AnnotationPatternMatchingTestCase.java b/weaver/testsrc/org/aspectj/weaver/patterns/AnnotationPatternMatchingTestCase.java
index b7a1ef319..5e6ad5e59 100644
--- a/weaver/testsrc/org/aspectj/weaver/patterns/AnnotationPatternMatchingTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/patterns/AnnotationPatternMatchingTestCase.java
@@ -102,12 +102,13 @@ public class AnnotationPatternMatchingTestCase extends TestCase {
 			return false;
 		}
 		public boolean isIgnoring(Kind kind) {return false;}
-        public void dontIgnore(IMessage.Kind kind) {;}
+        public void dontIgnore(IMessage.Kind kind) {}
 		public void ignore(Kind kind) {}
 	}
 	
 	public void testReferenceToNonAnnotationType() {
-		ResolvedType rtx = loadType("AnnotatedClass"); // inits the world
+//		ResolvedType rtx = 
+			loadType("AnnotatedClass"); // inits the world
 		PatternParser p = new PatternParser("@java.lang.String");
 		
 		MyMessageHandler mh = new MyMessageHandler();
@@ -123,7 +124,8 @@ public class AnnotationPatternMatchingTestCase extends TestCase {
 	}
 	
 	public void testReferenceViaFormalToNonAnnotationType() {
-		ResolvedType rtx = loadType("AnnotatedClass"); // inits the world
+//		ResolvedType rtx = 
+			loadType("AnnotatedClass"); // inits the world
 		PatternParser p = new PatternParser("a");
 		
 		MyMessageHandler mh = new MyMessageHandler();
diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/AnnotationPatternTestCase.java b/weaver/testsrc/org/aspectj/weaver/patterns/AnnotationPatternTestCase.java
index adf8f415f..52c2cb811 100644
--- a/weaver/testsrc/org/aspectj/weaver/patterns/AnnotationPatternTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/patterns/AnnotationPatternTestCase.java
@@ -86,8 +86,10 @@ public class AnnotationPatternTestCase extends TestCase {
 		ap = ap.resolveBindings(makeSimpleScope(),new Bindings(3),true);		
 		AndAnnotationTypePattern atp = (AndAnnotationTypePattern) ap;
 		NotAnnotationTypePattern notBoo = (NotAnnotationTypePattern) atp.getRight();
-		ExactAnnotationTypePattern boo = (ExactAnnotationTypePattern) notBoo.getNegatedPattern();
-		AnnotationTypePattern fooOrGoo = (AnnotationTypePattern) atp.getLeft();
+//		ExactAnnotationTypePattern boo = (ExactAnnotationTypePattern) 
+			notBoo.getNegatedPattern();
+//		AnnotationTypePattern fooOrGoo = (AnnotationTypePattern) 
+			atp.getLeft();
 		assertEquals("@((Foo || Goo)) !@Boo",ap.toString());
 	}
 	
@@ -116,14 +118,15 @@ public class AnnotationPatternTestCase extends TestCase {
 	public void testParseNameOrVarAnnotationPattern() {
 		PatternParser p = new PatternParser("Foo");
 		AnnotationTypePattern foo = p.parseAnnotationNameOrVarTypePattern();
-		assertTrue("ExactAnnotationTypePattern",foo instanceof ExactAnnotationTypePattern);
+		assertTrue("ExactAnnotationTypePattern expected",foo!=null);
 		assertEquals("Foo",UnresolvedType.forName("Foo"),((ExactAnnotationTypePattern)foo).annotationType);		
 	}
 	
 	public void testParseNameOrVarAnnotationPatternWithNot() {
 		PatternParser p = new PatternParser("!@Foo");
 		try {
-			AnnotationTypePattern bad = p.parseAnnotationNameOrVarTypePattern();
+//			AnnotationTypePattern bad = 
+				p.parseAnnotationNameOrVarTypePattern();
 			fail("ParserException expected");
 		} catch(ParserException pEx) {
 			assertEquals("identifier",pEx.getMessage());
diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/ArgsTestCase.java b/weaver/testsrc/org/aspectj/weaver/patterns/ArgsTestCase.java
index 5b0a09b0e..4d157628c 100644
--- a/weaver/testsrc/org/aspectj/weaver/patterns/ArgsTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/patterns/ArgsTestCase.java
@@ -140,15 +140,15 @@ public class ArgsTestCase extends TestCase {
 		public void anInt(int i) {}
 		public void anInteger(Integer i) {}
 		
-	};
+	}
 	private static class B extends A {
 		public void x(A a) {}
 		public void y(B b) {}
-	};
+	}
 	private static class C {
 		public void z(A a, C c) {}
 		public void t(B b, A a) {}
-	};
+	}
 
 	
 	private boolean needToSkip = false;
diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/ParserTestCase.java b/weaver/testsrc/org/aspectj/weaver/patterns/ParserTestCase.java
index 4f3e63a17..d6592da54 100644
--- a/weaver/testsrc/org/aspectj/weaver/patterns/ParserTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/patterns/ParserTestCase.java
@@ -84,25 +84,26 @@ public class ParserTestCase extends TestCase {
 	public void testParseExecutionWithMultipleAnnotations() {
 	    PatternParser parser = new PatternParser("execution(@SimpleAnnotation (@Foo Integer) (@Goo Hello).*(..))");
 	    KindedPointcut p = (KindedPointcut) parser.parsePointcut();
-	    assertEquals("execution(@(SimpleAnnotation) (@(Foo) Integer) (@(Goo) Hello).*(..))",p.toString());;
+	    assertEquals("execution(@(SimpleAnnotation) (@(Foo) Integer) (@(Goo) Hello).*(..))",p.toString());
 	}
 	
 	public void testParseCallWithMultipleAnnotations() {
 	    PatternParser parser = new PatternParser("call(@SimpleAnnotation (@Foo Integer) (@Goo Hello).*(..))");
 	    KindedPointcut p = (KindedPointcut) parser.parsePointcut();
-	    assertEquals("call(@(SimpleAnnotation) (@(Foo) Integer) (@(Goo) Hello).*(..))",p.toString());;	    
+	    assertEquals("call(@(SimpleAnnotation) (@(Foo) Integer) (@(Goo) Hello).*(..))",p.toString());
 	}
 	
 	public void testParseGetWithAnnotations() {
 	    PatternParser parser = new PatternParser("get(@Foo (@SimpleAnnotation ReturnType) (@Foo @Goo Hello).*)");
 	    KindedPointcut p = (KindedPointcut) parser.parsePointcut();
-	    assertEquals("get(@(Foo) (@(SimpleAnnotation) ReturnType) (@(Foo) @(Goo) Hello).*)",p.toString());;	    
+	    assertEquals("get(@(Foo) (@(SimpleAnnotation) ReturnType) (@(Foo) @(Goo) Hello).*)",p.toString());    
 	}
 	
 	public void testParseBadGetWithAnnotations() {
 	    PatternParser parser = new PatternParser("get(@Foo (@Foo @Goo Hello).*)");
 	    try {
-	        KindedPointcut p = (KindedPointcut) parser.parsePointcut();
+//	        KindedPointcut p = (KindedPointcut) 
+	        	parser.parsePointcut();
 	        fail("Expected parser exception");
 	    } catch (ParserException pEx) {
 	        assertEquals("name pattern",pEx.getMessage());
@@ -112,20 +113,20 @@ public class ParserTestCase extends TestCase {
 	public void testParseGetWithAndAggregationAnnotations() {
 	    PatternParser parser = new PatternParser("get(@Foo @SimpleAnnotation ReturnType (@Foo @Goo Hello).*)");
 	    KindedPointcut p = (KindedPointcut) parser.parsePointcut();
-	    assertEquals("get(@(Foo) @(SimpleAnnotation) ReturnType (@(Foo) @(Goo) Hello).*)",p.toString());;	    
+	    assertEquals("get(@(Foo) @(SimpleAnnotation) ReturnType (@(Foo) @(Goo) Hello).*)",p.toString());	    
 	}
 	
 	
 	public void testParseSetWithAnnotations() {
 	    PatternParser parser = new PatternParser("set(@Foo (@SimpleAnnotation ReturnType) (@Foo @Goo Hello).*)");
 	    KindedPointcut p = (KindedPointcut) parser.parsePointcut();
-	    assertEquals("set(@(Foo) (@(SimpleAnnotation) ReturnType) (@(Foo) @(Goo) Hello).*)",p.toString());;	    
+	    assertEquals("set(@(Foo) (@(SimpleAnnotation) ReturnType) (@(Foo) @(Goo) Hello).*)",p.toString());   
 	}
 	
 	public void testParseHandlerWithAnnotations() {
 	    PatternParser parser = new PatternParser("handler(@Critical Exception+)");
 	    Pointcut p = parser.parsePointcut();
-	    assertEquals("handler((@(Critical) Exception+))",p.toString());;	    
+	    assertEquals("handler((@(Critical) Exception+))",p.toString());	    
 	}
 
 	public void testParseInitializationWithAnnotations() {
@@ -168,7 +169,8 @@ public class ParserTestCase extends TestCase {
 	public void testBadAtAnnotation() {
 	    PatternParser parser = new PatternParser("@annotation(!Foo)");
 	    try {
-	        Pointcut p = parser.parsePointcut();
+//	        Pointcut p = 
+	        	parser.parsePointcut();
 	        fail("Expected parser exception");
 	    } catch (ParserException pEx) {
 	        assertEquals("identifier",pEx.getMessage());
@@ -184,7 +186,8 @@ public class ParserTestCase extends TestCase {
 	public void testDoubleAtAnnotation() {
 	    PatternParser parser = new PatternParser("@annotation(Foo Goo)");
 	    try {
-	        Pointcut p = parser.parsePointcut();
+//	        Pointcut p = 
+	        	parser.parsePointcut();
 	        fail("Expected parser exception");
 	    } catch (ParserException pEx) {
 	        assertEquals(")",pEx.getMessage());
@@ -329,7 +332,8 @@ public class ParserTestCase extends TestCase {
 	public void testParseDeclareParentsWithTypeParameterList() {
 		try {
 			PatternParser parser = new PatternParser("declare parents<T> : Foo<T> implements IveGoneMad");
-			DeclareParents decp = (DeclareParents) parser.parseDeclare();
+			//DeclareParents decp = (DeclareParents) 
+			  parser.parseDeclare();
 //			String[] tvp = decp.getTypeParameterNames();
 //			assertEquals("one type parameter",1,tvp.length);
 //			assertEquals("expecting T","T",tvp[0]);
@@ -342,7 +346,8 @@ public class ParserTestCase extends TestCase {
 	public void testParameterizedTypePatternsAny() {
 		try {
 			PatternParser parser = new PatternParser("*<T,S extends Number>");
-			WildTypePattern wtp = (WildTypePattern) parser.parseTypePattern(false,false);
+//			WildTypePattern wtp = (WildTypePattern) 
+				parser.parseTypePattern(false,false);
 	//		TypePatternList tvs = wtp.getTypeParameters();
 	//		assertEquals("2 type parameters",2,tvs.getTypePatterns().length);
 	//		assertEquals("T",new PatternParser("T").parseTypePattern(),tvs.getTypePatterns()[0]);
@@ -388,7 +393,9 @@ public class ParserTestCase extends TestCase {
 	public void testSimpleTypeVariableListError() {
 		PatternParser parser = new PatternParser("<T extends Number>");
 		try {
-			String[] tl = parser.maybeParseSimpleTypeVariableList();
+//			String[] tl = 
+				parser.maybeParseSimpleTypeVariableList();
+			fail();
 		} catch (ParserException ex) {
 			assertEquals("Expecting ',' or '>'","',' or '>'",ex.getMessage());
 		}	
@@ -398,7 +405,7 @@ public class ParserTestCase extends TestCase {
 	public void testParseCallPCDWithTypeVariables() {
 		PatternParser parser = new PatternParser("call<T>(* Foo<T>.*(T))");
 		try {
-			Pointcut pc = parser.parsePointcut();
+			parser.parsePointcut();
 //			String[] tvps = pc.getTypeVariablesInScope();
 //			assertEquals("1 type variable",1,tvps.length);
 //			assertEquals("T",tvps[0]);
@@ -551,7 +558,8 @@ public class ParserTestCase extends TestCase {
 	public void testExecutionWithTypeVariables() {
 		PatternParser parser = new PatternParser("execution<T>(T Bar<T>.doSomething())");
 		try {
-			Pointcut pc = parser.parsePointcut();
+//			Pointcut pc = 
+				parser.parsePointcut();
 //			String[] tvs = pc.getTypeVariablesInScope();
 //			assertEquals("1 type pattern",1,tvs.length);
 //			assertEquals("T",tvs[0]);
@@ -564,7 +572,8 @@ public class ParserTestCase extends TestCase {
 	public void testInitializationWithTypeVariables() {
 		PatternParser parser = new PatternParser("initialization<T>(Bar<T>.new())");
 		try {
-			Pointcut pc = parser.parsePointcut();
+//			Pointcut pc = 
+				parser.parsePointcut();
 //			String[] tvs = pc.getTypeVariablesInScope();
 //			assertEquals("1 type pattern",1,tvs.length);
 //			assertEquals("T",tvs[0]);		
@@ -577,7 +586,8 @@ public class ParserTestCase extends TestCase {
 	public void testPreInitializationWithTypeVariables() {
 		PatternParser parser = new PatternParser("preinitialization<T>(Bar<T>.new())");
 		try {
-			Pointcut pc = parser.parsePointcut();
+//			Pointcut pc = 
+				parser.parsePointcut();
 //			String[] tvs = pc.getTypeVariablesInScope();
 //			assertEquals("1 type pattern",1,tvs.length);
 //			assertEquals("T",tvs[0]);		
@@ -590,7 +600,7 @@ public class ParserTestCase extends TestCase {
 	public void testStaticInitializationWithTypeVariables() {
 		PatternParser parser = new PatternParser("staticinitialization<T>(Bar<T>)");
 		try {
-			Pointcut pc = parser.parsePointcut();
+			parser.parsePointcut();
 //			String[] tvs = pc.getTypeVariablesInScope();
 //			assertEquals("1 type pattern",1,tvs.length);
 //			assertEquals("T",tvs[0]);		
@@ -603,7 +613,7 @@ public class ParserTestCase extends TestCase {
 	public void testWithinWithTypeVariables() {
 		PatternParser parser = new PatternParser("within<T>(Bar<T>)");
 		try {
-		Pointcut pc = parser.parsePointcut();
+			parser.parsePointcut();
 	//		String[] tvs = pc.getTypeVariablesInScope();
 	//		assertEquals("1 type pattern",1,tvs.length);
 	//		assertEquals("T",tvs[0]);		
@@ -616,7 +626,7 @@ public class ParserTestCase extends TestCase {
 	public void testTypeParamList() {
 		PatternParser parser = new PatternParser("Bar<T,S extends T, R extends S>");
 		try {
-			TypePattern tp = parser.parseTypePattern(false,false);
+			parser.parseTypePattern(false,false);
 //			TypePattern[] tps = tp.getTypeParameters().getTypePatterns();
 //			assertEquals("3 type patterns",3,tps.length);
 //			assertEquals("T",tps[0].toString());
@@ -631,7 +641,7 @@ public class ParserTestCase extends TestCase {
 	public void testWithinCodeWithTypeVariables() {
 		PatternParser parser = new PatternParser("withincode<T,S,R>(Bar<T,S extends T, R extends S>.new())");
 		try {
-		Pointcut pc = parser.parsePointcut();
+			parser.parsePointcut();
 //			String[] tvs = pc.getTypeVariablesInScope();
 //			assertEquals("3 type patterns",3,tvs.length);
 //			assertEquals("T",tvs[0]);
@@ -646,7 +656,8 @@ public class ParserTestCase extends TestCase {
 	public void testCallWithTypeVariables() {
 		PatternParser parser = new PatternParser("call<T>(* Bar<T>.*(..))");
 		try {
-			Pointcut pc = parser.parsePointcut();
+//			Pointcut pc = 
+				parser.parsePointcut();
 //			String[] tvs = pc.getTypeVariablesInScope();
 //			assertEquals("1 type pattern",1,tvs.length);
 //			assertEquals("T",tvs[0]);		
@@ -659,7 +670,8 @@ public class ParserTestCase extends TestCase {
 	public void testGetWithTypeVariables() {
 		PatternParser parser = new PatternParser("get<T>(* Bar<T>.*)");
 		try {
-			Pointcut pc = parser.parsePointcut();
+//			Pointcut pc = 
+				parser.parsePointcut();
 //			String[] tvs = pc.getTypeVariablesInScope();
 //			assertEquals("1 type pattern",1,tvs.length);
 //			assertEquals("T",tvs[0]);		
@@ -672,7 +684,8 @@ public class ParserTestCase extends TestCase {
 	public void testSetWithTypeVariables() {
 		PatternParser parser = new PatternParser("set<T>(* Bar<T>.*)");
 		try {
-			Pointcut pc = parser.parsePointcut();
+//			Pointcut pc = 
+				parser.parsePointcut();
 //			String[] tvs = pc.getTypeVariablesInScope();
 //			assertEquals("1 type pattern",1,tvs.length);
 //			assertEquals("T",tvs[0]);		
diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/PointcutRewriterTest.java b/weaver/testsrc/org/aspectj/weaver/patterns/PointcutRewriterTest.java
index 20c6a4064..f6b96ef2c 100644
--- a/weaver/testsrc/org/aspectj/weaver/patterns/PointcutRewriterTest.java
+++ b/weaver/testsrc/org/aspectj/weaver/patterns/PointcutRewriterTest.java
@@ -180,7 +180,8 @@ public class PointcutRewriterTest extends TestCase {
 	
 	public void testNotRemoveNearlyDuplicatesInAnd() {
 		Pointcut toAndto = getPointcut("this(Object+) && this(Object)");
-		Pointcut rewritten = prw.rewrite(toAndto);
+//		Pointcut rewritten = 
+			prw.rewrite(toAndto);
 	}
 	
 	public void testAAndNotAinAnd() {
diff --git a/weaver/testsrc/org/aspectj/weaver/patterns/WildTypePatternResolutionTestCase.java b/weaver/testsrc/org/aspectj/weaver/patterns/WildTypePatternResolutionTestCase.java
index de3fa0222..2e8de7c73 100644
--- a/weaver/testsrc/org/aspectj/weaver/patterns/WildTypePatternResolutionTestCase.java
+++ b/weaver/testsrc/org/aspectj/weaver/patterns/WildTypePatternResolutionTestCase.java
@@ -58,7 +58,7 @@ import org.aspectj.weaver.bcel.BcelWorld;
 		 assertEquals("Ljava/util/List;",rt.getSignature());
 		 assertTrue(rt.isRawType());
 		 
-		 ExactTypePattern etp = (ExactTypePattern) writeAndRead((ExactTypePattern)rtp);
+		 ExactTypePattern etp = (ExactTypePattern) writeAndRead(rtp);
 		 exactType = etp.getExactType();
 
 		 assertEquals("Ljava/util/List;",exactType.getSignature());
@@ -92,7 +92,7 @@ import org.aspectj.weaver.bcel.BcelWorld;
 		 assertEquals("Pjava/util/List<Ljava/lang/String;>;",rt.getSignature());
 		 assertTrue(rt.isParameterizedType());
 
-		 ExactTypePattern etp = (ExactTypePattern) writeAndRead((ExactTypePattern)rtp);
+		 ExactTypePattern etp = (ExactTypePattern) writeAndRead(rtp);
 		 exactType = etp.getExactType();
 
 		 assertEquals("Pjava/util/List<Ljava/lang/String;>;",rt.getSignature());
diff --git a/weaver/testsrc/org/aspectj/weaver/tools/PointcutDesignatorHandlerTests.java b/weaver/testsrc/org/aspectj/weaver/tools/PointcutDesignatorHandlerTests.java
index 690f64d32..5e7d40d0b 100644
--- a/weaver/testsrc/org/aspectj/weaver/tools/PointcutDesignatorHandlerTests.java
+++ b/weaver/testsrc/org/aspectj/weaver/tools/PointcutDesignatorHandlerTests.java
@@ -77,7 +77,8 @@ public class PointcutDesignatorHandlerTests extends TestCase {
         // public void testBean1SetAge() { }
 
         // This should be found and resolved
-        PointcutExpression pc = parser.parsePointcutExpression("CounterAspect.testBean1SetAge()");
+//        PointcutExpression pc = 
+        	parser.parsePointcutExpression("CounterAspect.testBean1SetAge()");
 
     }