You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2023/09/30 16:00:28 UTC
svn commit: r1912631 - in /pdfbox/branches/3.0: debugger/src/main/java/org/apache/pdfbox/debugger/ tools/src/main/java/org/apache/pdfbox/tools/
Author: lehmi
Date: Sat Sep 30 16:00:27 2023
New Revision: 1912631
URL: http://svn.apache.org/viewvc?rev=1912631&view=rev
Log:
PDFBOX-5667: don't hold System.out/System.err as static reference to avoid issues when testing the command line tools
Modified:
pdfbox/branches/3.0/debugger/src/main/java/org/apache/pdfbox/debugger/PDFDebugger.java
pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/DecompressObjectstreams.java
pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/Decrypt.java
pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/Encrypt.java
pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/ExportFDF.java
pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/ExportXFDF.java
pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/ExtractImages.java
pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/ExtractText.java
pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/ExtractXMP.java
pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/ImageToPDF.java
pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/ImportFDF.java
pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/ImportXFDF.java
pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/OverlayPDF.java
pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/PDFMerger.java
pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/PDFSplit.java
pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/PDFToImage.java
pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/PrintPDF.java
pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/TextToPDF.java
pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/Version.java
pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/WriteDecodedDoc.java
Modified: pdfbox/branches/3.0/debugger/src/main/java/org/apache/pdfbox/debugger/PDFDebugger.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/3.0/debugger/src/main/java/org/apache/pdfbox/debugger/PDFDebugger.java?rev=1912631&r1=1912630&r2=1912631&view=diff
==============================================================================
--- pdfbox/branches/3.0/debugger/src/main/java/org/apache/pdfbox/debugger/PDFDebugger.java (original)
+++ pdfbox/branches/3.0/debugger/src/main/java/org/apache/pdfbox/debugger/PDFDebugger.java Sat Sep 30 16:00:27 2023
@@ -209,7 +209,7 @@ public class PDFDebugger extends JFrame
// cli options
// Expected for CLI app to write to System.out/System.err
@SuppressWarnings("squid:S106")
- private static final PrintStream SYSERR = System.err;
+ private final PrintStream SYSERR = System.err;
@Option(names = { "-h", "--help" }, usageHelp = true, description = "display this help message")
boolean usageHelpRequested;
Modified: pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/DecompressObjectstreams.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/DecompressObjectstreams.java?rev=1912631&r1=1912630&r2=1912631&view=diff
==============================================================================
--- pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/DecompressObjectstreams.java (original)
+++ pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/DecompressObjectstreams.java Sat Sep 30 16:00:27 2023
@@ -41,7 +41,7 @@ public final class DecompressObjectstrea
{
// Expected for CLI app to write to System.out/System.err
@SuppressWarnings("squid:S106")
- private static final PrintStream SYSERR = System.err;
+ private final PrintStream SYSERR = System.err;
@Option(names = {"-h", "--help"}, usageHelp = true, description = "display this help message")
boolean usageHelpRequested;
Modified: pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/Decrypt.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/Decrypt.java?rev=1912631&r1=1912630&r2=1912631&view=diff
==============================================================================
--- pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/Decrypt.java (original)
+++ pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/Decrypt.java Sat Sep 30 16:00:27 2023
@@ -48,7 +48,7 @@ public final class Decrypt implements Ca
{
// Expected for CLI app to write to System.out/System.err
@SuppressWarnings("squid:S106")
- private static final PrintStream SYSERR = System.err;
+ private final PrintStream SYSERR = System.err;
@Option(names = "-alias", description = "the alias to the certificate in the keystore.")
private String alias;
Modified: pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/Encrypt.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/Encrypt.java?rev=1912631&r1=1912630&r2=1912631&view=diff
==============================================================================
--- pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/Encrypt.java (original)
+++ pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/Encrypt.java Sat Sep 30 16:00:27 2023
@@ -59,7 +59,7 @@ public final class Encrypt implements Ca
{
// Expected for CLI app to write to System.out/System.err
@SuppressWarnings("squid:S106")
- private static final PrintStream SYSERR = System.err;
+ private final PrintStream SYSERR = System.err;
@Option(names = "-O", description = "set the owner password (ignored if certFile is set)", arity = "0..1", interactive = true)
private String ownerPassword;
Modified: pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/ExportFDF.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/ExportFDF.java?rev=1912631&r1=1912630&r2=1912631&view=diff
==============================================================================
--- pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/ExportFDF.java (original)
+++ pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/ExportFDF.java Sat Sep 30 16:00:27 2023
@@ -41,7 +41,7 @@ public final class ExportFDF implements
{
// Expected for CLI app to write to System.out/System.err
@SuppressWarnings("squid:S106")
- private static final PrintStream SYSERR = System.err;
+ private final PrintStream SYSERR = System.err;
@Option(names = {"-i", "--input"}, description = "the PDF file to export", required = true)
private File infile;
Modified: pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/ExportXFDF.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/ExportXFDF.java?rev=1912631&r1=1912630&r2=1912631&view=diff
==============================================================================
--- pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/ExportXFDF.java (original)
+++ pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/ExportXFDF.java Sat Sep 30 16:00:27 2023
@@ -42,7 +42,7 @@ public final class ExportXFDF implements
{
// Expected for CLI app to write to System.out/System.err
@SuppressWarnings("squid:S106")
- private static final PrintStream SYSERR = System.err;
+ private final PrintStream SYSERR = System.err;
@Option(names = {"-i", "--input"}, description = "the PDF file to export", required = true)
private File infile;
Modified: pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/ExtractImages.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/ExtractImages.java?rev=1912631&r1=1912630&r2=1912631&view=diff
==============================================================================
--- pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/ExtractImages.java (original)
+++ pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/ExtractImages.java Sat Sep 30 16:00:27 2023
@@ -72,9 +72,9 @@ public final class ExtractImages impleme
{
// Expected for CLI app to write to System.out/System.err
@SuppressWarnings("squid:S106")
- private static final PrintStream SYSOUT = System.out;
+ private final PrintStream SYSOUT = System.out;
@SuppressWarnings("squid:S106")
- private static final PrintStream SYSERR = System.err;
+ private final PrintStream SYSERR = System.err;
private static final List<String> JPEG = Arrays.asList(
COSName.DCT_DECODE.getName(),
Modified: pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/ExtractText.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/ExtractText.java?rev=1912631&r1=1912630&r2=1912631&view=diff
==============================================================================
--- pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/ExtractText.java (original)
+++ pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/ExtractText.java Sat Sep 30 16:00:27 2023
@@ -67,9 +67,9 @@ public final class ExtractText implemen
// Expected for CLI app to write to System.out/System.err
@SuppressWarnings("squid:S106")
- private static final PrintStream SYSOUT = System.out;
+ private final PrintStream SYSOUT = System.out;
@SuppressWarnings("squid:S106")
- private static final PrintStream SYSERR = System.err;
+ private final PrintStream SYSERR = System.err;
@Option(names = "-alwaysNext", description = "Process next page (if applicable) despite IOException " +
"(ignored when -html)")
Modified: pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/ExtractXMP.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/ExtractXMP.java?rev=1912631&r1=1912630&r2=1912631&view=diff
==============================================================================
--- pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/ExtractXMP.java (original)
+++ pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/ExtractXMP.java Sat Sep 30 16:00:27 2023
@@ -41,9 +41,9 @@ public class ExtractXMP implements Calla
{
// Expected for CLI app to write to System.out/System.err
@SuppressWarnings("squid:S106")
- private static final PrintStream SYSOUT = System.out;
+ private final PrintStream SYSOUT = System.out;
@SuppressWarnings("squid:S106")
- private static final PrintStream SYSERR = System.err;
+ private final PrintStream SYSERR = System.err;
@CommandLine.Option(names = "-page", description = "extract the XMP information from a specific page (1 based)")
private int page = 0;
Modified: pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/ImageToPDF.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/ImageToPDF.java?rev=1912631&r1=1912630&r2=1912631&view=diff
==============================================================================
--- pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/ImageToPDF.java (original)
+++ pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/ImageToPDF.java Sat Sep 30 16:00:27 2023
@@ -41,7 +41,7 @@ public final class ImageToPDF implements
// Expected for CLI app to write to System.out/System.err
@SuppressWarnings("squid:S106")
- private static final PrintStream SYSERR = System.err;
+ private final PrintStream SYSERR = System.err;
@Option(names = "-autoOrientation", description = "set orientation depending of image proportion")
private boolean autoOrientation = false;
Modified: pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/ImportFDF.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/ImportFDF.java?rev=1912631&r1=1912630&r2=1912631&view=diff
==============================================================================
--- pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/ImportFDF.java (original)
+++ pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/ImportFDF.java Sat Sep 30 16:00:27 2023
@@ -42,7 +42,7 @@ public class ImportFDF implements Callab
{
// Expected for CLI app to write to System.out/System.err
@SuppressWarnings("squid:S106")
- private static final PrintStream SYSERR = System.err;
+ private final PrintStream SYSERR = System.err;
@Option(names = {"-i", "--input"}, description = "the PDF file to import to", required = true)
private File infile;
Modified: pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/ImportXFDF.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/ImportXFDF.java?rev=1912631&r1=1912630&r2=1912631&view=diff
==============================================================================
--- pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/ImportXFDF.java (original)
+++ pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/ImportXFDF.java Sat Sep 30 16:00:27 2023
@@ -43,7 +43,7 @@ public class ImportXFDF implements Calla
{
// Expected for CLI app to write to System.out/System.err
@SuppressWarnings("squid:S106")
- private static final PrintStream SYSERR = System.err;
+ private final PrintStream SYSERR = System.err;
@Option(names = {"-i", "--input"}, description = "the PDF file to import to", required = true)
private File infile;
Modified: pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/OverlayPDF.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/OverlayPDF.java?rev=1912631&r1=1912630&r2=1912631&view=diff
==============================================================================
--- pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/OverlayPDF.java (original)
+++ pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/OverlayPDF.java Sat Sep 30 16:00:27 2023
@@ -43,7 +43,7 @@ public final class OverlayPDF implements
{
// Expected for CLI app to write to System.out/System.err
@SuppressWarnings("squid:S106")
- private static final PrintStream SYSERR = System.err;
+ private final PrintStream SYSERR = System.err;
@Option(names = "-odd", description = "overlay file used for odd pages")
private File oddPageOverlay;
Modified: pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/PDFMerger.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/PDFMerger.java?rev=1912631&r1=1912630&r2=1912631&view=diff
==============================================================================
--- pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/PDFMerger.java (original)
+++ pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/PDFMerger.java Sat Sep 30 16:00:27 2023
@@ -39,7 +39,7 @@ public final class PDFMerger implements
{
// Expected for CLI app to write to System.out/System.err
@SuppressWarnings("squid:S106")
- private static final PrintStream SYSERR = System.err;
+ private final PrintStream SYSERR = System.err;
@Option(names = {"-i", "--input"}, description = "the PDF files to merge.", paramLabel = "<infile>", required = true)
private File[] infiles;
Modified: pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/PDFSplit.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/PDFSplit.java?rev=1912631&r1=1912630&r2=1912631&view=diff
==============================================================================
--- pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/PDFSplit.java (original)
+++ pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/PDFSplit.java Sat Sep 30 16:00:27 2023
@@ -43,7 +43,7 @@ public final class PDFSplit implements C
{
// Expected for CLI app to write to System.out/System.err
@SuppressWarnings("squid:S106")
- private static final PrintStream SYSERR = System.err;
+ private final PrintStream SYSERR = System.err;
@Option(names = "-password", description = "the password to decrypt the document.", arity = "0..1", interactive = true)
private String password;
Modified: pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/PDFToImage.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/PDFToImage.java?rev=1912631&r1=1912630&r2=1912631&view=diff
==============================================================================
--- pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/PDFToImage.java (original)
+++ pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/PDFToImage.java Sat Sep 30 16:00:27 2023
@@ -53,7 +53,7 @@ public final class PDFToImage implements
{
// Expected for CLI app to write to System.out/System.err
@SuppressWarnings("squid:S106")
- private static final PrintStream SYSERR = System.err;
+ private final PrintStream SYSERR = System.err;
@Option(names = "-password", description = "the password to decrypt the document", arity = "0..1", interactive = true)
private String password;
Modified: pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/PrintPDF.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/PrintPDF.java?rev=1912631&r1=1912630&r2=1912631&view=diff
==============================================================================
--- pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/PrintPDF.java (original)
+++ pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/PrintPDF.java Sat Sep 30 16:00:27 2023
@@ -85,7 +85,7 @@ public final class PrintPDF implements C
// Expected for CLI app to write to System.out/System.err
@SuppressWarnings("squid:S106")
- private static final PrintStream SYSERR = System.err;
+ private final PrintStream SYSERR = System.err;
@Option(names = "-password", description = "the password to decrypt the document.", arity = "0..1", interactive = true)
private String password;
@@ -312,7 +312,7 @@ public final class PrintPDF implements C
}
@Command(name = "listPrinters", description = "list available printers", helpCommand = true)
- private static void showAvailablePrinters()
+ private void showAvailablePrinters()
{
SYSERR.println("Available printer names:");
PrintService[] printServices = PrinterJob.lookupPrintServices();
Modified: pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/TextToPDF.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/TextToPDF.java?rev=1912631&r1=1912630&r2=1912631&view=diff
==============================================================================
--- pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/TextToPDF.java (original)
+++ pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/TextToPDF.java Sat Sep 30 16:00:27 2023
@@ -70,7 +70,7 @@ public class TextToPDF implements Callab
// Expected for CLI app to write to System.out/System.err
@SuppressWarnings("squid:S106")
- private static final PrintStream SYSERR = System.err;
+ private final PrintStream SYSERR = System.err;
@Option(names = "-fontSize", description = "the size of the font to use (default: ${DEFAULT-VALUE}")
private int fontSize = DEFAULT_FONT_SIZE;
Modified: pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/Version.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/Version.java?rev=1912631&r1=1912630&r2=1912631&view=diff
==============================================================================
--- pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/Version.java (original)
+++ pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/Version.java Sat Sep 30 16:00:27 2023
@@ -35,7 +35,7 @@ final class Version implements Callable<
{
// Expected for CLI app to write to System.out/System.err
@SuppressWarnings("squid:S106")
- private static final PrintStream SYSOUT = System.out;
+ private final PrintStream SYSOUT = System.out;
@Spec CommandSpec spec;
Modified: pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/WriteDecodedDoc.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/WriteDecodedDoc.java?rev=1912631&r1=1912630&r2=1912631&view=diff
==============================================================================
--- pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/WriteDecodedDoc.java (original)
+++ pdfbox/branches/3.0/tools/src/main/java/org/apache/pdfbox/tools/WriteDecodedDoc.java Sat Sep 30 16:00:27 2023
@@ -47,7 +47,7 @@ public class WriteDecodedDoc implements
{
// Expected for CLI app to write to System.out/System.err
@SuppressWarnings("squid:S106")
- private static final PrintStream SYSERR = System.err;
+ private final PrintStream SYSERR = System.err;
@Option(names = "-password", description = "the password to decrypt the document", arity = "0..1", interactive = true)
private String password;