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 2014/11/19 14:00:37 UTC

svn commit: r1640536 - in /pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples: documentmanipulation/ fdf/ lucene/ pdmodel/ util/

Author: lehmi
Date: Wed Nov 19 13:00:36 2014
New Revision: 1640536

URL: http://svn.apache.org/r1640536
Log:
PDFBOX-2430: switched all examples to use the non-sequential parser except the signature examples

Modified:
    pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/documentmanipulation/SuperimposePage.java
    pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/fdf/PrintFields.java
    pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/fdf/SetField.java
    pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/lucene/LucenePDFDocument.java
    pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/AddImageToPDF.java
    pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/AddJavascript.java
    pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/AddMessageToEachPage.java
    pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/AddMetadataFromDocInfo.java
    pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/CreateBookmarks.java
    pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ExtractEmbeddedFiles.java
    pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ExtractMetadata.java
    pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ExtractTTFFonts.java
    pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/GoToSecondBookmarkOnOpen.java
    pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/PrintBookmarks.java
    pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/PrintDocumentMetaData.java
    pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/PrintURLs.java
    pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/RemoveFirstPage.java
    pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ReplaceURLs.java
    pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/RubberStamp.java
    pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/RubberStampWithImage.java
    pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/ExtractTextByArea.java
    pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/PrintImageLocations.java
    pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/PrintTextLocations.java
    pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/RemoveAllText.java

Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/documentmanipulation/SuperimposePage.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/documentmanipulation/SuperimposePage.java?rev=1640536&r1=1640535&r2=1640536&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/documentmanipulation/SuperimposePage.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/documentmanipulation/SuperimposePage.java Wed Nov 19 13:00:36 2014
@@ -17,6 +17,7 @@
 package org.apache.pdfbox.examples.documentmanipulation;
 
 import java.awt.geom.AffineTransform;
