findbugs/eclipse warnings fixed

2 files changed, 7 insertions, 35 deletions

diff --git a/testing-drivers/testsrc/org/aspectj/testing/drivers/AjctestsAdapter.java b/testing-drivers/testsrc/org/aspectj/testing/drivers/AjctestsAdapter.java
index bc224ee69..05efb60e6 100644
--- a/testing-drivers/testsrc/org/aspectj/testing/drivers/AjctestsAdapter.java
+++ b/testing-drivers/testsrc/org/aspectj/testing/drivers/AjctestsAdapter.java
@@ -80,7 +80,7 @@ public class AjctestsAdapter extends TestSuite {
             log("loading " + tests.length + " tests in " + suitePath);
         }
         for (int i = 0; i < tests.length; i++) {
-            AjcTest.Spec ajcTest = (AjcTest.Spec) tests[i];
+            AjcTest.Spec ajcTest = tests[i];
             result.addTest(new AjcTestSpecAsTest(ajcTest, result));
         }
         return result;
@@ -244,9 +244,9 @@ public class AjctestsAdapter extends TestSuite {
     public static class SpecTests {
         private static final HashMap TESTS = new HashMap();
 
-        private static void putSpecTestsFor(String id, SpecTests tests) {
-            TESTS.put(id, tests);
-        }
+//        private static void putSpecTestsFor(String id, SpecTests tests) {
+//            TESTS.put(id, tests);
+//        }
 
         private static SpecTests getSpecTestsFor(String id) {
             SpecTests result = (SpecTests) TESTS.get(id);
@@ -255,35 +255,7 @@ public class AjctestsAdapter extends TestSuite {
             }
             return result;
         }
-
-        private static String safeName(String name) {
-            return HarnessJUnitUtil.cleanTestName(name); 
-        }
-
-        private static String filename(String path) {            
-            if (null == path) {
-                throw new IllegalArgumentException("null path");
-            }
-            int loc = path.lastIndexOf(File.pathSeparator);
-            if (-1 != loc) {
-                path = path.substring(loc+1);
-            }
-            loc = path.lastIndexOf('/');
-            if (-1 != loc) {
-                path = path.substring(loc+1);
-            }
-            loc = path.lastIndexOf(".");
-            if (-1 != loc) {
-                path = path.substring(0, loc);
-            }
-            return path;
-        }
-
-        private static String classnameToPath(String classname) {
-            return classname.replace('.', File.separatorChar) + ".class";
-        }
-
-
+        
         // ------------------------------------
         final AjctestsAdapter mAjctestsAdapter;
 
@@ -296,7 +268,7 @@ public class AjctestsAdapter extends TestSuite {
             for (int i = 0; i < tests.length; i++) {
                 map.put(tests[i].getDescription(), tests[i]);
             }
-            ;
+            
             mDescriptionToAjcTestSpec = Collections.unmodifiableMap(map);
         }
 
diff --git a/testing-drivers/testsrc/org/aspectj/testing/drivers/HarnessJUnitUtil.java b/testing-drivers/testsrc/org/aspectj/testing/drivers/HarnessJUnitUtil.java
index 24419a189..d3e05f84c 100644
--- a/testing-drivers/testsrc/org/aspectj/testing/drivers/HarnessJUnitUtil.java
+++ b/testing-drivers/testsrc/org/aspectj/testing/drivers/HarnessJUnitUtil.java
@@ -149,7 +149,7 @@ public class HarnessJUnitUtil {
                 String m = safeTestName(test) + " " + description;
                 throw new Error(m);
             } else if (isFailure) {
-                String m = safeTestName(test) + " " + description;
+//                String m = safeTestName(test) + " " + description;
                 throw new AssertionFailedError(description);
             } // no need to log success
         }