[pkg-java] r14500 - trunk/fop/debian/patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-08-26 11:55:23 +0000 (Fri, 26 Aug 2011)
New Revision: 14500

Modified:
   trunk/fop/debian/patches/dump_exception.patch
Log:
Use directly change from fop/svn

Modified: trunk/fop/debian/patches/dump_exception.patch
===================================================================
--- trunk/fop/debian/patches/dump_exception.patch	2011-08-26 09:59:10 UTC (rev 14499)
+++ trunk/fop/debian/patches/dump_exception.patch	2011-08-26 11:55:23 UTC (rev 14500)
@@ -1,8 +1,8 @@
 Dump exception, as suggest on bug #639162
 Index: fop-1.0/src/java/org/apache/fop/cli/Main.java
 ===================================================================
---- fop-1.0.orig/src/java/org/apache/fop/cli/Main.java	2011-08-25 15:34:31.000000000 +0200
-+++ fop-1.0/src/java/org/apache/fop/cli/Main.java	2011-08-25 15:34:49.000000000 +0200
+--- fop-1.0.orig/src/java/org/apache/fop/cli/Main.java	2010-07-12 21:34:44.000000000 +0200
++++ fop-1.0/src/java/org/apache/fop/cli/Main.java	2011-08-26 13:53:12.000000000 +0200
 @@ -186,6 +186,8 @@
                  System.exit(0);
              }
@@ -12,3 +12,17 @@
              if (options != null) {
                  options.getLogger().error("Exception", e);
                  if (options.getOutputFile() != null) {
+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	2011-08-26 13:53:23.000000000 +0200
++++ fop-1.0/src/codegen/java/org/apache/fop/tools/EventProducerCollector.java	2011-08-26 13:53:38.000000000 +0200
+@@ -122,9 +122,6 @@
+      */
+     protected void processEventProducerInterface(JavaClass clazz)
+                 throws EventConventionException, ClassNotFoundException {
+-    	if (clazz.getParentClass() == null || clazz.getParentClass().getName().equals("java.lang.Object")) {
+-    		return;
+-    	}
+         EventProducerModel prodMeta = new EventProducerModel(clazz.getFullyQualifiedName());
+         JavaMethod[] methods = clazz.getMethods(true);
+         for (int i = 0, c = methods.length; i < c; i++) {