You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ms...@apache.org on 2020/12/06 16:22:38 UTC
svn commit: r1884156 - in
/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools:
DecompressObjectstreams.java Decrypt.java ExportFDF.java ExportXFDF.java
ExtractImages.java
Author: msahyoun
Date: Sun Dec 6 16:22:38 2020
New Revision: 1884156
URL: http://svn.apache.org/viewvc?rev=1884156&view=rev
Log:
PDFBOX-2602: hamonize CLI console output definition
Modified:
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/DecompressObjectstreams.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/Decrypt.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExportFDF.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExportXFDF.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractImages.java
Modified: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/DecompressObjectstreams.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/DecompressObjectstreams.java?rev=1884156&r1=1884155&r2=1884156&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/DecompressObjectstreams.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/DecompressObjectstreams.java Sun Dec 6 16:22:38 2020
@@ -17,6 +17,7 @@ package org.apache.pdfbox.tools;
import java.io.File;
import java.io.IOException;
+import java.io.PrintStream;
import java.util.concurrent.Callable;
import org.apache.pdfbox.Loader;
@@ -38,6 +39,10 @@ import picocli.CommandLine.Parameters;
@Command(name = "DecompressObjectstreams", description = "Decompresses object streams in a PDF file.")
public final class DecompressObjectstreams implements Callable<Integer>
{
+ // Expected for CLI app to write to System.out/Sytem.err
+ @SuppressWarnings("squid:S106")
+ private static final PrintStream SYSERR = System.err;
+
@Option(names = {"-h", "--help"}, usageHelp = true, description = "display this help message")
boolean usageHelpRequested;
@@ -82,7 +87,7 @@ public final class DecompressObjectstrea
}
catch (IOException e)
{
- System.err.println("Error processing file: " + e.getMessage());
+ SYSERR.println("Error processing file: " + e.getMessage());
return 1;
}
return 0;
Modified: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/Decrypt.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/Decrypt.java?rev=1884156&r1=1884155&r2=1884156&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/Decrypt.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/Decrypt.java Sun Dec 6 16:22:38 2020
@@ -41,6 +41,10 @@ import picocli.CommandLine.Parameters;
@Command(name = "Decrypt", description = "Decrypts a PDF file.")
public final class Decrypt implements Callable<Integer>
{
+ // Expected for CLI app to write to System.out/Sytem.err
+ @SuppressWarnings("squid:S106")
+ private static final PrintStream SYSERR = System.err;
+
@Option(names = "-alias", description = "the alias to the certificate in the keystore.")
private String alias;
@@ -59,10 +63,6 @@ public final class Decrypt implements Ca
@Parameters(paramLabel = "outputfile", index = "1", arity = "0..1", description = "the decrypted PDF file.")
private File outfile;
-
- // Expected for CLI app to write to System.out/Sytem.err
- @SuppressWarnings("squid:S106")
- private PrintStream err = System.err;
/**
* This is the entry point for the application.
@@ -100,19 +100,19 @@ public final class Decrypt implements Ca
}
else
{
- err.println( "Error: You are only allowed to decrypt a document with the owner password.");
+ SYSERR.println( "Error: You are only allowed to decrypt a document with the owner password.");
return 1;
}
}
else
{
- err.println( "Error: Document is not encrypted.");
+ SYSERR.println( "Error: Document is not encrypted.");
return 1;
}
}
catch (IOException ioe)
{
- err.println( "Error decrypting document: " + ioe.getMessage());
+ SYSERR.println( "Error decrypting document: " + ioe.getMessage());
return 4;
}
return 0;
Modified: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExportFDF.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExportFDF.java?rev=1884156&r1=1884155&r2=1884156&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExportFDF.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExportFDF.java Sun Dec 6 16:22:38 2020
@@ -40,15 +40,15 @@ import picocli.CommandLine.Parameters;
@Command(name = "ExportFDF", description = "Exports AcroForm form data to FDF.")
public final class ExportFDF implements Callable<Integer>
{
+ // Expected for CLI app to write to System.out/Sytem.err
+ @SuppressWarnings("squid:S106")
+ private static final PrintStream SYSERR = System.err;
+
@Parameters(paramLabel = "inputfile", index = "0", arity = "1", description = "the PDF file to export.")
private File infile;
@Parameters(paramLabel = "outputfile", index = "1", arity = "0..1", description = "the FDF data file.")
private File outfile;
-
- // Expected for CLI app to write to System.out/Sytem.err
- @SuppressWarnings("squid:S106")
- private PrintStream err = System.err;
/**
* This is the entry point for the application.
@@ -72,7 +72,7 @@ public final class ExportFDF implements
PDAcroForm form = pdf.getDocumentCatalog().getAcroForm();
if( form == null )
{
- err.println( "Error: This PDF does not contain a form." );
+ SYSERR.println( "Error: This PDF does not contain a form." );
return 1;
}
else
@@ -90,7 +90,7 @@ public final class ExportFDF implements
}
catch (IOException ioe)
{
- err.println( "Error exporting FDF data: " + ioe.getMessage());
+ SYSERR.println( "Error exporting FDF data: " + ioe.getMessage());
return 4;
}
return 0;
Modified: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExportXFDF.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExportXFDF.java?rev=1884156&r1=1884155&r2=1884156&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExportXFDF.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExportXFDF.java Sun Dec 6 16:22:38 2020
@@ -40,15 +40,15 @@ import org.apache.pdfbox.pdmodel.fdf.FDF
@Command(name = "ExportXFDF", description = "Exports AcroForm form data to XFDF.")
public final class ExportXFDF implements Callable<Integer>
{
+ // Expected for CLI app to write to System.out/Sytem.err
+ @SuppressWarnings("squid:S106")
+ private static final PrintStream SYSERR = System.err;
+
@Parameters(paramLabel = "inputfile", index = "0", arity = "1", description = "the PDF file to export.")
private File infile;
@Parameters(paramLabel = "outputfile", index = "1", arity = "0..1", description = "the XFDF data file.")
private File outfile;
-
- // Expected for CLI app to write to System.out/Sytem.err
- @SuppressWarnings("squid:S106")
- private PrintStream err = System.err;
/**
* This is the entry point for the application.
@@ -72,7 +72,7 @@ public final class ExportXFDF implements
PDAcroForm form = pdf.getDocumentCatalog().getAcroForm();
if( form == null )
{
- err.println( "Error: This PDF does not contain a form." );
+ SYSERR.println( "Error: This PDF does not contain a form." );
}
else
{
@@ -90,7 +90,7 @@ public final class ExportXFDF implements
}
catch (IOException ioe)
{
- err.println( "Error exporting XFDF data: " + ioe.getMessage());
+ SYSERR.println( "Error exporting XFDF data: " + ioe.getMessage());
return 4;
}
return 0;
Modified: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractImages.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractImages.java?rev=1884156&r1=1884155&r2=1884156&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractImages.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractImages.java Sun Dec 6 16:22:38 2020
@@ -69,6 +69,16 @@ import picocli.CommandLine.Parameters;
@Command(name = "ExtractImages", description = "Extracts the images from a PDF file.")
public final class ExtractImages implements Callable<Integer>
{
+ // Expected for CLI app to write to System.out/Sytem.err
+ @SuppressWarnings("squid:S106")
+ private static final PrintStream SYSOUT = System.out;
+ @SuppressWarnings("squid:S106")
+ private static final PrintStream SYSERR = System.err;
+
+ private static final List<String> JPEG = Arrays.asList(
+ COSName.DCT_DECODE.getName(),
+ COSName.DCT_DECODE_ABBREVIATION.getName());
+
@Option(names = {"-h", "--help"}, usageHelp = true, description = "display this help message")
boolean usageHelpRequested;
@@ -89,16 +99,6 @@ public final class ExtractImages impleme
@Parameters(paramLabel = "inputfile", index = "0", arity = "1", description = "the PDF file to decrypt.")
private File infile;
- // Expected for CLI app to write to System.out/Sytem.err
- @SuppressWarnings("squid:S106")
- private PrintStream sysout = System.out;
- @SuppressWarnings("squid:S106")
- private PrintStream syserr = System.err;
-
- private static final List<String> JPEG = Arrays.asList(
- COSName.DCT_DECODE.getName(),
- COSName.DCT_DECODE_ABBREVIATION.getName());
-
private final Set<COSStream> seen = new HashSet<>();
private int imageCounter = 1;
@@ -123,7 +123,7 @@ public final class ExtractImages impleme
AccessPermission ap = document.getCurrentAccessPermission();
if (!ap.canExtractContent())
{
- syserr.println("You do not have permission to extract images");
+ SYSERR.println("You do not have permission to extract images");
return 1;
}
@@ -140,7 +140,7 @@ public final class ExtractImages impleme
}
catch (IOException ioe)
{
- syserr.println("Error extracting images: " + ioe.getMessage());
+ SYSERR.println("Error extracting images: " + ioe.getMessage());
return 4;
}
return 0;
@@ -364,7 +364,7 @@ public final class ExtractImages impleme
}
try (FileOutputStream imageOutput = new FileOutputStream(prefix + "." + suffix))
{
- sysout.println("Writing image: " + prefix + "." + suffix);
+ SYSOUT.println("Writing image: " + prefix + "." + suffix);
ImageIOUtil.writeImage(image, suffix, imageOutput);
imageOutput.flush();
}
@@ -374,7 +374,7 @@ public final class ExtractImages impleme
try (FileOutputStream imageOutput = new FileOutputStream(prefix + "." + suffix))
{
- sysout.println("Writing image: " + prefix + "." + suffix);
+ SYSOUT.println("Writing image: " + prefix + "." + suffix);
if ("jpg".equals(suffix))
{