expanded test for tools.jar to cases where jar is available but VM can't load the...

diff --git a/ajdoc/src/org/aspectj/tools/ajdoc/JavadocRunner.java b/ajdoc/src/org/aspectj/tools/ajdoc/JavadocRunner.java
index ce2f028d6f190bbb4d37ebd3f54d362f9fc6d8c6..901af2949fa978e37457e4fa8904c3a4bb53f4c1 100644 (file)
--- a/ajdoc/src/org/aspectj/tools/ajdoc/JavadocRunner.java
+++ b/ajdoc/src/org/aspectj/tools/ajdoc/JavadocRunner.java
@@ -17,17 +17,23 @@ package org.aspectj.tools.ajdoc;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
+import org.aspectj.util.LangUtil;
+
 /**
  * @author Mik Kersten
  */
 class JavadocRunner {
        
        static boolean has14ToolsAvailable() {
-               Class jdMainClass = com.sun.tools.javadoc.Main.class;
                try {
+            Class jdMainClass = com.sun.tools.javadoc.Main.class;
                        Class[] paramTypes = new Class[] {String[].class};
                        jdMainClass.getMethod("execute", paramTypes);
-               } catch (NoSuchMethodException e) {
+        } catch (NoClassDefFoundError e) {
+            return false;
+        } catch (UnsupportedClassVersionError e) {
+            return false;
+        } catch (NoSuchMethodException e) {
                        return false;
                }
                return true;