Author: malat-guest Date: 2011-08-26 13:17:21 +0000 (Fri, 26 Aug 2011) New Revision: 14503
Modified: trunk/fop/debian/patches/04_fixqdoxbuildfailure.patch Log: add exception Modified: trunk/fop/debian/patches/04_fixqdoxbuildfailure.patch =================================================================== --- trunk/fop/debian/patches/04_fixqdoxbuildfailure.patch 2011-08-26 12:41:07 UTC (rev 14502) +++ trunk/fop/debian/patches/04_fixqdoxbuildfailure.patch 2011-08-26 13:17:21 UTC (rev 14503) @@ -12,7 +12,7 @@ Index: fop-1.0/build.xml =================================================================== --- fop-1.0.orig/build.xml 2010-07-12 21:34:37.000000000 +0200 -+++ fop-1.0/build.xml 2011-08-26 14:35:27.000000000 +0200 ++++ fop-1.0/build.xml 2011-08-26 15:15:10.000000000 +0200 @@ -149,8 +149,8 @@ <property name="javac.debug" value="on"/> <property name="javac.optimize" value="off"/> @@ -36,14 +36,14 @@ Index: fop-1.0/fop.mf =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ fop-1.0/fop.mf 2011-08-26 14:35:27.000000000 +0200 ++++ fop-1.0/fop.mf 2011-08-26 15:15:10.000000000 +0200 @@ -0,0 +1,2 @@ +Class-Path: xercesImpl.jar xalan2.jar bsf.jar avalon-framework.jar batik.jar commons-io.jar commons-logging.jar xmlgraphics-commons.jar xml-commons-external.jar + Index: fop-1.0/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java =================================================================== --- fop-1.0.orig/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java 2010-07-12 21:34:46.000000000 +0200 -+++ fop-1.0/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java 2011-08-26 14:35:39.000000000 +0200 ++++ fop-1.0/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java 2011-08-26 15:15:57.000000000 +0200 @@ -15,13 +15,12 @@ * limitations under the License. */ @@ -81,16 +81,24 @@ /** * Creates a new EventProducerCollector. -@@ -139,7 +138,7 @@ +@@ -139,10 +138,15 @@ throws EventConventionException, ClassNotFoundException { JavaClass clazz = method.getParentClass(); //Check EventProducer conventions - if (!method.getReturns().isVoid()) { ++ try { + if (!method.getReturnType().isVoid()) { throw new EventConventionException("All methods of interface " + clazz.getFullyQualifiedName() + " must have return type 'void'!"); } -@@ -168,10 +167,10 @@ ++ } catch ( java.lang.NullPointerException e ) { ++ System.err.printf("Exception %s %s\n", e.toString(), clazz.toString()); ++ e.printStackTrace(); ++ } + String methodSig = clazz.getFullyQualifiedName() + "." + method.getCallSignature(); + JavaParameter[] params = method.getParameters(); + if (params.length < 1) { +@@ -168,10 +172,10 @@ if (params.length > 1) { for (int j = 1, cj = params.length; j < cj; j++) { JavaParameter p = params[j]; @@ -103,7 +111,7 @@ if (type == null) { throw new UnsupportedOperationException( "Primitive datatype not supported: " + pClass.getName()); -@@ -197,7 +196,7 @@ +@@ -197,7 +201,7 @@ * Returns the event model that has been accumulated. * @return the event model. */ _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits