You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ja...@apache.org on 2015/02/25 22:54:22 UTC
svn commit: r1662310 - in /pdfbox/trunk:
examples/src/main/java/org/apache/pdfbox/examples/lucene/
examples/src/main/java/org/apache/pdfbox/examples/pdmodel/
examples/src/main/java/org/apache/pdfbox/examples/util/ pdfbox/
pdfbox/src/main/java/org/apach...
Author: jahewson
Date: Wed Feb 25 21:54:21 2015
New Revision: 1662310
URL: http://svn.apache.org/r1662310
Log:
PDFBOX-2680: Move multi-pdf classes from util into their own package
Added:
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/PDFHighlighter.java
- copied, changed from r1659696, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFHighlighter.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/LayerUtility.java
- copied, changed from r1659696, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/LayerUtility.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/Overlay.java
- copied, changed from r1659696, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/Overlay.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFCloneUtility.java
- copied, changed from r1659696, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFCloneUtility.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java
- copied, changed from r1659696, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFMergerUtility.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PageExtractor.java
- copied, changed from r1659696, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PageExtractor.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/Splitter.java
- copied, changed from r1659696, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/Splitter.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFMarkedContentExtractor.java
- copied, changed from r1659696, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFMarkedContentExtractor.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStreamEngine.java
- copied, changed from r1659696, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDFTextStreamEngine.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripper.java
- copied, changed from r1659696, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFTextStripper.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripperByArea.java
- copied, changed from r1659696, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFTextStripperByArea.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFCloneUtilityTest.java
- copied, changed from r1659696, pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/PDFCloneUtilityTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java
- copied, changed from r1659696, pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/PDFMergerUtilityTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PageExtractorTest.java
- copied, changed from r1659696, pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/PageExtractorTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/TestLayerUtility.java
- copied, changed from r1659696, pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestLayerUtility.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/rendering/
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestPDFToImage.java
- copied, changed from r1659696, pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestPDFToImage.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestRendering.java
- copied, changed from r1659696, pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestRendering.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/text/
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/text/TestTextStripper.java
- copied, changed from r1659696, pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestTextStripper.java
Removed:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDFTextStreamEngine.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/LayerUtility.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/Overlay.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFCloneUtility.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFHighlighter.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFMarkedContentExtractor.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFMergerUtility.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFTextStripper.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFTextStripperByArea.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PageExtractor.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/Splitter.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/PDFCloneUtilityTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/PDFMergerUtilityTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/PageExtractorTest.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestLayerUtility.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestPDFToImage.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestRendering.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestTextStripper.java
Modified:
pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/lucene/LucenePDFDocument.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/SuperimposePage.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/PrintTextLocations.java
pdfbox/trunk/pdfbox/build.xml
pdfbox/trunk/pdfbox/pom.xml
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/DrawObject.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/BeginMarkedContentSequence.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/BeginMarkedContentSequenceWithProperties.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/EndMarkedContentSequence.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/TestAll.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/font/TestFontEmbedding.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/ExtractText.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/OverlayPDF.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFMerger.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFSplit.java
pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFText2HTML.java
pdfbox/trunk/tools/src/test/java/org/apache/pdfbox/tools/TestPDFText2HTML.java
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=1662310&r1=1662309&r2=1662310&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 Feb 25 21:54:21 2015
@@ -37,7 +37,7 @@ 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.util.PDFTextStripper;
+import org.apache.pdfbox.text.PDFTextStripper;
/**
* This class is used to create a document for the lucene search engine. This should easily plug into the IndexPDFFiles
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=1662310&r1=1662309&r2=1662310&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 Feb 25 21:54:21 2015
@@ -27,7 +27,7 @@ import org.apache.pdfbox.pdmodel.interac
import org.apache.pdfbox.pdmodel.interactive.action.PDActionURI;
import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation;
import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationLink;
-import org.apache.pdfbox.util.PDFTextStripperByArea;
+import org.apache.pdfbox.text.PDFTextStripperByArea;
/**
Modified: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/SuperimposePage.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/SuperimposePage.java?rev=1662310&r1=1662309&r2=1662310&view=diff
==============================================================================
--- pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/SuperimposePage.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/pdmodel/SuperimposePage.java Wed Feb 25 21:54:21 2015
@@ -24,7 +24,7 @@ import org.apache.pdfbox.pdmodel.common.
import org.apache.pdfbox.pdmodel.PDPageContentStream;
import org.apache.pdfbox.pdmodel.font.PDType1Font;
import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
-import org.apache.pdfbox.util.LayerUtility;
+import org.apache.pdfbox.multipdf.LayerUtility;
import org.apache.pdfbox.util.Matrix;
/**
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=1662310&r1=1662309&r2=1662310&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 Feb 25 21:54:21 2015
@@ -18,7 +18,7 @@ package org.apache.pdfbox.examples.util;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDPage;
-import org.apache.pdfbox.util.PDFTextStripperByArea;
+import org.apache.pdfbox.text.PDFTextStripperByArea;
import java.awt.Rectangle;
import java.io.File;
Copied: pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/PDFHighlighter.java (from r1659696, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFHighlighter.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/PDFHighlighter.java?p2=pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/PDFHighlighter.java&p1=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFHighlighter.java&r1=1659696&r2=1662310&rev=1662310&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFHighlighter.java (original)
+++ pdfbox/trunk/examples/src/main/java/org/apache/pdfbox/examples/util/PDFHighlighter.java Wed Feb 25 21:54:21 2015
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pdfbox.util;
+package org.apache.pdfbox.examples.util;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -26,6 +26,7 @@ import java.util.regex.Pattern;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDPage;
+import org.apache.pdfbox.text.PDFTextStripper;
/**
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=1662310&r1=1662309&r2=1662310&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 Feb 25 21:54:21 2015
@@ -19,7 +19,7 @@ package org.apache.pdfbox.examples.util;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDPage;
import org.apache.pdfbox.pdmodel.common.PDStream;
-import org.apache.pdfbox.util.PDFTextStripper;
+import org.apache.pdfbox.text.PDFTextStripper;
import org.apache.pdfbox.text.TextPosition;
import java.io.File;
Modified: pdfbox/trunk/pdfbox/build.xml
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/build.xml?rev=1662310&r1=1662309&r2=1662310&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/build.xml (original)
+++ pdfbox/trunk/pdfbox/build.xml Wed Feb 25 21:54:21 2015
@@ -189,7 +189,7 @@
<pathelement path="${fontbox.dest.dir}"/>
</classpath>
<formatter usefile="false" type="plain" />
- <test name="org.apache.pdfbox.util.TestPDFToImage" />
+ <test name="org.apache.pdfbox.rendering.TestPDFToImage" />
</junit>
</target>
Modified: pdfbox/trunk/pdfbox/pom.xml
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/pom.xml?rev=1662310&r1=1662309&r2=1662310&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/pom.xml (original)
+++ pdfbox/trunk/pdfbox/pom.xml Wed Feb 25 21:54:21 2015
@@ -100,7 +100,7 @@
<argLine>-Xmx128m</argLine>
<excludes>
<exclude>org/apache/pdfbox/TestAll.java</exclude>
- <exclude>org/apache/pdfbox/util/TestPDFToImage.java</exclude>
+ <exclude>org/apache/pdfbox/rendering/TestPDFToImage.java</exclude>
</excludes>
<systemPropertyVariables>
<java.util.logging.config.file>src/test/resources/logging.properties</java.util.logging.config.file>
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/DrawObject.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/DrawObject.java?rev=1662310&r1=1662309&r2=1662310&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/DrawObject.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/DrawObject.java Wed Feb 25 21:54:21 2015
@@ -20,7 +20,7 @@ import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.pdmodel.graphics.PDXObject;
import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
-import org.apache.pdfbox.util.PDFMarkedContentExtractor;
+import org.apache.pdfbox.text.PDFMarkedContentExtractor;
import java.io.IOException;
import java.util.List;
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/BeginMarkedContentSequence.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/BeginMarkedContentSequence.java?rev=1662310&r1=1662309&r2=1662310&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/BeginMarkedContentSequence.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/BeginMarkedContentSequence.java Wed Feb 25 21:54:21 2015
@@ -21,7 +21,7 @@ import java.util.List;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSName;
-import org.apache.pdfbox.util.PDFMarkedContentExtractor;
+import org.apache.pdfbox.text.PDFMarkedContentExtractor;
import org.apache.pdfbox.contentstream.operator.Operator;
import org.apache.pdfbox.contentstream.operator.OperatorProcessor;
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/BeginMarkedContentSequenceWithProperties.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/BeginMarkedContentSequenceWithProperties.java?rev=1662310&r1=1662309&r2=1662310&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/BeginMarkedContentSequenceWithProperties.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/BeginMarkedContentSequenceWithProperties.java Wed Feb 25 21:54:21 2015
@@ -22,7 +22,7 @@ import java.util.List;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSDictionary;
import org.apache.pdfbox.cos.COSName;
-import org.apache.pdfbox.util.PDFMarkedContentExtractor;
+import org.apache.pdfbox.text.PDFMarkedContentExtractor;
import org.apache.pdfbox.contentstream.operator.Operator;
import org.apache.pdfbox.contentstream.operator.OperatorProcessor;
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/EndMarkedContentSequence.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/EndMarkedContentSequence.java?rev=1662310&r1=1662309&r2=1662310&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/EndMarkedContentSequence.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/operator/markedcontent/EndMarkedContentSequence.java Wed Feb 25 21:54:21 2015
@@ -20,7 +20,7 @@ import java.io.IOException;
import java.util.List;
import org.apache.pdfbox.cos.COSBase;
-import org.apache.pdfbox.util.PDFMarkedContentExtractor;
+import org.apache.pdfbox.text.PDFMarkedContentExtractor;
import org.apache.pdfbox.contentstream.operator.Operator;
import org.apache.pdfbox.contentstream.operator.OperatorProcessor;
Copied: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/LayerUtility.java (from r1659696, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/LayerUtility.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/LayerUtility.java?p2=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/LayerUtility.java&p1=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/LayerUtility.java&r1=1659696&r2=1662310&rev=1662310&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/LayerUtility.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/LayerUtility.java Wed Feb 25 21:54:21 2015
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pdfbox.util;
+package org.apache.pdfbox.multipdf;
import java.awt.geom.AffineTransform;
import java.io.IOException;
@@ -39,6 +39,7 @@ import org.apache.pdfbox.pdmodel.PDPageC
import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
import org.apache.pdfbox.pdmodel.graphics.optionalcontent.PDOptionalContentGroup;
import org.apache.pdfbox.pdmodel.graphics.optionalcontent.PDOptionalContentProperties;
+import org.apache.pdfbox.util.Matrix;
/**
* This class allows to import pages as Form XObjects into a PDF file and use them to create
Copied: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/Overlay.java (from r1659696, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/Overlay.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/Overlay.java?p2=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/Overlay.java&p1=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/Overlay.java&r1=1659696&r2=1662310&rev=1662310&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/Overlay.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/Overlay.java Wed Feb 25 21:54:21 2015
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pdfbox.util;
+package org.apache.pdfbox.multipdf;
import java.awt.geom.AffineTransform;
import java.io.File;
Copied: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFCloneUtility.java (from r1659696, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFCloneUtility.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFCloneUtility.java?p2=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFCloneUtility.java&p1=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFCloneUtility.java&r1=1659696&r2=1662310&rev=1662310&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFCloneUtility.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFCloneUtility.java Wed Feb 25 21:54:21 2015
@@ -14,13 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pdfbox.util;
+package org.apache.pdfbox.multipdf;
import java.io.IOException;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-
import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSDictionary;
@@ -37,7 +36,7 @@ import org.apache.pdfbox.pdmodel.common.
*
* @version $Revision$
*/
-public class PDFCloneUtility
+class PDFCloneUtility
{
private PDDocument destination;
@@ -79,7 +78,7 @@ public class PDFCloneUtility
{
//we are done, it has already been converted.
}
- else if( base instanceof List )
+ else if( base instanceof List)
{
COSArray array = new COSArray();
List list = (List)base;
@@ -197,7 +196,7 @@ public class PDFCloneUtility
else if( base instanceof COSObjectable && !(base instanceof COSBase) )
{
cloneMerge(((COSObjectable)base).getCOSObject(), ((COSObjectable)target).getCOSObject() );
- clonedVersion.put( base, retval );
+ clonedVersion.put(base, retval);
}
else if( base instanceof COSObject )
{
Copied: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java (from r1659696, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFMergerUtility.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java?p2=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java&p1=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFMergerUtility.java&r1=1659696&r2=1662310&rev=1662310&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFMergerUtility.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PDFMergerUtility.java Wed Feb 25 21:54:21 2015
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pdfbox.util;
+package org.apache.pdfbox.multipdf;
import java.io.File;
import java.io.FileInputStream;
Copied: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PageExtractor.java (from r1659696, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PageExtractor.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PageExtractor.java?p2=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PageExtractor.java&p1=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PageExtractor.java&r1=1659696&r2=1662310&rev=1662310&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PageExtractor.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/PageExtractor.java Wed Feb 25 21:54:21 2015
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.pdfbox.util;
+package org.apache.pdfbox.multipdf;
import java.io.IOException;
import org.apache.pdfbox.pdmodel.PDDocument;
Copied: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/Splitter.java (from r1659696, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/Splitter.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/Splitter.java?p2=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/Splitter.java&p1=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/Splitter.java&r1=1659696&r2=1662310&rev=1662310&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/Splitter.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/multipdf/Splitter.java Wed Feb 25 21:54:21 2015
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pdfbox.util;
+package org.apache.pdfbox.multipdf;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDPage;
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java?rev=1662310&r1=1662309&r2=1662310&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfparser/COSParser.java Wed Feb 25 21:54:21 2015
@@ -1024,9 +1024,8 @@ public class COSParser extends BaseParse
if (expectedEndOfStream > fileLen)
{
streamLengthIsValid = false;
- LOG.error("The end of the stream is out of range, using workaround to read the stream");
- LOG.error("Stream start offset: " + originOffset);
- LOG.error("Expected endofstream offset: " + expectedEndOfStream);
+ LOG.error("The end of the stream is out of range, using workaround to read the stream, " +
+ "found " + originOffset + " but expected " + expectedEndOfStream);
}
else
{
@@ -1035,9 +1034,8 @@ public class COSParser extends BaseParse
if (!isString(ENDSTREAM))
{
streamLengthIsValid = false;
- LOG.error("The end of the stream doesn't point to the correct offset, using workaround to read the stream");
- LOG.error("Stream start offset: " + originOffset);
- LOG.error("Expected endofstream offset: " + expectedEndOfStream);
+ LOG.error("The end of the stream doesn't point to the correct offset, using workaround to read the stream, " +
+ "found " + originOffset + " but expected " + expectedEndOfStream);
}
pdfSource.seek(originOffset);
}
Copied: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFMarkedContentExtractor.java (from r1659696, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFMarkedContentExtractor.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFMarkedContentExtractor.java?p2=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFMarkedContentExtractor.java&p1=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFMarkedContentExtractor.java&r1=1659696&r2=1662310&rev=1662310&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFMarkedContentExtractor.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFMarkedContentExtractor.java Wed Feb 25 21:54:21 2015
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pdfbox.util;
+package org.apache.pdfbox.text;
import java.io.IOException;
import java.util.ArrayList;
@@ -23,12 +23,10 @@ import java.util.List;
import java.util.Map;
import java.util.Stack;
-import org.apache.pdfbox.contentstream.PDFTextStreamEngine;
import org.apache.pdfbox.cos.COSDictionary;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.pdmodel.documentinterchange.markedcontent.PDMarkedContent;
import org.apache.pdfbox.pdmodel.graphics.PDXObject;
-import org.apache.pdfbox.text.TextPosition;
import org.apache.pdfbox.contentstream.operator.markedcontent.BeginMarkedContentSequence;
import org.apache.pdfbox.contentstream.operator.markedcontent.BeginMarkedContentSequenceWithProperties;
import org.apache.pdfbox.contentstream.operator.markedcontent.EndMarkedContentSequence;
Copied: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStreamEngine.java (from r1659696, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDFTextStreamEngine.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStreamEngine.java?p2=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStreamEngine.java&p1=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDFTextStreamEngine.java&r1=1659696&r2=1662310&rev=1662310&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/contentstream/PDFTextStreamEngine.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStreamEngine.java Wed Feb 25 21:54:21 2015
@@ -14,11 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pdfbox.contentstream;
+package org.apache.pdfbox.text;
import java.io.InputStream;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.pdfbox.contentstream.PDFStreamEngine;
import org.apache.pdfbox.pdmodel.PDPage;
import org.apache.pdfbox.pdmodel.font.encoding.GlyphList;
import org.apache.pdfbox.pdmodel.common.PDRectangle;
@@ -26,7 +27,6 @@ import org.apache.pdfbox.pdmodel.font.PD
import org.apache.pdfbox.pdmodel.font.PDSimpleFont;
import org.apache.pdfbox.pdmodel.font.PDType3Font;
import org.apache.pdfbox.pdmodel.graphics.state.PDGraphicsState;
-import org.apache.pdfbox.text.TextPosition;
import java.io.IOException;
import org.apache.pdfbox.util.Matrix;
@@ -61,7 +61,7 @@ import org.apache.pdfbox.contentstream.o
* @author Ben Litchfield
* @author John Hewson
*/
-public class PDFTextStreamEngine extends PDFStreamEngine
+class PDFTextStreamEngine extends PDFStreamEngine
{
private static final Log log = LogFactory.getLog(PDFTextStreamEngine.class);
Copied: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripper.java (from r1659696, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFTextStripper.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripper.java?p2=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripper.java&p1=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFTextStripper.java&r1=1659696&r2=1662310&rev=1662310&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFTextStripper.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripper.java Wed Feb 25 21:54:21 2015
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pdfbox.util;
+package org.apache.pdfbox.text;
import java.io.IOException;
import java.io.StringWriter;
@@ -33,8 +33,6 @@ import java.util.TreeMap;
import java.util.TreeSet;
import java.util.Vector;
import java.util.regex.Pattern;
-
-import org.apache.pdfbox.contentstream.PDFTextStreamEngine;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDPage;
import org.apache.pdfbox.pdmodel.PDPageTree;
@@ -42,8 +40,7 @@ import org.apache.pdfbox.pdmodel.common.
import org.apache.pdfbox.pdmodel.common.PDStream;
import org.apache.pdfbox.pdmodel.interactive.documentnavigation.outline.PDOutlineItem;
import org.apache.pdfbox.pdmodel.interactive.pagenavigation.PDThreadBead;
-import org.apache.pdfbox.text.TextPosition;
-import org.apache.pdfbox.text.TextPositionComparator;
+import org.apache.pdfbox.util.QuickSort;
/**
* This class will take a pdf document and strip out all of the text and ignore the
@@ -58,10 +55,10 @@ import org.apache.pdfbox.text.TextPositi
*/
public class PDFTextStripper extends PDFTextStreamEngine
{
- private static float DEFAULT_INDENT_THRESHOLD = 2.0f;
- private static float DEFAULT_DROP_THRESHOLD = 2.5f;
+ private static float defaultIndentThreshold = 2.0f;
+ private static float defaultDropThreshold = 2.5f;
- private static final boolean useCustomQuicksort;
+ private static final boolean USE_CUSTOM_QUICKSORT;
// enable the ability to set the default indent/drop thresholds
// with -D system properties:
@@ -87,7 +84,7 @@ public class PDFTextStripper extends PDF
{
try
{
- DEFAULT_INDENT_THRESHOLD = Float.parseFloat(strIndent);
+ defaultIndentThreshold = Float.parseFloat(strIndent);
}
catch (NumberFormatException nfe)
{
@@ -98,7 +95,7 @@ public class PDFTextStripper extends PDF
{
try
{
- DEFAULT_DROP_THRESHOLD = Float.parseFloat(strDrop);
+ defaultDropThreshold = Float.parseFloat(strDrop);
}
catch (NumberFormatException nfe)
{
@@ -122,7 +119,7 @@ public class PDFTextStripper extends PDF
// when run in an applet ignore and use default
// assume 1.7 or higher so that quicksort is used
}
- useCustomQuicksort = !is16orLess;
+ USE_CUSTOM_QUICKSORT = !is16orLess;
}
/**
@@ -151,8 +148,8 @@ public class PDFTextStripper extends PDF
private boolean sortByPosition = false;
private boolean addMoreFormatting = false;
- private float indentThreshold = DEFAULT_INDENT_THRESHOLD;
- private float dropThreshold = DEFAULT_DROP_THRESHOLD;
+ private float indentThreshold = defaultIndentThreshold;
+ private float dropThreshold = defaultDropThreshold;
// we will need to estimate where to add spaces, these are used to help guess
private float spacingTolerance = .5f;
@@ -460,9 +457,9 @@ public class PDFTextStripper extends PDF
// because the TextPositionComparator is not transitive, but
// JDK7+ enforces transitivity on comparators, we need to use
// a custom quicksort implementation (which is slower, unfortunately).
- if(useCustomQuicksort)
+ if(USE_CUSTOM_QUICKSORT)
{
- QuickSort.sort( textList, comparator );
+ QuickSort.sort(textList, comparator);
}
else
{
@@ -1069,7 +1066,7 @@ public class PDFTextStripper extends PDF
*
* @return A double List of TextPositions for all text strings on the page.
*/
- protected Vector<List<TextPosition>> getCharactersByArticle()
+ protected List<List<TextPosition>> getCharactersByArticle()
{
return charactersByArticle;
}
@@ -1751,7 +1748,7 @@ public class PDFTextStripper extends PDF
private List<WordWithTextPositions> normalize(List<LineItem> line, boolean isRtlDominant,
boolean hasRtl)
{
- LinkedList<WordWithTextPositions> normalized = new LinkedList<WordWithTextPositions>();
+ List<WordWithTextPositions> normalized = new LinkedList<WordWithTextPositions>();
StringBuilder lineBuilder = new StringBuilder();
List<TextPosition> wordPositions = new ArrayList<TextPosition>();
// concatenate the pieces of text in opposite order if RTL is dominant
@@ -1844,7 +1841,7 @@ public class PDFTextStripper extends PDF
* Used within {@link #normalize(List, boolean, boolean)} to handle a {@link TextPosition}.
* @return The StringBuilder that must be used when calling this method.
*/
- private StringBuilder normalizeAdd(LinkedList<WordWithTextPositions> normalized,
+ private StringBuilder normalizeAdd(List<WordWithTextPositions> normalized,
StringBuilder lineBuilder, List<TextPosition> wordPositions, LineItem item)
{
if (item.isWordSeparator())
Copied: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripperByArea.java (from r1659696, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFTextStripperByArea.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripperByArea.java?p2=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripperByArea.java&p1=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFTextStripperByArea.java&r1=1659696&r2=1662310&rev=1662310&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFTextStripperByArea.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripperByArea.java Wed Feb 25 21:54:21 2015
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pdfbox.util;
+package org.apache.pdfbox.text;
import java.awt.geom.Rectangle2D;
import java.io.IOException;
@@ -28,7 +28,6 @@ import java.util.Vector;
import org.apache.pdfbox.pdmodel.PDPage;
import org.apache.pdfbox.pdmodel.common.PDStream;
-import org.apache.pdfbox.text.TextPosition;
/**
* This will extract text from a specified region in the PDF.
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/TestAll.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/TestAll.java?rev=1662310&r1=1662309&r2=1662310&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/TestAll.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/TestAll.java Wed Feb 25 21:54:21 2015
@@ -28,6 +28,7 @@ import org.apache.pdfbox.io.TestIOUtils;
import org.apache.pdfbox.io.TestRandomAccessBuffer;
import org.apache.pdfbox.filter.ccitt.TestCCITTFaxG31DDecodeInputStream;
import org.apache.pdfbox.filter.ccitt.TestPackedBitArray;
+import org.apache.pdfbox.multipdf.TestLayerUtility;
import org.apache.pdfbox.pdmodel.TestFDF;
import org.apache.pdfbox.pdmodel.TestPDDocument;
import org.apache.pdfbox.pdmodel.TestPDDocumentInformation;
@@ -89,7 +90,7 @@ public class TestAll extends TestCase
suite.addTestSuite( TestPDDocument.class );
suite.addTestSuite( TestPDDocumentInformation.class );
suite.addTestSuite( TestOptionalContentGroups.class );
- suite.addTestSuite( org.apache.pdfbox.util.TestLayerUtility.class );
+ suite.addTestSuite( TestLayerUtility.class );
suite.addTest( org.apache.pdfbox.pdmodel.common.function.TestFunctions.suite() );
suite.addTestSuite( TestIOUtils.class );
Copied: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFCloneUtilityTest.java (from r1659696, pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/PDFCloneUtilityTest.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFCloneUtilityTest.java?p2=pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFCloneUtilityTest.java&p1=pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/PDFCloneUtilityTest.java&r1=1659696&r2=1662310&rev=1662310&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/PDFCloneUtilityTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFCloneUtilityTest.java Wed Feb 25 21:54:21 2015
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pdfbox.util;
+package org.apache.pdfbox.multipdf;
import java.awt.Color;
import java.io.File;
Copied: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java (from r1659696, pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/PDFMergerUtilityTest.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java?p2=pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java&p1=pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/PDFMergerUtilityTest.java&r1=1659696&r2=1662310&rev=1662310&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/PDFMergerUtilityTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PDFMergerUtilityTest.java Wed Feb 25 21:54:21 2015
@@ -13,12 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pdfbox.util;
+package org.apache.pdfbox.multipdf;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
import junit.framework.TestCase;
+import org.apache.pdfbox.multipdf.PDFMergerUtility;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.rendering.PDFRenderer;
Copied: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PageExtractorTest.java (from r1659696, pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/PageExtractorTest.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PageExtractorTest.java?p2=pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PageExtractorTest.java&p1=pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/PageExtractorTest.java&r1=1659696&r2=1662310&rev=1662310&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/PageExtractorTest.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/PageExtractorTest.java Wed Feb 25 21:54:21 2015
@@ -14,13 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pdfbox.util;
+package org.apache.pdfbox.multipdf;
import java.io.File;
-
import junit.framework.TestCase;
-import static junit.framework.TestCase.assertEquals;
-
import org.apache.pdfbox.pdmodel.PDDocument;
/**
Copied: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/TestLayerUtility.java (from r1659696, pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestLayerUtility.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/TestLayerUtility.java?p2=pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/TestLayerUtility.java&p1=pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestLayerUtility.java&r1=1659696&r2=1662310&rev=1662310&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestLayerUtility.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/multipdf/TestLayerUtility.java Wed Feb 25 21:54:21 2015
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pdfbox.util;
+package org.apache.pdfbox.multipdf;
import java.awt.Color;
import java.awt.geom.AffineTransform;
@@ -24,6 +24,7 @@ import java.io.IOException;
import junit.framework.TestCase;
import org.apache.pdfbox.cos.COSName;
+import org.apache.pdfbox.multipdf.LayerUtility;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDDocumentCatalog;
import org.apache.pdfbox.pdmodel.PDPage;
@@ -35,9 +36,10 @@ import org.apache.pdfbox.pdmodel.font.PD
import org.apache.pdfbox.pdmodel.graphics.form.PDFormXObject;
import org.apache.pdfbox.pdmodel.graphics.optionalcontent.PDOptionalContentGroup;
import org.apache.pdfbox.pdmodel.graphics.optionalcontent.PDOptionalContentProperties;
+import org.apache.pdfbox.util.Matrix;
/**
- * Tests the {@link LayerUtility} class.
+ * Tests the {@link org.apache.pdfbox.multipdf.LayerUtility} class.
*
* @version $Revision$
*/
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/font/TestFontEmbedding.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/font/TestFontEmbedding.java?rev=1662310&r1=1662309&r2=1662310&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/font/TestFontEmbedding.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/pdmodel/font/TestFontEmbedding.java Wed Feb 25 21:54:21 2015
@@ -25,7 +25,7 @@ import org.apache.pdfbox.pdmodel.PDDocum
import org.apache.pdfbox.pdmodel.PDPage;
import org.apache.pdfbox.pdmodel.common.PDRectangle;
import org.apache.pdfbox.pdmodel.PDPageContentStream;
-import org.apache.pdfbox.util.PDFTextStripper;
+import org.apache.pdfbox.text.PDFTextStripper;
/**
* Tests font embedding.
Copied: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestPDFToImage.java (from r1659696, pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestPDFToImage.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestPDFToImage.java?p2=pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestPDFToImage.java&p1=pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestPDFToImage.java&r1=1659696&r2=1662310&rev=1662310&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestPDFToImage.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestPDFToImage.java Wed Feb 25 21:54:21 2015
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pdfbox.util;
+package org.apache.pdfbox.rendering;
import java.awt.Color;
import java.awt.Graphics;
@@ -32,7 +32,6 @@ import junit.framework.TestSuite;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.pdmodel.PDDocument;
-import org.apache.pdfbox.rendering.PDFRenderer;
import javax.imageio.ImageIO;
Copied: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestRendering.java (from r1659696, pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestRendering.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestRendering.java?p2=pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestRendering.java&p1=pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestRendering.java&r1=1659696&r2=1662310&rev=1662310&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestRendering.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestRendering.java Wed Feb 25 21:54:21 2015
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.pdfbox.util;
+package org.apache.pdfbox.rendering;
import org.apache.pdfbox.ParallelParameterized;
import org.apache.pdfbox.pdmodel.PDDocument;
@@ -35,7 +35,7 @@ import java.util.List;
* Functional test for PDF rendering. This test simply tries to render
* a series of PDFs using PDFBox to make sure that no exceptions are thrown.
*
- * It does not attempt to detect if rendering is correct, see {@link TestPDFToImage}.
+ * It does not attempt to detect if rendering is correct, see {@link org.apache.pdfbox.rendering.TestPDFToImage}.
*
* @author John Hewson
*/
Copied: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/text/TestTextStripper.java (from r1659696, pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestTextStripper.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/text/TestTextStripper.java?p2=pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/text/TestTextStripper.java&p1=pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestTextStripper.java&r1=1659696&r2=1662310&rev=1662310&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/util/TestTextStripper.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/text/TestTextStripper.java Wed Feb 25 21:54:21 2015
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pdfbox.util;
+package org.apache.pdfbox.text;
import java.io.File;
import java.io.FileInputStream;
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=1662310&r1=1662309&r2=1662310&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 Feb 25 21:54:21 2015
@@ -32,7 +32,7 @@ import org.apache.pdfbox.pdmodel.common.
import org.apache.pdfbox.pdmodel.common.filespecification.PDComplexFileSpecification;
import org.apache.pdfbox.pdmodel.common.filespecification.PDEmbeddedFile;
import org.apache.pdfbox.pdmodel.encryption.AccessPermission;
-import org.apache.pdfbox.util.PDFTextStripper;
+import org.apache.pdfbox.text.PDFTextStripper;
/**
* This is the main program that simply parses the pdf document and transforms it
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=1662310&r1=1662309&r2=1662310&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 Wed Feb 25 21:54:21 2015
@@ -21,8 +21,8 @@ import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.pdfbox.util.Overlay;
-import org.apache.pdfbox.util.Overlay.Position;
+import org.apache.pdfbox.multipdf.Overlay;
+import org.apache.pdfbox.multipdf.Overlay.Position;
/**
*
Modified: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFMerger.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFMerger.java?rev=1662310&r1=1662309&r2=1662310&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFMerger.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFMerger.java Wed Feb 25 21:54:21 2015
@@ -16,7 +16,7 @@
*/
package org.apache.pdfbox.tools;
-import org.apache.pdfbox.util.PDFMergerUtility;
+import org.apache.pdfbox.multipdf.PDFMergerUtility;
/**
* This is the main program that will take a list of pdf documents and merge them,
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=1662310&r1=1662309&r2=1662310&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 Wed Feb 25 21:54:21 2015
@@ -24,7 +24,7 @@ import java.util.List;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdfwriter.COSWriter;
-import org.apache.pdfbox.util.Splitter;
+import org.apache.pdfbox.multipdf.Splitter;
/**
* This is the main program that will take a pdf document and split it into
Modified: pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFText2HTML.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFText2HTML.java?rev=1662310&r1=1662309&r2=1662310&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFText2HTML.java (original)
+++ pdfbox/trunk/tools/src/main/java/org/apache/pdfbox/tools/PDFText2HTML.java Wed Feb 25 21:54:21 2015
@@ -25,7 +25,7 @@ import java.util.Set;
import org.apache.pdfbox.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.font.PDFontDescriptor;
-import org.apache.pdfbox.util.PDFTextStripper;
+import org.apache.pdfbox.text.PDFTextStripper;
import org.apache.pdfbox.text.TextPosition;
/**
Modified: pdfbox/trunk/tools/src/test/java/org/apache/pdfbox/tools/TestPDFText2HTML.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/tools/src/test/java/org/apache/pdfbox/tools/TestPDFText2HTML.java?rev=1662310&r1=1662309&r2=1662310&view=diff
==============================================================================
--- pdfbox/trunk/tools/src/test/java/org/apache/pdfbox/tools/TestPDFText2HTML.java (original)
+++ pdfbox/trunk/tools/src/test/java/org/apache/pdfbox/tools/TestPDFText2HTML.java Wed Feb 25 21:54:21 2015
@@ -27,7 +27,7 @@ import org.apache.pdfbox.pdmodel.font.PD
import org.apache.pdfbox.pdmodel.font.PDType1Font;
import junit.framework.TestCase;
-import org.apache.pdfbox.util.PDFTextStripper;
+import org.apache.pdfbox.text.PDFTextStripper;
public class TestPDFText2HTML extends TestCase {