[pkg-java] r4015 - trunk/aspectj/debian/patches

[tgg at alioth.debian.org]

Author: tgg
Date: 2007-08-14 17:58:28 +0000 (Tue, 14 Aug 2007)
New Revision: 4015

Modified:
   trunk/aspectj/debian/patches/02_use_gjdoc.diff
Log:
rework the 02_use_gjdoc patch, it was missing another com.sun.tools.javadoc call


Modified: trunk/aspectj/debian/patches/02_use_gjdoc.diff
===================================================================
--- trunk/aspectj/debian/patches/02_use_gjdoc.diff	2007-08-14 12:59:09 UTC (rev 4014)
+++ trunk/aspectj/debian/patches/02_use_gjdoc.diff	2007-08-14 17:58:28 UTC (rev 4015)
@@ -33,7 +33,7 @@
  			Class[] paramTypes = new Class[] {String[].class};
  			jdMainClass.getMethod("execute", paramTypes);
          } catch (NoClassDefFoundError e) {
-@@ -65,7 +76,7 @@
+@@ -65,14 +76,13 @@
  
          try {
          	// for JDK 1.4 and above call the execute method...
@@ -42,7 +42,15 @@
          	Method executeMethod = null;
  			try {
  				Class[] paramTypes = new Class[] {String[].class};
-@@ -90,6 +101,9 @@
+ 				executeMethod = jdMainClass.getMethod("execute", paramTypes);
+ 			} catch (NoSuchMethodException e) {
+-				 com.sun.tools.javadoc.Main.main(javadocargs); 
+-//				throw new UnsupportedOperationException("ajdoc requires a tools library from JDK 1.4 or later.");
++				throw new UnsupportedOperationException("ajdoc requires a tools library from JDK 1.4 or later.");
+ 			}
+ 			try {
+ 				executeMethod.invoke(null, new Object[] {javadocargs});
+@@ -90,6 +100,9 @@
              // Do nothing since we expect it to be thrown
              //System.out.println( ">> se: " + se.getMessage() );
          }