From a75ece053b07d2d95d482c51ddfce739fae17252 Mon Sep 17 00:00:00 2001 From: "aaron.verachtert" Date: Fri, 19 Jul 2024 10:21:47 +0200 Subject: [PATCH] Moved `org.xhtmlrenderer.simple.PDFRenderer` to `org.xhtmlrenderer.pdf.PDFRenderer` Changed to fix issue https://github.com/flyingsaucerproject/flyingsaucer/issues/349 --- README.md | 2 +- .../main/java/org/xhtmlrenderer/simple/ImageRenderer.java | 2 +- .../java/org/xhtmlrenderer/{simple => pdf}/PDFRenderer.java | 5 ++--- www/guide.bat | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) rename flying-saucer-pdf/src/main/java/org/xhtmlrenderer/{simple => pdf}/PDFRenderer.java (97%) diff --git a/README.md b/README.md index 6011c505d..072ca8fbf 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ build path, as well as the SWT JAR for your OS. Other notable entry points include: * `org.xhtmlrenderer.simple.XHTMLPanel` -* `org.xhtmlrenderer.simple.PDFRenderer` +* `org.xhtmlrenderer.pdf.PDFRenderer` * `org.xhtmlrenderer.simple.ImageRenderer` diff --git a/flying-saucer-core/src/main/java/org/xhtmlrenderer/simple/ImageRenderer.java b/flying-saucer-core/src/main/java/org/xhtmlrenderer/simple/ImageRenderer.java index d68af538c..f2b414cc2 100644 --- a/flying-saucer-core/src/main/java/org/xhtmlrenderer/simple/ImageRenderer.java +++ b/flying-saucer-core/src/main/java/org/xhtmlrenderer/simple/ImageRenderer.java @@ -52,7 +52,7 @@ * *

Image width must always be supplied; height is determined automatically.

* - * @see org.xhtmlrenderer.simple.PDFRenderer + * @see org.xhtmlrenderer.pdf.PDFRenderer * @author Pete Brant * @author Patrick Wright */ diff --git a/flying-saucer-pdf/src/main/java/org/xhtmlrenderer/simple/PDFRenderer.java b/flying-saucer-pdf/src/main/java/org/xhtmlrenderer/pdf/PDFRenderer.java similarity index 97% rename from flying-saucer-pdf/src/main/java/org/xhtmlrenderer/simple/PDFRenderer.java rename to flying-saucer-pdf/src/main/java/org/xhtmlrenderer/pdf/PDFRenderer.java index 8307c720d..7c9a3f0c2 100644 --- a/flying-saucer-pdf/src/main/java/org/xhtmlrenderer/simple/PDFRenderer.java +++ b/flying-saucer-pdf/src/main/java/org/xhtmlrenderer/pdf/PDFRenderer.java @@ -1,8 +1,7 @@ -package org.xhtmlrenderer.simple; +package org.xhtmlrenderer.pdf; import com.lowagie.text.DocumentException; import com.lowagie.text.pdf.PdfWriter; -import org.xhtmlrenderer.pdf.ITextRenderer; import javax.annotation.Nullable; import javax.annotation.ParametersAreNonnullByDefault; @@ -25,7 +24,7 @@ * the URL or file location as first parameter, and PDF path as second * parameter: *
- * java -cp %classpath% org.xhtmlrenderer.simple.PDFRenderer  
+ * java -cp %classpath% org.xhtmlrenderer.pdf.PDFRenderer  
  * 
* * @author Pete Brant diff --git a/www/guide.bat b/www/guide.bat index 41d8cd2fa..eb3020730 100644 --- a/www/guide.bat +++ b/www/guide.bat @@ -1,3 +1,3 @@ del users-guide-r7.pdf -java -cp ..\..\build\classes;..\..\lib\cssparser-0-9-4-fs.jar;..\..\lib\itext-paulo-155.jar org.xhtmlrenderer.simple.PDFRenderer d:\java\javanet\xhtmlrenderer\www\r7\users-guide-r7.html users-guide-r7.pdf +java -cp ..\..\build\classes;..\..\lib\cssparser-0-9-4-fs.jar;..\..\lib\itext-paulo-155.jar org.xhtmlrenderer.pdf.PDFRenderer d:\java\javanet\xhtmlrenderer\www\r7\users-guide-r7.html users-guide-r7.pdf start users-guide-r7.pdf