+import java.io.File;
 
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
@@ -56,7 +57,7 @@ public class SuperimposePage {
             // This will handle the actual import and resources
             LayerUtility layerUtility = new LayerUtility(aDoc);
 
-            PDDocument toBeImported = PDDocument.load(args[0]);
+            PDDocument toBeImported = PDDocument.loadNonSeq(new File(args[0]));
             
             // Get the page as a PDXObjectForm to place it
             PDFormXObject mountable = layerUtility.importPageAsForm(

Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/fdf/PrintFields.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/fdf/PrintFields.java?rev=1640536&r1=1640535&r2=1640536&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/fdf/PrintFields.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/fdf/PrintFields.java Wed Nov 19 13:00:36 2014
@@ -16,6 +16,7 @@
  */
 package org.apache.pdfbox.examples.fdf;
 
+import java.io.File;
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.List;
@@ -141,7 +142,7 @@ public class PrintFields
             }
             else
             {
-                pdf = PDDocument.load(args[0]);
+                pdf = PDDocument.loadNonSeq(new File(args[0]));
                 PrintFields exporter = new PrintFields();
                 if (pdf.isEncrypted())
                 {

Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/fdf/SetField.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/fdf/SetField.java?rev=1640536&r1=1640535&r2=1640536&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/fdf/SetField.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/fdf/SetField.java Wed Nov 19 13:00:36 2014
@@ -16,19 +16,18 @@
  */
 package org.apache.pdfbox.examples.fdf;
 
+import java.io.File;
 import java.io.IOException;
 
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
-import org.apache.pdfbox.pdmodel.encryption.InvalidPasswordException;
-import org.apache.pdfbox.pdmodel.encryption.StandardDecryptionMaterial;
 import org.apache.pdfbox.pdmodel.interactive.form.PDAcroForm;
 import org.apache.pdfbox.pdmodel.interactive.form.PDFieldTreeNode;
 
 /**
  * This example will take a PDF document and set a FDF field in it.
  *
- * @author <a href="mailto:ben@benlitchfield.com">Ben Litchfield</a>
+ * @author Ben Litchfield
  *
  */
 public class SetField
@@ -85,21 +84,7 @@ public class SetField
             else
             {
                 SetField example = new SetField();
-
-                pdf = PDDocument.load(args[0]);
-                if (pdf.isEncrypted())
-                {
-                    try
-                    {
-                        StandardDecryptionMaterial sdm = new StandardDecryptionMaterial("");
-                        pdf.openProtection(sdm);
-                    }
-                    catch (InvalidPasswordException e)
-                    {
-                        System.err.println("Error: The document is encrypted.");
-                        usage();
-                    }
-                }
+                pdf = PDDocument.loadNonSeq(new File(args[0]));
                 example.setField(pdf, args[1], args[2]);
                 pdf.save(args[0]);
             }

Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/lucene/LucenePDFDocument.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/lucene/LucenePDFDocument.java?rev=1640536&r1=1640535&r2=1640536&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/lucene/LucenePDFDocument.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/lucene/LucenePDFDocument.java Wed Nov 19 13:00:36 2014
@@ -37,7 +37,6 @@ import org.apache.lucene.document.TextFi
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDDocumentInformation;
 import org.apache.pdfbox.pdmodel.encryption.InvalidPasswordException;
-import org.apache.pdfbox.pdmodel.encryption.StandardDecryptionMaterial;
 import org.apache.pdfbox.util.PDFTextStripper;
 
 /**
@@ -102,7 +101,7 @@ import org.apache.pdfbox.util.PDFTextStr
  * </tr>
  * </table>
  * 
- * @author <a href="mailto:ben@benlitchfield.com">Ben Litchfield</a>
+ * @author Ben Litchfield
  * 
  */
 public class LucenePDFDocument
@@ -115,8 +114,6 @@ public class LucenePDFDocument
 
     private PDFTextStripper stripper = null;
 
-    private boolean useNonSeqParser;
-
     /** not Indexed, tokenized, stored. */
     public static final FieldType TYPE_STORED_NOT_INDEXED = new FieldType();
 
@@ -133,18 +130,6 @@ public class LucenePDFDocument
      */
     public LucenePDFDocument()
     {
-        this(false);
-    }
-
-    /**
-     * Constructor.
-     * 
-     * @param nonSequentialParser indicates if the non-sequential parser should be used
-     * 
-     */
-    public LucenePDFDocument(boolean nonSequentialParser)
-    {
-        useNonSeqParser = nonSequentialParser;
     }
 
     /**
@@ -338,22 +323,7 @@ public class LucenePDFDocument
      */
     public static Document getDocument(InputStream is) throws IOException
     {
-        return getDocument(is, false);
-    }
-
-    /**
-     * This will get a lucene document from a PDF file.
-     * 
-     * @param is The stream to read the PDF from.
-     * @param nonSeqParser indicates if the non-sequential parser should be used
-     * 
-     * @return The lucene document.
-     * 
-     * @throws IOException If there is an error parsing or indexing the document.
-     */
-    public static Document getDocument(InputStream is, boolean nonSeqParser) throws IOException
-    {
-        LucenePDFDocument converter = new LucenePDFDocument(nonSeqParser);
+        LucenePDFDocument converter = new LucenePDFDocument();
         return converter.convertDocument(is);
     }
 
@@ -368,22 +338,7 @@ public class LucenePDFDocument
      */
     public static Document getDocument(File file) throws IOException
     {
-        return getDocument(file, false);
-    }
-
-    /**
-     * This will get a lucene document from a PDF file.
-     * 
-     * @param file The file to get the document for.
-     * @param nonSeqParser indicates if the non-sequential parser should be used
-     * 
-     * @return The lucene document.
-     * 
-     * @throws IOException If there is an error parsing or indexing the document.
-     */
-    public static Document getDocument(File file, boolean nonSeqParser) throws IOException
-    {
-        LucenePDFDocument converter = new LucenePDFDocument(nonSeqParser);
+        LucenePDFDocument converter = new LucenePDFDocument();
         return converter.convertDocument(file);
     }
 
@@ -398,22 +353,7 @@ public class LucenePDFDocument
      */
     public static Document getDocument(URL url) throws IOException
     {
-        return getDocument(url, false);
-    }
-
-    /**
-     * This will get a lucene document from a PDF file.
-     * 
-     * @param url The file to get the document for.
-     * @param nonSeqParser indicates if the non-sequential parser should be used
-     * 
-     * @return The lucene document.
-     * 
-     * @throws IOException If there is an error parsing or indexing the document.
-     */
-    public static Document getDocument(URL url, boolean nonSeqParser) throws IOException
-    {
-        LucenePDFDocument converter = new LucenePDFDocument(nonSeqParser);
+        LucenePDFDocument converter = new LucenePDFDocument();
         return converter.convertDocument(url);
     }
 
@@ -431,21 +371,7 @@ public class LucenePDFDocument
         PDDocument pdfDocument = null;
         try
         {
-            if (useNonSeqParser)
-            {
-                pdfDocument = PDDocument.loadNonSeq(is, "");
-            }
-            else
-            {
-                pdfDocument = PDDocument.load(is);
-
-                if (pdfDocument.isEncrypted())
-                {
-                    // Just try using the default password and move on
-                    StandardDecryptionMaterial sdm = new StandardDecryptionMaterial("");
-                    pdfDocument.openProtection(sdm);
-                }
-            }
+            pdfDocument = PDDocument.loadNonSeq(is, "");
 
             // create a writer where to append the text content.
             StringWriter writer = new StringWriter();

Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/AddImageToPDF.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/AddImageToPDF.java?rev=1640536&r1=1640535&r2=1640536&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/AddImageToPDF.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/AddImageToPDF.java Wed Nov 19 13:00:36 2014
@@ -39,8 +39,7 @@ import org.apache.pdfbox.pdmodel.graphic
  *
  * The example is taken from the pdf file format specification.
  *
- * @author <a href="mailto:ben@benlitchfield.com">Ben Litchfield</a>
- * @version $Revision: 1.1 $
+ * @author Ben Litchfield
  */
 public class AddImageToPDF
 {
@@ -60,7 +59,7 @@ public class AddImageToPDF
         PDDocument doc = null;
         try
         {
-            doc = PDDocument.load( inputFile );
+            doc = PDDocument.loadNonSeq( new File(inputFile) );
 
             //we will add the image to the first page.
             PDPage page = doc.getPage(0);

Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/AddJavascript.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/AddJavascript.java?rev=1640536&r1=1640535&r2=1640536&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/AddJavascript.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/AddJavascript.java Wed Nov 19 13:00:36 2014
@@ -19,13 +19,13 @@ package org.apache.pdfbox.examples.pdmod
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.interactive.action.PDActionJavaScript;
 
+import java.io.File;
 import java.io.IOException;
 
 /**
  * This is an example of how to set some javascript in the document.
  *
- * @author <a href="mailto:ben@benlitchfield.com">Ben Litchfield</a>
- * @version $Revision: 1.3 $
+ * @author Ben Litchfield
  */
 public class AddJavascript
 {
@@ -52,7 +52,7 @@ public class AddJavascript
             PDDocument document = null;
             try
             {
-                document = PDDocument.load( args[0] );
+                document = PDDocument.loadNonSeq( new File(args[0]) );
                 PDActionJavaScript javascript = new PDActionJavaScript(
                     "app.alert( {cMsg: 'PDFBox rocks!', nIcon: 3, nType: 0, cTitle: 'PDFBox Javascript example' } );");
                 document.getDocumentCatalog().setOpenAction( javascript );

Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/AddMessageToEachPage.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/AddMessageToEachPage.java?rev=1640536&r1=1640535&r2=1640536&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/AddMessageToEachPage.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/AddMessageToEachPage.java Wed Nov 19 13:00:36 2014
@@ -16,14 +16,13 @@
  */
 package org.apache.pdfbox.examples.pdmodel;
 
+import java.io.File;
 import java.io.IOException;
 
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
-
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
 import org.apache.pdfbox.pdmodel.edit.PDPageContentStream;
-
 import org.apache.pdfbox.pdmodel.font.PDFont;
 import org.apache.pdfbox.pdmodel.font.PDType1Font;
 
@@ -31,8 +30,7 @@ import org.apache.pdfbox.pdmodel.font.PD
  * This is an example of how to add a message to every page
  * in a pdf document.
  *
- * @author <a href="mailto:ben@benlitchfield.com">Ben Litchfield</a>
- * @version $Revision: 1.3 $
+ * @author Ben Litchfield
  */
 public class AddMessageToEachPage
 {
@@ -59,7 +57,7 @@ public class AddMessageToEachPage
         PDDocument doc = null;
         try
         {
-            doc = PDDocument.load( file );
+            doc = PDDocument.loadNonSeq( new File(file) );
 
             PDFont font = PDType1Font.HELVETICA_BOLD;
             float fontSize = 36.0f;

Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/AddMetadataFromDocInfo.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/AddMetadataFromDocInfo.java?rev=1640536&r1=1640535&r2=1640536&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/AddMetadataFromDocInfo.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/AddMetadataFromDocInfo.java Wed Nov 19 13:00:36 2014
@@ -27,6 +27,7 @@ import org.apache.xmpbox.schema.XMPBasic
 import org.apache.xmpbox.xml.XmpSerializer;
 
 import java.io.ByteArrayOutputStream;
+import java.io.File;
 import java.util.GregorianCalendar;
 
 /**
@@ -63,7 +64,7 @@ public class AddMetadataFromDocInfo
 
             try
             {
-                document = PDDocument.load( args[0] );
+                document = PDDocument.loadNonSeq( new File(args[0]) );
                 if( document.isEncrypted() )
                 {
                     System.err.println( "Error: Cannot add metadata to encrypted document." );

Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/CreateBookmarks.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/CreateBookmarks.java?rev=1640536&r1=1640535&r2=1640536&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/CreateBookmarks.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/CreateBookmarks.java Wed Nov 19 13:00:36 2014
@@ -16,6 +16,8 @@
  */
 package org.apache.pdfbox.examples.pdmodel;
 
+import java.io.File;
+
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.interactive.documentnavigation.destination.PDPageFitWidthDestination;
@@ -28,8 +30,7 @@ import org.apache.pdfbox.pdmodel.interac
  *
  * Usage: java org.apache.pdfbox.examples.pdmodel.CreateBookmarks &lt;input-pdf&gt; &lt;output-pdf&gt;
  *
- * @author <a href="mailto:ben@benlitchfield.com">Ben Litchfield</a>
- * @version $Revision: 1.2 $
+ * @author Ben Litchfield
  */
 public class CreateBookmarks
 {
@@ -56,7 +57,7 @@ public class CreateBookmarks
             PDDocument document = null;
             try
             {
-                document = PDDocument.load( args[0] );
+                document = PDDocument.loadNonSeq( new File(args[0]) );
                 if( document.isEncrypted() )
                 {
                     System.err.println( "Error: Cannot add bookmarks to encrypted document." );

Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ExtractEmbeddedFiles.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ExtractEmbeddedFiles.java?rev=1640536&r1=1640535&r2=1640536&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ExtractEmbeddedFiles.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ExtractEmbeddedFiles.java Wed Nov 19 13:00:36 2014
@@ -31,8 +31,6 @@ import org.apache.pdfbox.pdmodel.common.
 import org.apache.pdfbox.pdmodel.common.PDNameTreeNode;
 import org.apache.pdfbox.pdmodel.common.filespecification.PDComplexFileSpecification;
 import org.apache.pdfbox.pdmodel.common.filespecification.PDEmbeddedFile;
-import org.apache.pdfbox.pdmodel.encryption.InvalidPasswordException;
-import org.apache.pdfbox.pdmodel.encryption.StandardDecryptionMaterial;
 import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation;
 import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationFileAttachment;
 
@@ -41,7 +39,6 @@ import org.apache.pdfbox.pdmodel.interac
  * <p>
  * Usage: java org.apache.pdfbox.examples.pdmodel.ExtractEmbeddedFiles &lt;input-pdf&gt;
  *
- * @version $Revision$
  */
 public class ExtractEmbeddedFiles
 {
@@ -70,19 +67,7 @@ public class ExtractEmbeddedFiles
             {
                 File pdfFile = new File(args[0]);
                 String filePath = pdfFile.getParent() + System.getProperty("file.separator");
-                document = PDDocument.load( pdfFile );
-                if (document.isEncrypted()) 
-                {
-                    try
-                    {
-                        StandardDecryptionMaterial sdm = new StandardDecryptionMaterial("");
-                        document.openProtection(sdm);
-                    }
-                    catch( InvalidPasswordException e )
-                    {
-                        System.err.println( "Error: The document is encrypted." );
-                    }
-                }
+                document = PDDocument.loadNonSeq(pdfFile );
                 PDDocumentNameDictionary namesDictionary = 
                         new PDDocumentNameDictionary( document.getDocumentCatalog() );
                 PDEmbeddedFilesNameTreeNode efTree = namesDictionary.getEmbeddedFiles();

Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ExtractMetadata.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ExtractMetadata.java?rev=1640536&r1=1640535&r2=1640536&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ExtractMetadata.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ExtractMetadata.java Wed Nov 19 13:00:36 2014
@@ -20,14 +20,13 @@ import org.apache.pdfbox.pdmodel.PDDocum
 import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
 import org.apache.pdfbox.pdmodel.PDDocumentInformation;
 import org.apache.pdfbox.pdmodel.common.PDMetadata;
-import org.apache.pdfbox.pdmodel.encryption.InvalidPasswordException;
 
+import java.io.File;
 import java.text.DateFormat;
 import java.util.Calendar;
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.pdfbox.pdmodel.encryption.StandardDecryptionMaterial;
 import org.apache.xmpbox.XMPMetadata;
 import org.apache.xmpbox.schema.AdobePDFSchema;
 import org.apache.xmpbox.schema.DublinCoreSchema;
@@ -65,22 +64,9 @@ public class ExtractMetadata
         else
         {
             PDDocument document = null;
-
             try
             {
-                document = PDDocument.load(args[0]);
-                if (document.isEncrypted())
-                {
-                    try
-                    {
-                        StandardDecryptionMaterial sdm = new StandardDecryptionMaterial("");
-                        document.openProtection(sdm);
-                    }
-                    catch (InvalidPasswordException e)
-                    {
-                        System.err.println("Error: The document is encrypted.");
-                    }
-                }
+                document = PDDocument.loadNonSeq(new File(args[0]));
                 PDDocumentCatalog catalog = document.getDocumentCatalog();
                 PDMetadata meta = catalog.getMetadata();
                 if (meta != null)

Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ExtractTTFFonts.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ExtractTTFFonts.java?rev=1640536&r1=1640535&r2=1640536&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ExtractTTFFonts.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ExtractTTFFonts.java Wed Nov 19 13:00:36 2014
@@ -119,12 +119,10 @@ public class ExtractTTFFonts
                 {
                     prefix = pdfFile.substring(0, pdfFile.length() - 4);
                 }
-
                 PDDocument document = null;
-
                 try
                 {
-                    document = PDDocument.load(pdfFile);
+                    document = PDDocument.loadNonSeq(new File(pdfFile));
 
                     if (document.isEncrypted())
                     {

Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/GoToSecondBookmarkOnOpen.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/GoToSecondBookmarkOnOpen.java?rev=1640536&r1=1640535&r2=1640536&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/GoToSecondBookmarkOnOpen.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/GoToSecondBookmarkOnOpen.java Wed Nov 19 13:00:36 2014
@@ -22,6 +22,7 @@ import org.apache.pdfbox.pdmodel.interac
 import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDDocumentOutline;
 import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDOutlineItem;
 
+import java.io.File;
 import java.io.IOException;
 
 /**
@@ -29,8 +30,7 @@ import java.io.IOException;
  *
  * Usage: java org.apache.pdfbox.examples.pdmodel.GoToSecondPageOnOpen &lt;input-pdf&gt; &lt;output-pdf&gt;
  *
- * @author <a href="mailto:ben@benlitchfield.com">Ben Litchfield</a>
- * @version $Revision: 1.3 $
+ * @author Ben Litchfield
  */
 public class GoToSecondBookmarkOnOpen
 {
@@ -57,7 +57,7 @@ public class GoToSecondBookmarkOnOpen
             PDDocument document = null;
             try
             {
-                document = PDDocument.load( args[0] );
+                document = PDDocument.loadNonSeq( new File(args[0]) );
                 if( document.isEncrypted() )
                 {
                     System.err.println( "Error: Cannot add bookmark destination to encrypted documents." );

Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/PrintBookmarks.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/PrintBookmarks.java?rev=1640536&r1=1640535&r2=1640536&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/PrintBookmarks.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/PrintBookmarks.java Wed Nov 19 13:00:36 2014
@@ -17,15 +17,13 @@
 package org.apache.pdfbox.examples.pdmodel;
 
 import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.pdmodel.encryption.InvalidPasswordException;
 import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDDocumentOutline;
 import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDOutlineItem;
 import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDOutlineNode;
 
+import java.io.File;
 import java.io.IOException;
 
-import org.apache.pdfbox.pdmodel.encryption.StandardDecryptionMaterial;
-
 /**
  * This is an example on how to access the bookmarks that are part of a pdf document.
  *
@@ -54,20 +52,7 @@ public class PrintBookmarks
             PDDocument document = null;
             try
             {
-                document = PDDocument.load( args[0] );
-                if( document.isEncrypted() )
-                {
-                    try
-                    {
-                        StandardDecryptionMaterial sdm = new StandardDecryptionMaterial("");
-                        document.openProtection(sdm);
-                    }
-                    catch( InvalidPasswordException e )
-                    {
-                        System.err.println( "Error: Document is encrypted with a password." );
-                        System.exit( 1 );
-                    }
-                }
+                document = PDDocument.loadNonSeq( new File(args[0]) );
                 PrintBookmarks meta = new PrintBookmarks();
                 PDDocumentOutline outline =  document.getDocumentCatalog().getDocumentOutline();
                 if( outline != null )

Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/PrintDocumentMetaData.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/PrintDocumentMetaData.java?rev=1640536&r1=1640535&r2=1640536&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/PrintDocumentMetaData.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/PrintDocumentMetaData.java Wed Nov 19 13:00:36 2014
@@ -20,14 +20,11 @@ import org.apache.pdfbox.pdmodel.PDDocum
 import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
 import org.apache.pdfbox.pdmodel.PDDocumentInformation;
 import org.apache.pdfbox.pdmodel.common.PDMetadata;
-import org.apache.pdfbox.pdmodel.encryption.InvalidPasswordException;
 
+import java.io.File;
 import java.io.IOException;
-
 import java.text.SimpleDateFormat;
-
 import java.util.Calendar;
-import org.apache.pdfbox.pdmodel.encryption.StandardDecryptionMaterial;
 
 /**
  * This is an example on how to get a documents metadata information.
@@ -57,20 +54,7 @@ public class PrintDocumentMetaData
             PDDocument document = null;
             try
             {
-                document = PDDocument.load( args[0]);
-                if( document.isEncrypted() )
-                {
-                    try
-                    {
-                        StandardDecryptionMaterial sdm = new StandardDecryptionMaterial("");
-                        document.openProtection(sdm);
-                    }
-                    catch( InvalidPasswordException e )
-                    {
-                        System.err.println( "Error: Document is encrypted with a password." );
-                        System.exit( 1 );
-                    }
-                }
+                document = PDDocument.loadNonSeq( new File(args[0]));
                 PrintDocumentMetaData meta = new PrintDocumentMetaData();
                 meta.printMetadata( document );
             }

Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/PrintURLs.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/PrintURLs.java?rev=1640536&r1=1640535&r2=1640536&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/PrintURLs.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/PrintURLs.java Wed Nov 19 13:00:36 2014
@@ -17,11 +17,11 @@
 package org.apache.pdfbox.examples.pdmodel;
 
 import java.awt.geom.Rectangle2D;
+import java.io.File;
 import java.util.List;
 
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
-
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
 import org.apache.pdfbox.pdmodel.interactive.action.PDAction;
 import org.apache.pdfbox.pdmodel.interactive.action.PDActionURI;
@@ -33,8 +33,7 @@ import org.apache.pdfbox.util.PDFTextStr
 /**
  * This is an example of how to access a URL in a PDF document.
  *
- * @author <a href="mailto:ben@benlitchfield.com">Ben Litchfield</a>
- * @version $Revision: 1.3 $
+ * @author Ben Litchfield
  */
 public class PrintURLs
 {
@@ -66,13 +65,13 @@ public class PrintURLs
             }
             else
             {
-                doc = PDDocument.load( args[0] );
+                doc = PDDocument.loadNonSeq( new File(args[0]) );
                 int pageNum = 0;
                 for( PDPage page : doc.getPages() )
                 {
                     pageNum++;
                     PDFTextStripperByArea stripper = new PDFTextStripperByArea();
-                    List annotations = page.getAnnotations();
+                    List<PDAnnotation> annotations = page.getAnnotations();
                     //first setup text extraction regions
                     for( int j=0; j<annotations.size(); j++ )
                     {

Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/RemoveFirstPage.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/RemoveFirstPage.java?rev=1640536&r1=1640535&r2=1640536&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/RemoveFirstPage.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/RemoveFirstPage.java Wed Nov 19 13:00:36 2014
@@ -18,13 +18,13 @@ package org.apache.pdfbox.examples.pdmod
 
 import org.apache.pdfbox.pdmodel.PDDocument;
 
+import java.io.File;
 import java.io.IOException;
 
 /**
  * This is an example on how to remove pages from a PDF document.
  *
- * @author <a href="mailto:ben@benlitchfield.com">Ben Litchfield</a>
- * @version $Revision: 1.5 $
+ * @author Ben Litchfield
  */
 public class RemoveFirstPage
 {
@@ -51,7 +51,7 @@ public class RemoveFirstPage
             PDDocument document = null;
             try
             {
-                document = PDDocument.load( args[0] );
+                document = PDDocument.loadNonSeq( new File(args[0]) );
                 if( document.isEncrypted() )
                 {
                     throw new IOException( "Encrypted documents are not supported for this example" );

Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ReplaceURLs.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ReplaceURLs.java?rev=1640536&r1=1640535&r2=1640536&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ReplaceURLs.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/ReplaceURLs.java Wed Nov 19 13:00:36 2014
@@ -16,11 +16,11 @@
  */
 package org.apache.pdfbox.examples.pdmodel;
 
+import java.io.File;
 import java.util.List;
 
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
-
 import org.apache.pdfbox.pdmodel.interactive.action.PDAction;
 import org.apache.pdfbox.pdmodel.interactive.action.PDActionURI;
 import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation;
@@ -32,8 +32,7 @@ import org.apache.pdfbox.pdmodel.interac
  * will only replace the URL that the text refers to and not the text
  * itself.
  *
- * @author <a href="mailto:ben@benlitchfield.com">Ben Litchfield</a>
- * @version $Revision: 1.2 $
+ * @author Ben Litchfield
  */
 public class ReplaceURLs
 {
@@ -66,12 +65,12 @@ public class ReplaceURLs
             }
             else
             {
-                doc = PDDocument.load( args[0] );
+                doc = PDDocument.loadNonSeq( new File(args[0]) );
                 int pageNum = 0;
                 for( PDPage page : doc.getPages() )
                 {
                     pageNum++;
-                    List annotations = page.getAnnotations();
+                    List<PDAnnotation> annotations = page.getAnnotations();
 
                     for( int j=0; j<annotations.size(); j++ )
                     {

Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/RubberStamp.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/RubberStamp.java?rev=1640536&r1=1640535&r2=1640536&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/RubberStamp.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/RubberStamp.java Wed Nov 19 13:00:36 2014
@@ -19,8 +19,10 @@ package org.apache.pdfbox.examples.pdmod
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.common.PDRectangle;
+import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation;
 import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationRubberStamp;
 
+import java.io.File;
 import java.io.IOException;
 import java.util.List;
 
@@ -28,7 +30,6 @@ import java.util.List;
  * This is an example on how to add annotations to pages of a PDF document.
  *
  * @author Paul King
- * @version $Revision: 1.1 $
  */
 public class RubberStamp
 {
@@ -55,14 +56,14 @@ public class RubberStamp
             PDDocument document = null;
             try
             {
-                document = PDDocument.load( args[0] );
+                document = PDDocument.loadNonSeq( new File(args[0]) );
                 if( document.isEncrypted() )
                 {
                     throw new IOException( "Encrypted documents are not supported for this example" );
                 }
                 for (PDPage page : document.getPages())
                 {
-                    List annotations = page.getAnnotations();
+                    List<PDAnnotation> annotations = page.getAnnotations();
 
                     PDAnnotationRubberStamp rs = new PDAnnotationRubberStamp();
                     rs.setName(PDAnnotationRubberStamp.NAME_TOP_SECRET);

Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/RubberStampWithImage.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/RubberStampWithImage.java?rev=1640536&r1=1640535&r2=1640536&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/RubberStampWithImage.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/RubberStampWithImage.java Wed Nov 19 13:00:36 2014
@@ -24,7 +24,9 @@ import java.io.OutputStream;
 import java.text.NumberFormat;
 import java.util.List;
 import java.util.Locale;
+
 import javax.imageio.ImageIO;
+
 import org.apache.pdfbox.cos.COSDictionary;
 import org.apache.pdfbox.cos.COSName;
 import org.apache.pdfbox.io.RandomAccessFile;
@@ -38,6 +40,7 @@ import org.apache.pdfbox.pdmodel.graphic
 import org.apache.pdfbox.pdmodel.graphics.image.JPEGFactory;
 import org.apache.pdfbox.pdmodel.graphics.image.LosslessFactory;
 import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
+import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation;
 import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationRubberStamp;
 import org.apache.pdfbox.pdmodel.interactive.annotation.PDAppearanceDictionary;
 import org.apache.pdfbox.pdmodel.interactive.annotation.PDAppearanceStream;
@@ -73,7 +76,7 @@ public class RubberStampWithImage
             PDDocument document = null;
             try
             {
-                document = PDDocument.load( args[0] );
+                document = PDDocument.loadNonSeq( new File(args[0]) );
                 if( document.isEncrypted() )
                 {
                     throw new IOException( "Encrypted documents are not supported for this example" );
@@ -82,7 +85,7 @@ public class RubberStampWithImage
                 for (int i = 0; i < document.getNumberOfPages(); i++)
                 {
                     PDPage page = document.getPage(i);
-                    List annotations = page.getAnnotations();
+                    List<PDAnnotation> annotations = page.getAnnotations();
                     PDAnnotationRubberStamp rubberStamp = new PDAnnotationRubberStamp();
                     rubberStamp.setName(PDAnnotationRubberStamp.NAME_TOP_SECRET);
                     rubberStamp.setRectangle(new PDRectangle(200,100));

Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/ExtractTextByArea.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/ExtractTextByArea.java?rev=1640536&r1=1640535&r2=1640536&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/ExtractTextByArea.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/ExtractTextByArea.java Wed Nov 19 13:00:36 2014
@@ -18,20 +18,17 @@ package org.apache.pdfbox.examples.util;
 
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.encryption.InvalidPasswordException;
 import org.apache.pdfbox.util.PDFTextStripperByArea;
 
 import java.awt.Rectangle;
-
-import org.apache.pdfbox.pdmodel.encryption.StandardDecryptionMaterial;
+import java.io.File;
 
 /**
  * This is an example on how to extract text from a specific area on the PDF document.
  *
  * Usage: java org.apache.pdfbox.examples.util.ExtractTextByArea &lt;input-pdf&gt;
  *
- * @author <a href="mailto:ben@benlitchfield.com">Ben Litchfield</a>
- * @version $Revision: 1.2 $
+ * @author Ben Litchfield
  */
 public class ExtractTextByArea
 {
@@ -59,20 +56,7 @@ public class ExtractTextByArea
             PDDocument document = null;
             try
             {
-                document = PDDocument.load( args[0] );
-                if( document.isEncrypted() )
-                {
-                    try
-                    {
-                        StandardDecryptionMaterial sdm = new StandardDecryptionMaterial("");
-                        document.openProtection(sdm);
-                    }
-                    catch( InvalidPasswordException e )
-                    {
-                        System.err.println( "Error: Document is encrypted with a password." );
-                        System.exit( 1 );
-                    }
-                }
+                document = PDDocument.loadNonSeq( new File(args[0]) );
                 PDFTextStripperByArea stripper = new PDFTextStripperByArea();
                 stripper.setSortByPosition( true );
                 Rectangle rect = new Rectangle( 10, 280, 275, 60 );
@@ -81,7 +65,6 @@ public class ExtractTextByArea
                 stripper.extractRegions( firstPage );
                 System.out.println( "Text in the area:" + rect );
                 System.out.println( stripper.getTextForRegion( "class1" ) );
-
             }
             finally
             {

Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/PrintImageLocations.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/PrintImageLocations.java?rev=1640536&r1=1640535&r2=1640536&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/PrintImageLocations.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/PrintImageLocations.java Wed Nov 19 13:00:36 2014
@@ -16,11 +16,10 @@
  */
 package org.apache.pdfbox.examples.util;
 
+import org.apache.pdfbox.cos.COSBase;
 import org.apache.pdfbox.cos.COSName;
-
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.pdmodel.encryption.InvalidPasswordException;
 import org.apache.pdfbox.pdmodel.graphics.PDXObject;
 import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
 import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
@@ -30,10 +29,10 @@ import org.apache.pdfbox.contentstream.o
 import org.apache.pdfbox.contentstream.PDFStreamEngine;
 
 import java.awt.geom.AffineTransform;
+import java.io.File;
 import java.io.IOException;
-
 import java.util.List;
-import org.apache.pdfbox.pdmodel.encryption.StandardDecryptionMaterial;
+
 import org.apache.pdfbox.contentstream.operator.state.Concatenate;
 import org.apache.pdfbox.contentstream.operator.state.Restore;
 import org.apache.pdfbox.contentstream.operator.state.Save;
@@ -45,8 +44,7 @@ import org.apache.pdfbox.contentstream.o
  *
  * Usage: java org.apache.pdfbox.examples.util.PrintImageLocations &lt;input-pdf&gt;
  *
- * @author <a href="mailto:ben@benlitchfield.com">Ben Litchfield</a>
- * @version $Revision: 1.5 $
+ * @author Ben Litchfield
  */
 public class PrintImageLocations extends PDFStreamEngine
 {
@@ -83,20 +81,7 @@ public class PrintImageLocations extends
             PDDocument document = null;
             try
             {
-                document = PDDocument.load( args[0] );
-                if( document.isEncrypted() )
-                {
-                    try
-                    {
-                        StandardDecryptionMaterial sdm = new StandardDecryptionMaterial("");
-                        document.openProtection(sdm);
-                    }
-                    catch( InvalidPasswordException e )
-                    {
-                        System.err.println( "Error: Document is encrypted with a password." );
-                        System.exit( 1 );
-                    }
-                }
+                document = PDDocument.loadNonSeq( new File(args[0]) );
                 PrintImageLocations printer = new PrintImageLocations();
                 int pageNum = 0;
                 for( PDPage page : document.getPages() )
@@ -124,7 +109,7 @@ public class PrintImageLocations extends
      *
      * @throws IOException If there is an error processing the operation.
      */
-    protected void processOperator( Operator operator, List arguments ) throws IOException
+    protected void processOperator( Operator operator, List<COSBase> arguments ) throws IOException
     {
         String operation = operator.getName();
         if( "Do".equals(operation) )

Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/PrintTextLocations.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/PrintTextLocations.java?rev=1640536&r1=1640535&r2=1640536&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/PrintTextLocations.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/PrintTextLocations.java Wed Nov 19 13:00:36 2014
@@ -23,6 +23,7 @@ import org.apache.pdfbox.pdmodel.encrypt
 import org.apache.pdfbox.util.PDFTextStripper;
 import org.apache.pdfbox.text.TextPosition;
 
+import java.io.File;
 import java.io.IOException;
 
 import org.apache.pdfbox.pdmodel.encryption.StandardDecryptionMaterial;
@@ -32,8 +33,7 @@ import org.apache.pdfbox.pdmodel.encrypt
  *
  * Usage: java org.apache.pdfbox.examples.util.PrintTextLocations &lt;input-pdf&gt;
  *
- * @author <a href="mailto:ben@benlitchfield.com">Ben Litchfield</a>
- * @version $Revision: 1.7 $
+ * @author Ben Litchfield
  */
 public class PrintTextLocations extends PDFTextStripper
 {
@@ -65,7 +65,7 @@ public class PrintTextLocations extends 
             PDDocument document = null;
             try
             {
-                document = PDDocument.load( args[0] );
+                document = PDDocument.loadNonSeq( new File(args[0]) );
                 if( document.isEncrypted() )
                 {
                     try

Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/RemoveAllText.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/RemoveAllText.java?rev=1640536&r1=1640535&r2=1640536&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/RemoveAllText.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/RemoveAllText.java Wed Nov 19 13:00:36 2014
@@ -18,12 +18,12 @@ package org.apache.pdfbox.examples.util;
 
 import org.apache.pdfbox.pdfparser.PDFStreamParser;
 import org.apache.pdfbox.pdfwriter.ContentStreamWriter;
-
 import org.apache.pdfbox.pdmodel.PDDocument;
 import org.apache.pdfbox.pdmodel.PDPage;
 import org.apache.pdfbox.pdmodel.common.PDStream;
 import org.apache.pdfbox.contentstream.operator.Operator;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -32,8 +32,7 @@ import java.util.List;
  *
  * Usage: java org.apache.pdfbox.examples.util.RemoveAllText &lt;input-pdf&gt; &lt;output-pdf&gt;
  *
- * @author <a href="mailto:ben@benlitchfield.com">Ben Litchfield</a>
- * @version $Revision: 1.2 $
+ * @author Ben Litchfield
  */
 public class RemoveAllText
 {
@@ -63,7 +62,7 @@ public class RemoveAllText
             PDDocument document = null;
             try
             {
-                document = PDDocument.load( args[0] );
+                document = PDDocument.loadNonSeq( new File(args[0]) );
                 if( document.isEncrypted() )
                 {
                     System.err.println( "Error: Encrypted documents are not supported for this example." );
@@ -73,8 +72,8 @@ public class RemoveAllText
                 {
                     PDFStreamParser parser = new PDFStreamParser(page.getStream());
                     parser.parse();
-                    List tokens = parser.getTokens();
-                    List newTokens = new ArrayList();
+                    List<Object> tokens = parser.getTokens();
+                    List<Object> newTokens = new ArrayList<Object>();
                     for( int j=0; j<tokens.size(); j++)
                     {
                         Object token = tokens.get( j );