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

[tgg at alioth.debian.org]

Author: tgg
Date: 2007-05-18 16:51:15 +0000 (Fri, 18 May 2007)
New Revision: 3518

Added:
   trunk/aspectj/debian/patches/02_use_gjdoc.diff
Log:
use gjdoc instead of com.sun.*


Added: trunk/aspectj/debian/patches/02_use_gjdoc.diff
===================================================================
--- trunk/aspectj/debian/patches/02_use_gjdoc.diff	                        (rev 0)
+++ trunk/aspectj/debian/patches/02_use_gjdoc.diff	2007-05-18 16:51:15 UTC (rev 3518)
@@ -0,0 +1,27 @@
+--- aspectj.orig/modules/ajdoc/src/org/aspectj/tools/ajdoc/JavadocRunner.java	2006-06-01 09:24:04.000000000 +0000
++++ aspectj/modules/ajdoc/src/org/aspectj/tools/ajdoc/JavadocRunner.java	2007-05-18 16:49:15.000000000 +0000
+@@ -24,7 +24,7 @@
+ 	
+ 	static boolean has14ToolsAvailable() {
+ 		try {
+-            Class jdMainClass = com.sun.tools.javadoc.Main.class;
++            Class jdMainClass = gnu.classpath.tools.gjdoc.Main.class;
+ 			Class[] paramTypes = new Class[] {String[].class};
+ 			jdMainClass.getMethod("execute", paramTypes);
+         } catch (NoClassDefFoundError e) {
+@@ -65,13 +65,13 @@
+ 
+         try {
+         	// for JDK 1.4 and above call the execute method...
+-        	Class jdMainClass = com.sun.tools.javadoc.Main.class;
++        	Class jdMainClass = gnu.classpath.tools.gjdoc.Main.class;
+         	Method executeMethod = null;
+ 			try {
+ 				Class[] paramTypes = new Class[] {String[].class};
+ 				executeMethod = jdMainClass.getMethod("execute", paramTypes);
+ 			} catch (NoSuchMethodException e) {
+-				 com.sun.tools.javadoc.Main.main(javadocargs); 
++				 gnu.classpath.tools.gjdoc.Main.main(javadocargs); 
+ //				throw new UnsupportedOperationException("ajdoc requires a tools library from JDK 1.4 or later.");
+ 			}
+ 			try {