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 2014/02/26 00:55:48 UTC
svn commit: r1571870 - in /pdfbox/trunk/pdfbox/src:
main/java/org/apache/pdfbox/filter/
main/java/org/apache/pdfbox/filter/ccitt/ main/java/org/apache/pdfbox/io/
main/java/org/apache/pdfbox/io/ccitt/ test/java/org/apache/pdfbox/
test/java/org/apache/pd...
Author: jahewson
Date: Tue Feb 25 23:55:47 2014
New Revision: 1571870
URL: http://svn.apache.org/r1571870
Log:
Move classes only used in filters to org.apache.pdfbox package
Added:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ASCII85InputStream.java
- copied, changed from r1571090, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/ASCII85InputStream.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ASCII85OutputStream.java
- copied, changed from r1571090, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/ASCII85OutputStream.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ccitt/
- copied from r1571090, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/ccitt/
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/filter/ccitt/
- copied from r1571090, pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/io/ccitt/
Removed:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/ASCII85InputStream.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/ASCII85OutputStream.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/ccitt/
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/io/ccitt/
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ASCII85Filter.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/CCITTFaxFilter.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ccitt/CCITTFaxConstants.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ccitt/CCITTFaxG31DDecodeInputStream.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ccitt/FillOrderChangeInputStream.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ccitt/PackedBitArray.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/TestAll.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/filter/ccitt/AbstractCCITTFaxTestCase.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/filter/ccitt/TestCCITTFaxG31DDecodeInputStream.java
pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/filter/ccitt/TestPackedBitArray.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ASCII85Filter.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ASCII85Filter.java?rev=1571870&r1=1571869&r2=1571870&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ASCII85Filter.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ASCII85Filter.java Tue Feb 25 23:55:47 2014
@@ -20,9 +20,6 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import org.apache.pdfbox.io.ASCII85InputStream;
-import org.apache.pdfbox.io.ASCII85OutputStream;
-
import org.apache.pdfbox.cos.COSDictionary;
import org.apache.pdfbox.io.IOUtils;
Copied: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ASCII85InputStream.java (from r1571090, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/ASCII85InputStream.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ASCII85InputStream.java?p2=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ASCII85InputStream.java&p1=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/ASCII85InputStream.java&r1=1571090&r2=1571870&rev=1571870&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/ASCII85InputStream.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ASCII85InputStream.java Tue Feb 25 23:55:47 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pdfbox.io;
+package org.apache.pdfbox.filter;
import java.io.FilterInputStream;
import java.io.IOException;
@@ -26,7 +26,7 @@ import java.io.InputStream;
* @author <a href="mailto:ben@benlitchfield.com">Ben Litchfield</a>
*
*/
-public class ASCII85InputStream extends FilterInputStream
+final class ASCII85InputStream extends FilterInputStream
{
private int index;
private int n;
Copied: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ASCII85OutputStream.java (from r1571090, pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/ASCII85OutputStream.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ASCII85OutputStream.java?p2=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ASCII85OutputStream.java&p1=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/ASCII85OutputStream.java&r1=1571090&r2=1571870&rev=1571870&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/io/ASCII85OutputStream.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ASCII85OutputStream.java Tue Feb 25 23:55:47 2014
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.pdfbox.io;
+package org.apache.pdfbox.filter;
import java.io.FilterOutputStream;
import java.io.IOException;
@@ -26,7 +26,7 @@ import java.io.OutputStream;
* @author <a href="mailto:ben@benlitchfield.com">Ben Litchfield</a>
*
*/
-public class ASCII85OutputStream extends FilterOutputStream
+final class ASCII85OutputStream extends FilterOutputStream
{
private int lineBreak;
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/CCITTFaxFilter.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/CCITTFaxFilter.java?rev=1571870&r1=1571869&r2=1571870&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/CCITTFaxFilter.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/CCITTFaxFilter.java Tue Feb 25 23:55:47 2014
@@ -23,13 +23,11 @@ import java.io.OutputStream;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.pdfbox.cos.COSArray;
-import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSDictionary;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.io.IOUtils;
-import org.apache.pdfbox.io.ccitt.CCITTFaxG31DDecodeInputStream;
-import org.apache.pdfbox.io.ccitt.FillOrderChangeInputStream;
+import org.apache.pdfbox.filter.ccitt.CCITTFaxG31DDecodeInputStream;
+import org.apache.pdfbox.filter.ccitt.FillOrderChangeInputStream;
/**
* Decodes image data that has been encoded using either Group 3 or Group 4
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ccitt/CCITTFaxConstants.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ccitt/CCITTFaxConstants.java?rev=1571870&r1=1571090&r2=1571870&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ccitt/CCITTFaxConstants.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ccitt/CCITTFaxConstants.java Tue Feb 25 23:55:47 2014
@@ -17,21 +17,22 @@
/* $Id$ */
-package org.apache.pdfbox.io.ccitt;
+package org.apache.pdfbox.filter.ccitt;
/**
* Constants for CCITT Fax Filter.
* @version $Revision$
*/
-public interface CCITTFaxConstants
+final class CCITTFaxConstants
{
-
/** A constant for group 3 1D encoding (ITU T.4). */
- int COMPRESSION_GROUP3_1D = 0;
+ final int COMPRESSION_GROUP3_1D = 0;
+
/** A constant for group 3 2D encoding (ITU T.4). */
- int COMPRESSION_GROUP3_2D = 1;
+ final int COMPRESSION_GROUP3_2D = 1;
+
/** A constant for group 4 2D encoding (ITU T.6). */
- int COMPRESSION_GROUP4_2D = 2;
+ final int COMPRESSION_GROUP4_2D = 2;
//Format: First 8 bits: length of pattern, Second 8 bits: pattern
@@ -78,5 +79,4 @@ public interface CCITTFaxConstants
/** The EOL code word. */
public static final short EOL_CODE = 0x0C01;
-
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ccitt/CCITTFaxG31DDecodeInputStream.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ccitt/CCITTFaxG31DDecodeInputStream.java?rev=1571870&r1=1571090&r2=1571870&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ccitt/CCITTFaxG31DDecodeInputStream.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ccitt/CCITTFaxG31DDecodeInputStream.java Tue Feb 25 23:55:47 2014
@@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.pdfbox.io.ccitt;
+package org.apache.pdfbox.filter.ccitt;
import java.io.IOException;
import java.io.InputStream;
@@ -26,9 +26,8 @@ import java.io.InputStream;
* This is a CCITT Group 3 1D decoder (ITU T.4).
* @version $Revision$
*/
-public class CCITTFaxG31DDecodeInputStream extends InputStream implements CCITTFaxConstants
+public final class CCITTFaxG31DDecodeInputStream extends InputStream
{
-
private static final int CODE_WORD = 0;
private static final int SIGNAL_EOD = -1;
private static final int SIGNAL_EOL = -2;
@@ -221,12 +220,12 @@ public class CCITTFaxG31DDecodeInputStre
private static void buildLookupTree()
{
- buildUpTerminating(WHITE_TERMINATING, WHITE_LOOKUP_TREE_ROOT, true);
- buildUpTerminating(BLACK_TERMINATING, BLACK_LOOKUP_TREE_ROOT, false);
- buildUpMakeUp(WHITE_MAKE_UP, WHITE_LOOKUP_TREE_ROOT);
- buildUpMakeUp(BLACK_MAKE_UP, BLACK_LOOKUP_TREE_ROOT);
- buildUpMakeUpLong(LONG_MAKE_UP, WHITE_LOOKUP_TREE_ROOT);
- buildUpMakeUpLong(LONG_MAKE_UP, BLACK_LOOKUP_TREE_ROOT);
+ buildUpTerminating(CCITTFaxConstants.WHITE_TERMINATING, WHITE_LOOKUP_TREE_ROOT, true);
+ buildUpTerminating(CCITTFaxConstants.BLACK_TERMINATING, BLACK_LOOKUP_TREE_ROOT, false);
+ buildUpMakeUp(CCITTFaxConstants.WHITE_MAKE_UP, WHITE_LOOKUP_TREE_ROOT);
+ buildUpMakeUp(CCITTFaxConstants.BLACK_MAKE_UP, BLACK_LOOKUP_TREE_ROOT);
+ buildUpMakeUpLong(CCITTFaxConstants.LONG_MAKE_UP, WHITE_LOOKUP_TREE_ROOT);
+ buildUpMakeUpLong(CCITTFaxConstants.LONG_MAKE_UP, BLACK_LOOKUP_TREE_ROOT);
LookupTreeNode eolNode = new EndOfLineTreeNode();
addLookupTreeNode(EOL_STARTER, WHITE_LOOKUP_TREE_ROOT, eolNode);
addLookupTreeNode(EOL_STARTER, BLACK_LOOKUP_TREE_ROOT, eolNode);
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ccitt/FillOrderChangeInputStream.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ccitt/FillOrderChangeInputStream.java?rev=1571870&r1=1571090&r2=1571870&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ccitt/FillOrderChangeInputStream.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ccitt/FillOrderChangeInputStream.java Tue Feb 25 23:55:47 2014
@@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.pdfbox.io.ccitt;
+package org.apache.pdfbox.filter.ccitt;
import java.io.FilterInputStream;
import java.io.IOException;
@@ -27,9 +27,8 @@ import java.io.InputStream;
* This filtering input stream does a fill order change required for certain TIFF images.
* @version $Revision$
*/
-public class FillOrderChangeInputStream extends FilterInputStream
+public final class FillOrderChangeInputStream extends FilterInputStream
{
-
/**
* Main constructor.
* @param in the underlying input stream
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ccitt/PackedBitArray.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ccitt/PackedBitArray.java?rev=1571870&r1=1571090&r2=1571870&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ccitt/PackedBitArray.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/filter/ccitt/PackedBitArray.java Tue Feb 25 23:55:47 2014
@@ -17,15 +17,14 @@
/* $Id$ */
-package org.apache.pdfbox.io.ccitt;
+package org.apache.pdfbox.filter.ccitt;
/**
* Represents an array of bits packed in a byte array of fixed size.
* @version $Revision$
*/
-public class PackedBitArray
+final class PackedBitArray
{
-
private int bitCount;
private byte[] data;
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=1571870&r1=1571869&r2=1571870&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 Tue Feb 25 23:55:47 2014
@@ -26,8 +26,8 @@ import org.apache.pdfbox.cos.TestCOSStri
import org.apache.pdfbox.filter.TestFilters;
import org.apache.pdfbox.io.TestIOUtils;
import org.apache.pdfbox.io.TestRandomAccessBuffer;
-import org.apache.pdfbox.io.ccitt.TestCCITTFaxG31DDecodeInputStream;
-import org.apache.pdfbox.io.ccitt.TestPackedBitArray;
+import org.apache.pdfbox.filter.ccitt.TestCCITTFaxG31DDecodeInputStream;
+import org.apache.pdfbox.filter.ccitt.TestPackedBitArray;
import org.apache.pdfbox.pdmodel.TestFDF;
import org.apache.pdfbox.pdmodel.TestPDDocument;
import org.apache.pdfbox.pdmodel.TestPDDocumentCatalog;
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/filter/ccitt/AbstractCCITTFaxTestCase.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/filter/ccitt/AbstractCCITTFaxTestCase.java?rev=1571870&r1=1571090&r2=1571870&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/filter/ccitt/AbstractCCITTFaxTestCase.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/filter/ccitt/AbstractCCITTFaxTestCase.java Tue Feb 25 23:55:47 2014
@@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.pdfbox.io.ccitt;
+package org.apache.pdfbox.filter.ccitt;
import junit.framework.TestCase;
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/filter/ccitt/TestCCITTFaxG31DDecodeInputStream.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/filter/ccitt/TestCCITTFaxG31DDecodeInputStream.java?rev=1571870&r1=1571090&r2=1571870&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/filter/ccitt/TestCCITTFaxG31DDecodeInputStream.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/filter/ccitt/TestCCITTFaxG31DDecodeInputStream.java Tue Feb 25 23:55:47 2014
@@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.pdfbox.io.ccitt;
+package org.apache.pdfbox.filter.ccitt;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/filter/ccitt/TestPackedBitArray.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/filter/ccitt/TestPackedBitArray.java?rev=1571870&r1=1571090&r2=1571870&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/filter/ccitt/TestPackedBitArray.java (original)
+++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/filter/ccitt/TestPackedBitArray.java Tue Feb 25 23:55:47 2014
@@ -17,7 +17,7 @@
/* $Id$ */
-package org.apache.pdfbox.io.ccitt;
+package org.apache.pdfbox.filter.ccitt;
import junit.framework.TestCase;