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/06/17 20:52:16 UTC
svn commit: r1603254 - in
/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight: content/
font/ font/util/ process/reflect/ xobject/
Author: jahewson
Date: Tue Jun 17 18:52:15 2014
New Revision: 1603254
URL: http://svn.apache.org/r1603254
Log:
PDFBOX-2145: Rename preflight PDFStreamEngine subclasses
Added:
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/content/PreflightContentStream.java
- copied, changed from r1603251, pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/content/ContentStreamWrapper.java
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/content/PreflightStreamEngine.java
- copied, changed from r1603251, pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/content/ContentStreamEngine.java
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/util/PreflightType3Stream.java
- copied, changed from r1603251, pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/util/PDFAType3StreamParser.java
Removed:
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/content/ContentStreamEngine.java
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/content/ContentStreamWrapper.java
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/util/PDFAType3StreamParser.java
Modified:
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/Type3FontValidator.java
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/SinglePageValidationProcess.java
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/TilingPatternValidationProcess.java
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/xobject/XObjFormValidator.java
Copied: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/content/PreflightContentStream.java (from r1603251, pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/content/ContentStreamWrapper.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/content/PreflightContentStream.java?p2=pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/content/PreflightContentStream.java&p1=pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/content/ContentStreamWrapper.java&r1=1603251&r2=1603254&rev=1603254&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/content/ContentStreamWrapper.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/content/PreflightContentStream.java Tue Jun 17 18:52:15 2014
@@ -51,15 +51,13 @@ import org.apache.pdfbox.preflight.font.
import org.apache.pdfbox.util.operator.PDFOperator;
import org.apache.pdfbox.util.operator.OperatorProcessor;
-public class ContentStreamWrapper extends ContentStreamEngine
+public class PreflightContentStream extends PreflightStreamEngine
{
-
- public ContentStreamWrapper(PreflightContext _context, PDPage _page)
+ public PreflightContentStream(PreflightContext _context, PDPage _page)
{
super(_context, _page);
}
-
/**
* Process the validation of a PageContent (The page is initialized by the constructor)
*
Copied: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/content/PreflightStreamEngine.java (from r1603251, pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/content/ContentStreamEngine.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/content/PreflightStreamEngine.java?p2=pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/content/PreflightStreamEngine.java&p1=pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/content/ContentStreamEngine.java&r1=1603251&r2=1603254&rev=1603254&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/content/ContentStreamEngine.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/content/PreflightStreamEngine.java Tue Jun 17 18:52:15 2014
@@ -92,9 +92,8 @@ import org.apache.pdfbox.util.operator.S
* This class inherits from org.apache.pdfbox.util.PDFStreamEngine to allow the validation of specific rules in
* ContentStream.
*/
-public abstract class ContentStreamEngine extends PDFStreamEngine
+public abstract class PreflightStreamEngine extends PDFStreamEngine
{
-
private enum ColorSpaceType
{
RGB, CMYK, ALL
@@ -108,7 +107,7 @@ public abstract class ContentStreamEngin
protected Map<String, OperatorProcessor> contentStreamEngineOperators = new HashMap<String, OperatorProcessor>();
- public ContentStreamEngine(PreflightContext _context, PDPage _page)
+ public PreflightStreamEngine(PreflightContext _context, PDPage _page)
{
super();
this.context = _context;
Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/Type3FontValidator.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/Type3FontValidator.java?rev=1603254&r1=1603253&r2=1603254&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/Type3FontValidator.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/Type3FontValidator.java Tue Jun 17 18:52:15 2014
@@ -53,7 +53,7 @@ import org.apache.pdfbox.preflight.excep
import org.apache.pdfbox.preflight.font.container.FontContainer;
import org.apache.pdfbox.preflight.font.container.Type3Container;
import org.apache.pdfbox.preflight.font.util.GlyphException;
-import org.apache.pdfbox.preflight.font.util.PDFAType3StreamParser;
+import org.apache.pdfbox.preflight.font.util.PreflightType3Stream;
import org.apache.pdfbox.preflight.utils.COSUtils;
import org.apache.pdfbox.preflight.utils.ContextHelper;
@@ -405,7 +405,7 @@ public class Type3FontValidator extends
private float getWidthFromCharacterStream(PDResources resources, COSStream charStream) throws IOException
{
PreflightPath vPath = context.getValidationPath();
- PDFAType3StreamParser parser = new PDFAType3StreamParser(context, vPath.getClosestPathElement(PDPage.class));
+ PreflightType3Stream parser = new PreflightType3Stream(context, vPath.getClosestPathElement(PDPage.class));
parser.resetEngine();
parser.processSubStream(resources, charStream);
return parser.getWidth();
Copied: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/util/PreflightType3Stream.java (from r1603251, pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/util/PDFAType3StreamParser.java)
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/util/PreflightType3Stream.java?p2=pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/util/PreflightType3Stream.java&p1=pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/util/PDFAType3StreamParser.java&r1=1603251&r2=1603254&rev=1603254&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/util/PDFAType3StreamParser.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/util/PreflightType3Stream.java Tue Jun 17 18:52:15 2014
@@ -33,14 +33,14 @@ import org.apache.pdfbox.cos.COSStream;
import org.apache.pdfbox.pdmodel.PDPage;
import org.apache.pdfbox.pdmodel.graphics.image.PDInlineImage;
import org.apache.pdfbox.preflight.PreflightContext;
-import org.apache.pdfbox.preflight.content.ContentStreamEngine;
+import org.apache.pdfbox.preflight.content.PreflightStreamEngine;
import org.apache.pdfbox.util.operator.PDFOperator;
/**
* This class is used to parse a glyph of a Type3 font program. If the glyph is parsed without error, the width of the
* glyph is accessible through the getWidth method.
*/
-public class PDFAType3StreamParser extends ContentStreamEngine
+public class PreflightType3Stream extends PreflightStreamEngine
{
private boolean firstOperator = true;
private float width = 0;
@@ -48,7 +48,7 @@ public class PDFAType3StreamParser exten
private PDInlineImage image = null;
private BoundingBox box = null;
- public PDFAType3StreamParser(PreflightContext context, PDPage page)
+ public PreflightType3Stream(PreflightContext context, PDPage page)
{
super(context, page);
}
Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/SinglePageValidationProcess.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/SinglePageValidationProcess.java?rev=1603254&r1=1603253&r2=1603254&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/SinglePageValidationProcess.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/SinglePageValidationProcess.java Tue Jun 17 18:52:15 2014
@@ -52,7 +52,7 @@ import org.apache.pdfbox.preflight.Prefl
import org.apache.pdfbox.preflight.PreflightContext;
import org.apache.pdfbox.preflight.PreflightPath;
import org.apache.pdfbox.preflight.ValidationResult.ValidationError;
-import org.apache.pdfbox.preflight.content.ContentStreamWrapper;
+import org.apache.pdfbox.preflight.content.PreflightContentStream;
import org.apache.pdfbox.preflight.exception.ValidationException;
import org.apache.pdfbox.preflight.graphic.ColorSpaceHelper;
import org.apache.pdfbox.preflight.graphic.ColorSpaceHelperFactory;
@@ -176,7 +176,7 @@ public class SinglePageValidationProcess
// TODO add this wrapper in the config object ?
try
{
- ContentStreamWrapper csWrapper = new ContentStreamWrapper(context, page);
+ PreflightContentStream csWrapper = new PreflightContentStream(context, page);
csWrapper.validPageContentStream();
}
catch (IOException e)
Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/TilingPatternValidationProcess.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/TilingPatternValidationProcess.java?rev=1603254&r1=1603253&r2=1603254&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/TilingPatternValidationProcess.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/TilingPatternValidationProcess.java Tue Jun 17 18:52:15 2014
@@ -34,7 +34,7 @@ import org.apache.pdfbox.preflight.Prefl
import org.apache.pdfbox.preflight.PreflightContext;
import org.apache.pdfbox.preflight.PreflightPath;
import org.apache.pdfbox.preflight.ValidationResult.ValidationError;
-import org.apache.pdfbox.preflight.content.ContentStreamWrapper;
+import org.apache.pdfbox.preflight.content.PreflightContentStream;
import org.apache.pdfbox.preflight.exception.ValidationException;
import org.apache.pdfbox.preflight.process.AbstractProcess;
import org.apache.pdfbox.preflight.utils.ContextHelper;
@@ -79,7 +79,7 @@ public class TilingPatternValidationProc
protected void parsePatternContent(PreflightContext context, PDPage page, PDTilingPattern pattern)
throws ValidationException
{
- ContentStreamWrapper csWrapper = new ContentStreamWrapper(context, page);
+ PreflightContentStream csWrapper = new PreflightContentStream(context, page);
csWrapper.validPatternContentStream((COSStream) pattern.getCOSObject());
}
Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/xobject/XObjFormValidator.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/xobject/XObjFormValidator.java?rev=1603254&r1=1603253&r2=1603254&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/xobject/XObjFormValidator.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/xobject/XObjFormValidator.java Tue Jun 17 18:52:15 2014
@@ -40,7 +40,7 @@ import org.apache.pdfbox.preflight.Prefl
import org.apache.pdfbox.preflight.PreflightContext;
import org.apache.pdfbox.preflight.PreflightPath;
import org.apache.pdfbox.preflight.ValidationResult.ValidationError;
-import org.apache.pdfbox.preflight.content.ContentStreamWrapper;
+import org.apache.pdfbox.preflight.content.PreflightContentStream;
import org.apache.pdfbox.preflight.exception.ValidationException;
import org.apache.pdfbox.preflight.utils.COSUtils;
import org.apache.pdfbox.preflight.utils.ContextHelper;
@@ -109,7 +109,7 @@ public class XObjFormValidator extends A
protected void validateXObjectContent() throws ValidationException
{
PreflightPath vPath = context.getValidationPath();
- ContentStreamWrapper csWrapper = new ContentStreamWrapper(context, vPath.getClosestPathElement(PDPage.class));
+ PreflightContentStream csWrapper = new PreflightContentStream(context, vPath.getClosestPathElement(PDPage.class));
csWrapper.validXObjContentStream(pdXObj);
}