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/28 16:40:01 UTC
svn commit: r1884884 - in
/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools: OverlayPDF.java
PDFSplit.java PDFToImage.java PrintPDF.java TextToPDF.java
Author: msahyoun
Date: Mon Dec 28 16:40:01 2020
New Revision: 1884884
URL: http://svn.apache.org/viewvc?rev=1884884&view=rev
Log:
PDFBOX-2602: use options instead of parameters as suggested by clig.dev
Modified:
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/OverlayPDF.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFSplit.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFToImage.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PrintPDF.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/TextToPDF.java
Modified: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/OverlayPDF.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/OverlayPDF.java?rev=1884884&r1=1884883&r2=1884884&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/OverlayPDF.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/OverlayPDF.java Mon Dec 28 16:40:01 2020
@@ -30,7 +30,6 @@ import org.apache.pdfbox.pdmodel.PDDocum
import picocli.CommandLine;
import picocli.CommandLine.Command;
import picocli.CommandLine.Option;
-import picocli.CommandLine.Parameters;
/**
*
@@ -64,16 +63,16 @@ public final class OverlayPDF implements
@Option(names = "-page", description = "overlay file used for the given page number, may occur more than once")
Map<Integer, String> specificPageOverlayFile = new HashMap<>();
+ @Option(names = {"-default"}, description = "the default overlay file")
+ private File defaultOverlay;
+
@Option(names = "-position", description = "where to put the overlay file: foreground or background (default: ${DEFAULT-VALUE})")
private Position position = Position.BACKGROUND;
- @Parameters(paramLabel = "inputfile", index = "0", arity = "1", description = "the PDF input file.")
+ @Option(names = {"-i", "--input"}, description = "the PDF input file", required = true)
private File infile;
- @Parameters(paramLabel = "defaultOverlay", index = "1", arity = "0..1", description = "the default overlay file.")
- private File defaultOverlay;
-
- @Parameters(paramLabel = "outputfile", index = "2", arity = "1", description = "the PDF output file.")
+ @Option(names = {"-o", "--output"}, description = "the PDF output file", required = true)
private File outfile;
/**
Modified: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFSplit.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFSplit.java?rev=1884884&r1=1884883&r2=1884884&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFSplit.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFSplit.java Mon Dec 28 16:40:01 2020
@@ -31,7 +31,6 @@ import org.apache.pdfbox.pdmodel.PDDocum
import picocli.CommandLine;
import picocli.CommandLine.Command;
import picocli.CommandLine.Option;
-import picocli.CommandLine.Parameters;
/**
* This is the main program that will take a pdf document and split it into
@@ -61,7 +60,7 @@ public final class PDFSplit implements C
@Option(names = "-outputPrefix", description = "the filename prefix for split files.")
private String outputPrefix;
- @Parameters(paramLabel = "inputfile", description = "the PDF file to split.")
+ @Option(names = {"-i", "--input"}, description = "the PDF file to split", required = true)
private File infile;
/**
Modified: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFToImage.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFToImage.java?rev=1884884&r1=1884883&r2=1884884&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFToImage.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFToImage.java Mon Dec 28 16:40:01 2020
@@ -39,7 +39,6 @@ import org.apache.pdfbox.tools.imageio.I
import picocli.CommandLine;
import picocli.CommandLine.Command;
import picocli.CommandLine.Option;
-import picocli.CommandLine.Parameters;
/**
* Convert a PDF document to an image.
@@ -90,7 +89,7 @@ public final class PDFToImage implements
@Option(names = "-subsampling", description = "activate subsampling (for PDFs with huge images)")
private boolean subsampling;
- @Parameters(paramLabel = "inputfile", description = "the PDF file to convert.")
+ @Option(names = {"-i", "--input"}, description = "the PDF files to convert.", required = true)
private File infile;
/**
Modified: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PrintPDF.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PrintPDF.java?rev=1884884&r1=1884883&r2=1884884&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PrintPDF.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PrintPDF.java Mon Dec 28 16:40:01 2020
@@ -35,7 +35,6 @@ import org.apache.pdfbox.printing.PDFPag
import picocli.CommandLine;
import picocli.CommandLine.Command;
import picocli.CommandLine.Option;
-import picocli.CommandLine.Parameters;
/**
* This is a command line program that will print a PDF document.
@@ -70,7 +69,7 @@ public final class PrintPDF implements C
@Option(names = "-noColorOpt", description = "disable color optimizations (useful when printing barcodes)")
private boolean noColorOpt;
- @Parameters(paramLabel = "inputfile", description = "the PDF file to print.")
+ @Option(names = {"-i", "--input"}, description = "the PDF files to print.", required = true)
private File infile;
/**
Modified: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/TextToPDF.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/TextToPDF.java?rev=1884884&r1=1884883&r2=1884884&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/TextToPDF.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/TextToPDF.java Mon Dec 28 16:40:01 2020
@@ -36,7 +36,6 @@ import org.apache.pdfbox.pdmodel.font.PD
import picocli.CommandLine;
import picocli.CommandLine.Command;
import picocli.CommandLine.Option;
-import picocli.CommandLine.Parameters;
/**
* This will take a text file and output a pdf with that text.
@@ -84,12 +83,13 @@ public class TextToPDF implements Callab
@Option(names = "-ttf", paramLabel="<ttf file>", description = "the TTF font to use for the text. Either this or -standardFont should be specified but not both.")
private File ttf;
- @Parameters(paramLabel = "textfile", description = "the text file to convert.")
+ @Option(names = {"-i", "--input"}, description = "the text file to convert", required = true)
private File infile;
- @Parameters(paramLabel = "outputfile", index="1", description = "the generated PDF file.")
+ @Option(names = {"-o", "--output"}, description = "the generated PDF file", required = true)
private File outfile;
+
private enum PageSizes
{
LETTER(PDRectangle.LETTER),