You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2020/05/06 03:50:22 UTC
svn commit: r1877409 - in
/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools: ExtractText.java
ImageToPDF.java
Author: tilman
Date: Wed May 6 03:50:22 2020
New Revision: 1877409
URL: http://svn.apache.org/viewvc?rev=1877409&view=rev
Log:
PDFBOX-4071: use switch
Modified:
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractText.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ImageToPDF.java
Modified: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractText.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractText.java?rev=1877409&r1=1877408&r2=1877409&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractText.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractText.java Wed May 6 03:50:22 2020
@@ -120,83 +120,74 @@ public final class ExtractText
String ext = ".txt";
int startPage = 1;
int endPage = Integer.MAX_VALUE;
- for( int i=0; i<args.length; i++ )
+ for (int i = 0; i < args.length; i++)
{
- if( args[i].equals( PASSWORD ) )
+ switch (args[i])
{
- i++;
- if( i >= args.length )
- {
- usage();
- }
- password = args[i];
- }
- else if( args[i].equals( ENCODING ) )
- {
- i++;
- if( i >= args.length )
- {
- usage();
- }
- encoding = args[i];
- }
- else if( args[i].equals( START_PAGE ) )
- {
- i++;
- if( i >= args.length )
- {
- usage();
- }
- startPage = Integer.parseInt( args[i] );
- }
- else if( args[i].equals( HTML ) )
- {
- toHTML = true;
- ext = ".html";
- }
- else if( args[i].equals( SORT ) )
- {
- sort = true;
- }
- else if( args[i].equals( IGNORE_BEADS ) )
- {
- separateBeads = false;
- }
- else if( args[i].equals( DEBUG ) )
- {
- debugOutput = true;
- }
- else if (args[i].equals(ALWAYSNEXT))
- {
- alwaysNext = true;
- }
- else if (args[i].equals(ROTATION_MAGIC))
- {
- rotationMagic = true;
- }
- else if( args[i].equals( END_PAGE ) )
- {
- i++;
- if( i >= args.length )
- {
- usage();
- }
- endPage = Integer.parseInt( args[i] );
- }
- else if( args[i].equals( CONSOLE ) )
- {
- toConsole = true;
- }
- else
- {
- if( pdfFile == null )
- {
- pdfFile = args[i];
- }
- else
- {
- outputFile = args[i];
- }
+ case PASSWORD:
+ i++;
+ if (i >= args.length)
+ {
+ usage();
+ }
+ password = args[i];
+ break;
+ case ENCODING:
+ i++;
+ if (i >= args.length)
+ {
+ usage();
+ }
+ encoding = args[i];
+ break;
+ case START_PAGE:
+ i++;
+ if (i >= args.length)
+ {
+ usage();
+ }
+ startPage = Integer.parseInt(args[i]);
+ break;
+ case HTML:
+ toHTML = true;
+ ext = ".html";
+ break;
+ case SORT:
+ sort = true;
+ break;
+ case IGNORE_BEADS:
+ separateBeads = false;
+ break;
+ case DEBUG:
+ debugOutput = true;
+ break;
+ case ALWAYSNEXT:
+ alwaysNext = true;
+ break;
+ case ROTATION_MAGIC:
+ rotationMagic = true;
+ break;
+ case END_PAGE:
+ i++;
+ if (i >= args.length)
+ {
+ usage();
+ }
+ endPage = Integer.parseInt(args[i]);
+ break;
+ case CONSOLE:
+ toConsole = true;
+ break;
+ default:
+ if (pdfFile == null)
+ {
+ pdfFile = args[i];
+ }
+ else
+ {
+ outputFile = args[i];
+ }
+ break;
}
}
@@ -221,7 +212,8 @@ public final class ExtractText
AccessPermission ap = document.getCurrentAccessPermission();
if( ! ap.canExtractContent() )
{
- throw new IOException( "You do not have permission to extract text" );
+ System.out.println( "You do not have permission to extract text" );
+ //throw new IOException( "You do not have permission to extract text" );
}
stopProcessing("Time for loading: ", startTime);
Modified: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ImageToPDF.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ImageToPDF.java?rev=1877409&r1=1877408&r2=1877409&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ImageToPDF.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ImageToPDF.java Wed May 6 03:50:22 2020
@@ -64,32 +64,29 @@ public final class ImageToPDF
{
if (args[i].startsWith("-"))
{
- if ("-resize".equals(args[i]))
+ switch (args[i])
{
- // will be modified to something more flexible
- app.resize = true;
- }
- else if ("-landscape".equals(args[i]))
- {
- app.setLandscape(true);
- }
- else if ("-autoOrientation".equals(args[i]))
- {
- app.setAutoOrientation(true);
- }
- else if ("-pageSize".equals(args[i]))
- {
- i++;
- PDRectangle rectangle = createRectangle(args[i]);
- if (rectangle == null)
- {
+ case "-resize":
+ // will be modified to something more flexible
+ app.resize = true;
+ break;
+ case "-landscape":
+ app.setLandscape(true);
+ break;
+ case "-autoOrientation":
+ app.setAutoOrientation(true);
+ break;
+ case "-pageSize":
+ i++;
+ PDRectangle rectangle = createRectangle(args[i]);
+ if (rectangle == null)
+ {
+ throw new IOException("Unknown argument: " + args[i]);
+ }
+ app.setMediaBox(rectangle);
+ break;
+ default:
throw new IOException("Unknown argument: " + args[i]);
- }
- app.setMediaBox(rectangle);
- }
- else
- {
- throw new IOException("Unknown argument: " + args[i]);
}
}
else