this commit eliminates all bar 2 of the 60 odd compilation warnings in the ajde module

8 files changed, 69 insertions, 69 deletions

diff --git a/ajde/testsrc/org/aspectj/ajde/AjdeTestCase.java b/ajde/testsrc/org/aspectj/ajde/AjdeTestCase.java
index feaac5e72..9dfbe6cf8 100644
--- a/ajde/testsrc/org/aspectj/ajde/AjdeTestCase.java
+++ b/ajde/testsrc/org/aspectj/ajde/AjdeTestCase.java
@@ -21,7 +21,7 @@ import junit.framework.TestCase;
 
 public class AjdeTestCase extends TestCase {
 
-	private static final String TEST_DATA_PATH = AjdeTests.testDataPath(null);
+//	private static final String TEST_DATA_PATH = AjdeTests.testDataPath(null);
 
 	protected NullIdeManager ideManager = NullIdeManager.getIdeManager();
 	protected TestBuildListener testerBuildListener = new TestBuildListener();
diff --git a/ajde/testsrc/org/aspectj/ajde/AsmRelationshipsTest.java b/ajde/testsrc/org/aspectj/ajde/AsmRelationshipsTest.java
index a5f0d5f60..ce89a6c6a 100644
--- a/ajde/testsrc/org/aspectj/ajde/AsmRelationshipsTest.java
+++ b/ajde/testsrc/org/aspectj/ajde/AsmRelationshipsTest.java
@@ -62,7 +62,7 @@ public class AsmRelationshipsTest extends AjdeTestCase {
 				"declare parents: implements Serializable"/*Point"*/);
 		
 		assertNotNull(dp);
-		List relations = manager.getRelationshipMap().get(dp);
+		/*List relations = */manager.getRelationshipMap().get(dp);
 				
 		List rels = AsmManager.getDefault().getRelationshipMap().get(dp);
 		assertTrue(rels.size()>0);
diff --git a/ajde/testsrc/org/aspectj/ajde/BuildOptionsTest.java b/ajde/testsrc/org/aspectj/ajde/BuildOptionsTest.java
index 072596daa..e0eaa9f3d 100644
--- a/ajde/testsrc/org/aspectj/ajde/BuildOptionsTest.java
+++ b/ajde/testsrc/org/aspectj/ajde/BuildOptionsTest.java
@@ -48,10 +48,10 @@ public class BuildOptionsTest extends AjdeTestCase {
 		assertTrue("character encoding", buildOptions.getCharacterEncoding().equals("mumble"));
 	}
 	
-	public void testPortingMode() {
-		buildOptions.setPortingMode(true);
-		assertTrue("porting mode", buildOptions.getPortingMode());
-	}
+//	public void testPortingMode() {
+//		buildOptions.setPortingMode(true);
+//		assertTrue("porting mode", buildOptions.getPortingMode());
+//	}
 
 	public void testVerboseMode() {
 		buildOptions.setVerboseMode(true);
@@ -153,7 +153,7 @@ public class BuildOptionsTest extends AjdeTestCase {
 	protected void tearDown() throws Exception {
 		super.tearDown();
 		buildOptions.setCharacterEncoding("");
-		buildOptions.setPortingMode(true);
+//		buildOptions.setPortingMode(true);
 	}
 }
 
diff --git a/ajde/testsrc/org/aspectj/ajde/ExtensionTests.java b/ajde/testsrc/org/aspectj/ajde/ExtensionTests.java
index be80a5716..db0e37cbd 100644
--- a/ajde/testsrc/org/aspectj/ajde/ExtensionTests.java
+++ b/ajde/testsrc/org/aspectj/ajde/ExtensionTests.java
@@ -12,7 +12,7 @@ package org.aspectj.ajde;
 
 import java.util.Iterator;
 import java.util.List;
-import java.util.Properties;
+//import java.util.Properties;
 import java.io.File;
 
 import org.aspectj.asm.AsmManager;
@@ -58,8 +58,8 @@ public class ExtensionTests extends AjcTestCase {
 	public void testInnerClassesInASM() {
 		String[] args = new String[] {"InnerClasses.java","-emacssym"};
 		CompilationResult result = ajc(baseDir,args);
-		List l = result.getWarningMessages();
-		Properties p = AsmManager.ModelInfo.summarizeModel().getProperties();
+		/*List l = */result.getWarningMessages();
+		/*Properties p = */AsmManager.ModelInfo.summarizeModel().getProperties();
 		if (debugTests) System.out.println("Structure Model for InnerClasses.java:");
 		walkit(AsmManager.getDefault().getHierarchy().getRoot(),0);
 		foundNode = null;
diff --git a/ajde/testsrc/org/aspectj/ajde/GenericsTest.java b/ajde/testsrc/org/aspectj/ajde/GenericsTest.java
index 8eab9614d..b95dec1bd 100644
--- a/ajde/testsrc/org/aspectj/ajde/GenericsTest.java
+++ b/ajde/testsrc/org/aspectj/ajde/GenericsTest.java
@@ -10,16 +10,16 @@
  *******************************************************************************/
 package org.aspectj.ajde;
 
-import org.aspectj.asm.AsmManager;
+//import org.aspectj.asm.AsmManager;
 
 /**
  * @author Mik Kersten
  */
 public class GenericsTest extends AjdeTestCase {
     
-    private AsmManager manager = null;
+    //private AsmManager manager = null;
     // TODO-path
-	private static final String CONFIG_FILE_PATH = "../bug-83565/build.lst";
+	//private static final String CONFIG_FILE_PATH = "../bug-83565/build.lst";
  
 	public void testBuild() {	
 //	    assertTrue("build success", doSynchronousBuild(CONFIG_FILE_PATH));	
@@ -27,7 +27,7 @@ public class GenericsTest extends AjdeTestCase {
 	
 	protected void setUp() throws Exception {
 		super.setUp("examples");
-		manager = AsmManager.getDefault();
+		//manager = AsmManager.getDefault();
 	}
     
 }
diff --git a/ajde/testsrc/org/aspectj/ajde/ReweavableTestCase.java b/ajde/testsrc/org/aspectj/ajde/ReweavableTestCase.java
index f678afae6..55c33dd12 100644
--- a/ajde/testsrc/org/aspectj/ajde/ReweavableTestCase.java
+++ b/ajde/testsrc/org/aspectj/ajde/ReweavableTestCase.java
@@ -36,10 +36,10 @@ public class ReweavableTestCase extends AjdeTestCase {
 	public static final String outjarName = "/bin/output.jar";
 
 
-	private static int nonreweavesize_CalculatePI;
-	private static int nonreweavesize_Logger;
-	private static int reweavablesize_CalculatePI;
-	private static int reweavablesize_Logger;
+//	private static int nonreweavesize_CalculatePI;
+//	private static int nonreweavesize_Logger;
+//	private static int reweavablesize_CalculatePI;
+//	private static int reweavablesize_Logger;
 			
 	/**
 	 * Constructor for JarResourceCopyTestCase.
@@ -90,8 +90,8 @@ public class ReweavableTestCase extends AjdeTestCase {
 		if (debugTests) System.out.println("CalculatePI.class is of size: "+fCalc.length());
 		if (debugTests) System.out.println("Logger.class is of size: "+fLog.length());
 		if (debugTests) System.out.println("\n\n\n");
-		nonreweavesize_CalculatePI = (int)fCalc.length();
-		nonreweavesize_Logger = (int)fLog.length();
+		/*nonreweavesize_CalculatePI = (int)*/fCalc.length();
+		/*nonreweavesize_Logger = (int)*/fLog.length();
 	}
 
 
@@ -134,8 +134,8 @@ public class ReweavableTestCase extends AjdeTestCase {
 //		assertTrue("Reweavable version should be larger than non-reweavable version of Logger",
 //		  fLog.length()>nonreweavesize_Logger);
 
-		reweavablesize_CalculatePI = (int)fCalc.length();
-		reweavablesize_Logger = (int)fLog.length();
+		/*reweavablesize_CalculatePI = (int)*/fCalc.length();
+		/*reweavablesize_Logger = (int)*/fLog.length();
 		
 		if (debugTests) System.out.println("\n\n\n");
 	}
diff --git a/ajde/testsrc/org/aspectj/ajde/ShowWeaveMessagesTestCase.java b/ajde/testsrc/org/aspectj/ajde/ShowWeaveMessagesTestCase.java
index e65181303..826c9a6ee 100644
--- a/ajde/testsrc/org/aspectj/ajde/ShowWeaveMessagesTestCase.java
+++ b/ajde/testsrc/org/aspectj/ajde/ShowWeaveMessagesTestCase.java
@@ -201,7 +201,7 @@ public class ShowWeaveMessagesTestCase extends AjdeTestCase {
 		aspectpath.add(openFile("AspectAdvice.jar"));
 		ideManager.getProjectProperties().setAspectPath(aspectpath);
 		assertTrue("Build failed", doSynchronousBuild("Empty.lst"));
-        List l = ideManager.getCompilationSourceLineTasks();
+        /*List l = */ideManager.getCompilationSourceLineTasks();
         verifyWeavingMessages("advice.binary",true);
 	}
 	
@@ -214,7 +214,7 @@ public class ShowWeaveMessagesTestCase extends AjdeTestCase {
 		aspectpath.add(openFile("AspectITD.jar"));
 		ideManager.getProjectProperties().setAspectPath(aspectpath);
 		assertTrue("Build failed", doSynchronousBuild("Empty.lst"));
-		List l = ideManager.getCompilationSourceLineTasks();
+		/*List l = */ideManager.getCompilationSourceLineTasks();
 		verifyWeavingMessages("itd",false);
 	}
 
@@ -260,7 +260,7 @@ public class ShowWeaveMessagesTestCase extends AjdeTestCase {
 		aspectpath.add(openFile("AspectAdvice_nodebug.jar"));
 		ideManager.getProjectProperties().setAspectPath(aspectpath);
 		assertTrue("Build failed", doSynchronousBuild("Empty.lst"));
-		List l = ideManager.getCompilationSourceLineTasks();
+		/*List l = */ideManager.getCompilationSourceLineTasks();
 		verifyWeavingMessages("advice.binary.nodebug",true);
 	}
 	
@@ -273,7 +273,7 @@ public class ShowWeaveMessagesTestCase extends AjdeTestCase {
 		aspectpath.add(openFile("AspectITD_nodebug.jar"));
 		ideManager.getProjectProperties().setAspectPath(aspectpath);
 		assertTrue("Build failed", doSynchronousBuild("Empty.lst"));
-		List l = ideManager.getCompilationSourceLineTasks();
+		/*List l = */ideManager.getCompilationSourceLineTasks();
 		verifyWeavingMessages("itd.nodebug",true);
 	}
 	
diff --git a/ajde/testsrc/org/aspectj/ajde/internal/LstBuildConfigManagerTest.java b/ajde/testsrc/org/aspectj/ajde/internal/LstBuildConfigManagerTest.java
index 493bc80e6..aca06e87e 100644
--- a/ajde/testsrc/org/aspectj/ajde/internal/LstBuildConfigManagerTest.java
+++ b/ajde/testsrc/org/aspectj/ajde/internal/LstBuildConfigManagerTest.java
@@ -118,51 +118,51 @@ public class LstBuildConfigManagerTest extends AjdeTestCase {
 //	private static final String BAD_PATHS_FILE = "C:/Dev/aspectj/tests/ajde/examples/figures-coverage/test-error.lst";
 //	private static final String INCLUDES_FILE = "C:/Dev/aspectj/tests/ajde/examples/spacewar/spacewar/demo.lst";
 
-	private static final String WILDCARDS_FILE_CONTENTS;
-	private static final String BAD_PATHS_FILE_CONTENTS;
-	private static final String INCLUDES_FILE_CONTENTS;
+//	private static final String WILDCARDS_FILE_CONTENTS;
+//	private static final String BAD_PATHS_FILE_CONTENTS;
+//	private static final String INCLUDES_FILE_CONTENTS;
 	
 	static {
-		WILDCARDS_FILE_CONTENTS = 
-			"figures/Debug.java;" +
-			"figures/Figure.java;" +
-			"figures/FigureElement.java;" +
-			"figures/Main.java;" +
-			"figures/composites/Line.java;" +
-			"figures/composites/Square.java;" +
-			"figures/primitives/planar/Point.java;" +
-			"figures/primitives/solid/SolidPoint.java;";
-
-		BAD_PATHS_FILE_CONTENTS = WILDCARDS_FILE_CONTENTS;
-
-        // TODO-path
-		INCLUDES_FILE_CONTENTS =
-			"../coordination/Condition.java;" +
-			"../coordination/CoordinationAction.java;" +
-			"../coordination/Coordinator.java;" +
-			"../coordination/Exclusion.java;" +
-			"../coordination/MethodState.java;" +
-			"../coordination/Mutex.java;" +
-			"../coordination/Selfex.java;" +
-			"../coordination/TimeoutException.java;" +
-			"Bullet.java;" +
-			"Display.java;" +
-			"Display1.java;" +
-			"Display2.java;" +
-			"EnergyPacket.java;" +
-			"EnergyPacketProducer.java;" +
-			"EnsureShipIsAlive.java;" +
-			"Game.java;" +
-			"GameSynchronization.java;" +
-			"Pilot.java;" +
-			"Player.java;" +
-			"Registry.java;" +
-			"RegistrySynchronization.java;" +
-			"Robot.java;" +
-			"SWFrame.java;" +
-			"Ship.java;" +
-			"SpaceObject.java;" +
-			"Timer.java;";
+//		WILDCARDS_FILE_CONTENTS = 
+//			"figures/Debug.java;" +
+//			"figures/Figure.java;" +
+//			"figures/FigureElement.java;" +
+//			"figures/Main.java;" +
+//			"figures/composites/Line.java;" +
+//			"figures/composites/Square.java;" +
+//			"figures/primitives/planar/Point.java;" +
+//			"figures/primitives/solid/SolidPoint.java;";
+
+//		BAD_PATHS_FILE_CONTENTS = WILDCARDS_FILE_CONTENTS;
+//
+//        // TODO-path
+//		INCLUDES_FILE_CONTENTS =
+//			"../coordination/Condition.java;" +
+//			"../coordination/CoordinationAction.java;" +
+//			"../coordination/Coordinator.java;" +
+//			"../coordination/Exclusion.java;" +
+//			"../coordination/MethodState.java;" +
+//			"../coordination/Mutex.java;" +
+//			"../coordination/Selfex.java;" +
+//			"../coordination/TimeoutException.java;" +
+//			"Bullet.java;" +
+//			"Display.java;" +
+//			"Display1.java;" +
+//			"Display2.java;" +
+//			"EnergyPacket.java;" +
+//			"EnergyPacketProducer.java;" +
+//			"EnsureShipIsAlive.java;" +
+//			"Game.java;" +
+//			"GameSynchronization.java;" +
+//			"Pilot.java;" +
+//			"Player.java;" +
+//			"Registry.java;" +
+//			"RegistrySynchronization.java;" +
+//			"Robot.java;" +
+//			"SWFrame.java;" +
+//			"Ship.java;" +
+//			"SpaceObject.java;" +
+//			"Timer.java;";
 	}
 }