Author: ssteiner
Date: Tue Feb 28 11:34:05 2017
New Revision: 1784726
URL: http://svn.apache.org/viewvc?rev=1784726&view=rev
Log:
FOP-2694: PDF plugin doesnt show which pdf failed
Modified:
xmlgraphics/fop-pdf-images/trunk/src/java/org/apache/fop/render/pdf/pdfbox/ImageConverterPDF2G2D.java
xmlgraphics/fop-pdf-images/trunk/src/java/org/apache/fop/render/pdf/pdfbox/PDFBoxImageHandler.java
xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/PDFBoxAdapterTestCase.java
Modified:
xmlgraphics/fop-pdf-images/trunk/src/java/org/apache/fop/render/pdf/pdfbox/ImageConverterPDF2G2D.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop-pdf-images/trunk/src/java/org/apache/fop/render/pdf/pdfbox/ImageConverterPDF2G2D.java?rev=1784726&r1=1784725&r2=1784726&view=diff
==============================================================================
---
xmlgraphics/fop-pdf-images/trunk/src/java/org/apache/fop/render/pdf/pdfbox/ImageConverterPDF2G2D.java
(original)
+++
xmlgraphics/fop-pdf-images/trunk/src/java/org/apache/fop/render/pdf/pdfbox/ImageConverterPDF2G2D.java
Tue Feb 28 11:34:05 2017
@@ -118,7 +118,7 @@ public class ImageConverterPDF2G2D exten
g2d.transform(at);
new PDFRenderer(pdDocument).renderPageToGraphics(selectedPage,
g2d);
} catch (Throwable t) {
- throw new RuntimeException("Error while painting PDF page: " +
uri, t);
+ throw new RuntimeException("Error while painting PDF page: " +
uri + " " + t.getMessage(), t);
}
}
Modified:
xmlgraphics/fop-pdf-images/trunk/src/java/org/apache/fop/render/pdf/pdfbox/PDFBoxImageHandler.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop-pdf-images/trunk/src/java/org/apache/fop/render/pdf/pdfbox/PDFBoxImageHandler.java?rev=1784726&r1=1784725&r2=1784726&view=diff
==============================================================================
---
xmlgraphics/fop-pdf-images/trunk/src/java/org/apache/fop/render/pdf/pdfbox/PDFBoxImageHandler.java
(original)
+++
xmlgraphics/fop-pdf-images/trunk/src/java/org/apache/fop/render/pdf/pdfbox/PDFBoxImageHandler.java
Tue Feb 28 11:34:05 2017
@@ -80,7 +80,8 @@ public class PDFBoxImageHandler extends
}
generator.placeImage(pageAdjust, stream);
} catch (Throwable t) {
- throw new RuntimeException("Error on PDF page: " +
pdfImage.getInfo().getOriginalURI(), t);
+ throw new RuntimeException(
+ "Error on PDF page: " +
pdfImage.getInfo().getOriginalURI() + " " + t.getMessage(), t);
}
}
Modified:
xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/PDFBoxAdapterTestCase.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/PDFBoxAdapterTestCase.java?rev=1784726&r1=1784725&r2=1784726&view=diff
==============================================================================
---
xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/PDFBoxAdapterTestCase.java
(original)
+++
xmlgraphics/fop-pdf-images/trunk/test/java/org/apache/fop/render/pdf/PDFBoxAdapterTestCase.java
Tue Feb 28 11:34:05 2017
@@ -445,7 +445,7 @@ public class PDFBoxAdapterTestCase {
} catch (RuntimeException e) {
msg = e.getMessage();
}
- Assert.assertEquals(msg, "Error while painting PDF page: " + ERROR);
+ Assert.assertTrue(msg.startsWith("Error while painting PDF page: " +
ERROR));
}
@Test
@@ -458,6 +458,6 @@ public class PDFBoxAdapterTestCase {
} catch (RuntimeException e) {
msg = e.getMessage();
}
- Assert.assertEquals(msg, "Error on PDF page: " + ERROR);
+ Assert.assertTrue(msg.startsWith("Error on PDF page: " + ERROR));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
