resolving misc compiler warnings

ajde/testsrc/org/aspectj/ajde/BuildConfigurationTests.java

@@ -10,27 +10,21 @@ Adrian Colyer - initial version
 **********************************************************************/
 package org.aspectj.ajde;
 
+import org.aspectj.ajde.internal.CompilerAdapter;
+import org.aspectj.ajde.ui.UserPreferencesAdapter;
+import org.aspectj.ajde.ui.internal.AjcBuildOptions;
+import org.aspectj.ajde.ui.internal.UserPreferencesStore;
+import org.aspectj.ajdt.internal.core.builder.AjBuildConfig;
+import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
+
 import java.io.File;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import javax.swing.JFrame;
-
 import junit.framework.TestSuite;
 
-import org.aspectj.ajde.internal.CompilerAdapter;
-import org.aspectj.ajde.ui.IdeUIAdapter;
-import org.aspectj.ajde.ui.UserPreferencesAdapter;
-import org.aspectj.ajde.ui.internal.AjcBuildOptions;
-import org.aspectj.ajde.ui.internal.UserPreferencesStore;
-import org.aspectj.ajde.ui.swing.AjdeUIManager;
-import org.aspectj.ajde.ui.swing.BasicEditor;
-import org.aspectj.ajde.ui.swing.IconRegistry;
-import org.aspectj.ajdt.internal.core.builder.AjBuildConfig;
-import org.eclipse.jdt.internal.compiler.impl.CompilerOptions;
-
 /**
  * Tests that a correctly populated AjBuildConfig object is created
  * in reponse to the setting in BuildOptionsAdapter and 

ajde/testsrc/org/aspectj/ajde/ui/StructureViewManagerTest.java

@@ -20,7 +20,7 @@ import junit.framework.TestSuite;
 
 import org.aspectj.ajde.Ajde;
 import org.aspectj.ajde.AjdeTestCase;
-import org.aspectj.asm.StructureModelManager;
+import org.aspectj.asm.StructureModel;
 import org.aspectj.asm.StructureNode;
 
 /**
@@ -66,7 +66,7 @@ public class StructureViewManagerTest extends AjdeTestCase {
 		assertTrue(
 			"no structure", 
 			currentView.getRootNode().getStructureNode().getChildren().get(0) 
-			== StructureModelManager.INSTANCE.getStructureModel().NO_STRUCTURE
+			== StructureModel.NO_STRUCTURE
 		);			
 	}
 
@@ -87,7 +87,7 @@ public class StructureViewManagerTest extends AjdeTestCase {
 		assertTrue(
 			"no structure", 
 			currentView.getRootNode().getStructureNode().getChildren().get(0) 
-			== StructureModelManager.INSTANCE.getStructureModel().NO_STRUCTURE
+			== StructureModel.NO_STRUCTURE
 		);	
 	}
 
@@ -125,7 +125,7 @@ public class StructureViewManagerTest extends AjdeTestCase {
 		assertTrue(
 			"no structure", 
 			currentView.getRootNode().getStructureNode() 
-			== StructureModelManager.INSTANCE.getStructureModel().NO_STRUCTURE
+			== StructureModel.NO_STRUCTURE
 		);
 	}