Author: jahewson
Date: Wed Feb 26 06:52:04 2014
New Revision: 1571933
URL: http://svn.apache.org/r1571933
Log:
Housekeeping for Pattern classes
Added:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/PDAbstractPattern.java
- copied, changed from r1571906,
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/PDPatternDictionary.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShading.java
- copied, changed from r1571906,
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingResources.java
Removed:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/PDPatternDictionary.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingResources.java
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/PageDrawer.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDResources.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColorSpace.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDPattern.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/PDShadingPattern.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/PDTilingPattern.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/GouraudShadingContext.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType1.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType2.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType3.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType4.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType5.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType6.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType7.java
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/ResourcesValidationProcess.java
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/ShaddingPatternValidationProcess.java
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/PageDrawer.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/PageDrawer.java?rev=1571933&r1=1571932&r2=1571933&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/PageDrawer.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfviewer/PageDrawer.java
Wed Feb 26 06:52:04 2014
@@ -70,7 +70,7 @@ import org.apache.pdfbox.pdmodel.graphic
import org.apache.pdfbox.pdmodel.graphics.color.PDColorSpace;
import org.apache.pdfbox.pdmodel.graphics.pattern.PDTilingPattern;
import org.apache.pdfbox.pdmodel.graphics.shading.AxialShadingPaint;
-import org.apache.pdfbox.pdmodel.graphics.shading.PDShadingResources;
+import org.apache.pdfbox.pdmodel.graphics.shading.PDShading;
import org.apache.pdfbox.pdmodel.graphics.shading.PDShadingType2;
import org.apache.pdfbox.pdmodel.graphics.shading.PDShadingType3;
import org.apache.pdfbox.pdmodel.graphics.shading.RadialShadingPaint;
@@ -825,7 +825,7 @@ public class PageDrawer extends PDFStrea
// TODO would this now be better off using PDPattern?
public void shFill(COSName shadingName) throws IOException
{
- PDShadingResources shading =
getResources().getShadings().get(shadingName.getName());
+ PDShading shading =
getResources().getShadings().get(shadingName.getName());
LOG.debug("Shading = " + shading.toString());
int shadingType = shading.getShadingType();
Matrix ctm = getGraphicsState().getCurrentTransformationMatrix();
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDResources.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDResources.java?rev=1571933&r1=1571932&r2=1571933&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDResources.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDResources.java
Wed Feb 26 06:52:04 2014
@@ -32,8 +32,8 @@ import org.apache.pdfbox.pdmodel.font.PD
import org.apache.pdfbox.pdmodel.font.PDFontFactory;
import org.apache.pdfbox.pdmodel.graphics.PDExtendedGraphicsState;
import org.apache.pdfbox.pdmodel.graphics.color.PDColorSpace;
-import org.apache.pdfbox.pdmodel.graphics.pattern.PDPatternDictionary;
-import org.apache.pdfbox.pdmodel.graphics.shading.PDShadingResources;
+import org.apache.pdfbox.pdmodel.graphics.pattern.PDAbstractPattern;
+import org.apache.pdfbox.pdmodel.graphics.shading.PDShading;
import org.apache.pdfbox.pdmodel.graphics.image.PDImageXObject;
import org.apache.pdfbox.pdmodel.graphics.PDXObject;
import org.apache.pdfbox.pdmodel.markedcontent.PDPropertyList;
@@ -54,8 +54,8 @@ public class PDResources implements COSO
private Map<PDXObject, String> xobjectMappings = null;
private HashMap<String, PDImageXObject> images = null;
private Map<String, PDExtendedGraphicsState> graphicsStates = null;
- private Map<String, PDPatternDictionary> patterns = null;
- private Map<String, PDShadingResources> shadings = null;
+ private Map<String, PDAbstractPattern> patterns = null;
+ private Map<String, PDShading> shadings = null;
/**
* Log instance.
@@ -437,24 +437,24 @@ public class PDResources implements COSO
/**
* This will get the map of patterns. This will return null if the
underlying resources dictionary does not have a
- * patterns dictionary. The keys are the pattern name as a String and the
values are PDPatternDictionary objects.
+ * patterns dictionary. The keys are the pattern name as a String and the
values are PDAbstractPattern objects.
*
* @return The map of pattern resources objects.
*
* @throws IOException If there is an error getting the pattern resources.
*/
- public Map<String, PDPatternDictionary> getPatterns() throws IOException
+ public Map<String, PDAbstractPattern> getPatterns() throws IOException
{
if (patterns == null)
{
COSDictionary patternsDictionary = (COSDictionary)
resources.getDictionaryObject(COSName.PATTERN);
if (patternsDictionary != null)
{
- patterns = new HashMap<String, PDPatternDictionary>();
+ patterns = new HashMap<String, PDAbstractPattern>();
for (COSName name : patternsDictionary.keySet())
{
COSDictionary dictionary = (COSDictionary)
patternsDictionary.getDictionaryObject(name);
- patterns.put(name.getName(),
PDPatternDictionary.create(dictionary));
+ patterns.put(name.getName(),
PDAbstractPattern.create(dictionary));
}
}
}
@@ -466,7 +466,7 @@ public class PDResources implements COSO
*
* @param patternsValue The new map of patterns.
*/
- public void setPatterns(Map<String, PDPatternDictionary> patternsValue)
+ public void setPatterns(Map<String, PDAbstractPattern> patternsValue)
{
patterns = patternsValue;
if (patternsValue != null)
@@ -476,7 +476,7 @@ public class PDResources implements COSO
while (iter.hasNext())
{
String name = iter.next();
- PDPatternDictionary pattern = patternsValue.get(name);
+ PDAbstractPattern pattern = patternsValue.get(name);
dic.setItem(COSName.getPDFName(name), pattern.getCOSObject());
}
resources.setItem(COSName.PATTERN, dic);
@@ -489,24 +489,24 @@ public class PDResources implements COSO
/**
* This will get the map of shadings. This will return null if the
underlying resources dictionary does not have a
- * shading dictionary. The keys are the shading name as a String and the
values are PDShadingResources objects.
+ * shading dictionary. The keys are the shading name as a String and the
values are PDShading objects.
*
* @return The map of shading resources objects.
*
* @throws IOException If there is an error getting the shading resources.
*/
- public Map<String, PDShadingResources> getShadings() throws IOException
+ public Map<String, PDShading> getShadings() throws IOException
{
if (shadings == null)
{
COSDictionary shadingsDictionary = (COSDictionary)
resources.getDictionaryObject(COSName.SHADING);
if (shadingsDictionary != null)
{
- shadings = new HashMap<String, PDShadingResources>();
+ shadings = new HashMap<String, PDShading>();
for (COSName name : shadingsDictionary.keySet())
{
COSDictionary dictionary = (COSDictionary)
shadingsDictionary.getDictionaryObject(name);
- shadings.put(name.getName(),
PDShadingResources.create(dictionary));
+ shadings.put(name.getName(), PDShading.create(dictionary));
}
}
}
@@ -518,7 +518,7 @@ public class PDResources implements COSO
*
* @param shadingsValue The new map of shadings.
*/
- public void setShadings(Map<String, PDShadingResources> shadingsValue)
+ public void setShadings(Map<String, PDShading> shadingsValue)
{
shadings = shadingsValue;
if (shadingsValue != null)
@@ -528,7 +528,7 @@ public class PDResources implements COSO
while (iter.hasNext())
{
String name = iter.next();
- PDShadingResources shading = shadingsValue.get(name);
+ PDShading shading = shadingsValue.get(name);
dic.setItem(COSName.getPDFName(name), shading.getCOSObject());
}
resources.setItem(COSName.SHADING, dic);
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColorSpace.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColorSpace.java?rev=1571933&r1=1571932&r2=1571933&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColorSpace.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColorSpace.java
Wed Feb 26 06:52:04 2014
@@ -21,7 +21,7 @@ import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.pdmodel.common.COSObjectable;
-import org.apache.pdfbox.pdmodel.graphics.pattern.PDPatternDictionary;
+import org.apache.pdfbox.pdmodel.graphics.pattern.PDAbstractPattern;
import java.awt.Color;
import java.awt.Paint;
@@ -66,7 +66,7 @@ public abstract class PDColorSpace imple
*/
public static PDColorSpace create(COSBase colorSpace,
Map<String, PDColorSpace> colorSpaces,
- Map<String, PDPatternDictionary>
patterns)
+ Map<String, PDAbstractPattern> patterns)
throws IOException
{
if (colorSpace instanceof COSName)
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDPattern.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDPattern.java?rev=1571933&r1=1571932&r2=1571933&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDPattern.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDPattern.java
Wed Feb 26 06:52:04 2014
@@ -19,12 +19,12 @@ package org.apache.pdfbox.pdmodel.graphi
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.cos.COSName;
-import org.apache.pdfbox.pdmodel.graphics.pattern.PDPatternDictionary;
+import org.apache.pdfbox.pdmodel.graphics.pattern.PDAbstractPattern;
import org.apache.pdfbox.pdmodel.graphics.pattern.PDShadingPattern;
import org.apache.pdfbox.pdmodel.graphics.pattern.PDTilingPattern;
import org.apache.pdfbox.pdmodel.graphics.pattern.tiling.TilingPaint;
import org.apache.pdfbox.pdmodel.graphics.shading.AxialShadingPaint;
-import org.apache.pdfbox.pdmodel.graphics.shading.PDShadingResources;
+import org.apache.pdfbox.pdmodel.graphics.shading.PDShading;
import org.apache.pdfbox.pdmodel.graphics.shading.PDShadingType1;
import org.apache.pdfbox.pdmodel.graphics.shading.PDShadingType2;
import org.apache.pdfbox.pdmodel.graphics.shading.PDShadingType3;
@@ -53,13 +53,13 @@ public final class PDPattern extends PDS
{
private static final Log LOG = LogFactory.getLog(PDPattern.class);
- private Map<String, PDPatternDictionary> patterns;
+ private Map<String, PDAbstractPattern> patterns;
private PDColorSpace underlyingColorSpace;
/**
* Creates a new pattern color space.
*/
- public PDPattern(Map<String, PDPatternDictionary> patterns)
+ public PDPattern(Map<String, PDAbstractPattern> patterns)
{
this.patterns = patterns;
}
@@ -67,7 +67,7 @@ public final class PDPattern extends PDS
/**
* Creates a new uncolored tiling pattern color space.
*/
- public PDPattern(Map<String, PDPatternDictionary> patterns, PDColorSpace
colorSpace)
+ public PDPattern(Map<String, PDAbstractPattern> patterns, PDColorSpace
colorSpace)
{
this.patterns = patterns;
this.underlyingColorSpace = colorSpace;
@@ -123,7 +123,7 @@ public final class PDPattern extends PDS
throw new IOException("pattern " + color.getPatternName() + " was
not found");
}
- PDPatternDictionary pattern = patterns.get(color.getPatternName());
+ PDAbstractPattern pattern = patterns.get(color.getPatternName());
if (pattern instanceof PDTilingPattern)
{
return toTilingPaint((PDTilingPattern)pattern, color);
@@ -151,27 +151,27 @@ public final class PDPattern extends PDS
public Paint toShadingPaint(PDShadingPattern shadingPattern, int
pageHeight)
throws IOException
{
- PDShadingResources shadingResources = shadingPattern.getShading();
+ PDShading shadingResources = shadingPattern.getShading();
int shadingType = shadingResources != null ?
shadingResources.getShadingType() : 0;
switch (shadingType)
{
- case PDShadingResources.SHADING_TYPE1:
+ case PDShading.SHADING_TYPE1:
return new Type1ShadingPaint((PDShadingType1)shadingResources,
shadingPattern.getMatrix(),
pageHeight);
- case PDShadingResources.SHADING_TYPE2:
+ case PDShading.SHADING_TYPE2:
return new AxialShadingPaint((PDShadingType2)shadingResources,
shadingPattern.getMatrix(),
pageHeight);
- case PDShadingResources.SHADING_TYPE3:
+ case PDShading.SHADING_TYPE3:
return new RadialShadingPaint((PDShadingType3)shadingResources,
shadingPattern.getMatrix(),
pageHeight);
- case PDShadingResources.SHADING_TYPE4:
+ case PDShading.SHADING_TYPE4:
return new Type4ShadingPaint((PDShadingType4)shadingResources,
shadingPattern.getMatrix(),
pageHeight);
- case PDShadingResources.SHADING_TYPE5:
+ case PDShading.SHADING_TYPE5:
return new Type5ShadingPaint((PDShadingType5)shadingResources,
shadingPattern.getMatrix(),
pageHeight);
- case PDShadingResources.SHADING_TYPE6:
- case PDShadingResources.SHADING_TYPE7:
+ case PDShading.SHADING_TYPE6:
+ case PDShading.SHADING_TYPE7:
// TODO ...
LOG.debug("Not implemented, shading type: " + shadingType);
return new Color(0, 0, 0, 0); // transparent
Copied:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/PDAbstractPattern.java
(from r1571906,
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/PDPatternDictionary.java)
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/PDAbstractPattern.java?p2=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/PDAbstractPattern.java&p1=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/PDPatternDictionary.java&r1=1571906&r2=1571933&rev=1571933&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/PDPatternDictionary.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/PDAbstractPattern.java
Wed Feb 26 06:52:04 2014
@@ -27,7 +27,7 @@ import org.apache.pdfbox.pdmodel.common.
* A Pattern dictionary from a page's resources.
* @author Andreas Lehmkühler
*/
-public abstract class PDPatternDictionary implements COSObjectable
+public abstract class PDAbstractPattern implements COSObjectable
{
/** Tiling pattern type. */
public static final int TYPE_TILING_PATTERN = 1;
@@ -41,9 +41,9 @@ public abstract class PDPatternDictionar
* @return the newly created pattern resources object
* @throws IOException If we are unable to create the PDPattern object.
*/
- public static PDPatternDictionary create(COSDictionary resourceDictionary)
throws IOException
+ public static PDAbstractPattern create(COSDictionary resourceDictionary)
throws IOException
{
- PDPatternDictionary pattern;
+ PDAbstractPattern pattern;
int patternType = resourceDictionary.getInt(COSName.PATTERN_TYPE, 0);
switch (patternType)
{
@@ -64,7 +64,7 @@ public abstract class PDPatternDictionar
/**
* Creates a new Pattern dictionary.
*/
- public PDPatternDictionary()
+ public PDAbstractPattern()
{
patternDictionary = new COSDictionary();
patternDictionary.setName(COSName.TYPE, COSName.PATTERN.getName());
@@ -74,7 +74,7 @@ public abstract class PDPatternDictionar
* Creates a new Pattern dictionary from the given COS dictionary.
* @param resourceDictionary The COSDictionary for this pattern resource.
*/
- public PDPatternDictionary(COSDictionary resourceDictionary)
+ public PDAbstractPattern(COSDictionary resourceDictionary)
{
patternDictionary = resourceDictionary;
}
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/PDShadingPattern.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/PDShadingPattern.java?rev=1571933&r1=1571932&r2=1571933&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/PDShadingPattern.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/PDShadingPattern.java
Wed Feb 26 06:52:04 2014
@@ -25,17 +25,17 @@ import org.apache.pdfbox.cos.COSFloat;
import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.cos.COSNumber;
import org.apache.pdfbox.pdmodel.graphics.PDExtendedGraphicsState;
-import org.apache.pdfbox.pdmodel.graphics.shading.PDShadingResources;
+import org.apache.pdfbox.pdmodel.graphics.shading.PDShading;
import org.apache.pdfbox.util.Matrix;
/**
* A shading pattern dictionary.
* @author Andreas Lehmkühler
*/
-public class PDShadingPattern extends PDPatternDictionary
+public class PDShadingPattern extends PDAbstractPattern
{
private PDExtendedGraphicsState extendedGraphicsState;
- private PDShadingResources shading;
+ private PDShading shading;
private COSArray matrix = null;
/**
@@ -44,7 +44,7 @@ public class PDShadingPattern extends PD
public PDShadingPattern()
{
super();
- getCOSDictionary().setInt(COSName.PATTERN_TYPE,
PDPatternDictionary.TYPE_SHADING_PATTERN);
+ getCOSDictionary().setInt(COSName.PATTERN_TYPE,
PDAbstractPattern.TYPE_SHADING_PATTERN);
}
/**
@@ -59,7 +59,7 @@ public class PDShadingPattern extends PD
@Override
public int getPatternType()
{
- return PDPatternDictionary.TYPE_SHADING_PATTERN;
+ return PDAbstractPattern.TYPE_SHADING_PATTERN;
}
/**
@@ -142,14 +142,14 @@ public class PDShadingPattern extends PD
* @return The shading resources for this pattern.
* @throws IOException if something went wrong
*/
- public PDShadingResources getShading() throws IOException
+ public PDShading getShading() throws IOException
{
if (shading == null)
{
COSDictionary dictionary =
(COSDictionary)getCOSDictionary().getDictionaryObject( COSName.SHADING );
if( dictionary != null )
{
- shading = PDShadingResources.create(dictionary);
+ shading = PDShading.create(dictionary);
}
}
return shading;
@@ -159,7 +159,7 @@ public class PDShadingPattern extends PD
* This will set the shading resources for this pattern.
* @param shadingResources The new shading resources for this pattern.
*/
- public void setShading( PDShadingResources shadingResources )
+ public void setShading( PDShading shadingResources )
{
shading = shadingResources;
if (shadingResources != null)
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/PDTilingPattern.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/PDTilingPattern.java?rev=1571933&r1=1571932&r2=1571933&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/PDTilingPattern.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/PDTilingPattern.java
Wed Feb 26 06:52:04 2014
@@ -31,7 +31,7 @@ import org.apache.pdfbox.util.Matrix;
* A tiling pattern dictionary.
* @author Andreas Lehmkühler
*/
-public class PDTilingPattern extends PDPatternDictionary
+public class PDTilingPattern extends PDAbstractPattern
{
/** paint type 1 = colored tiling pattern. */
public static final int PAINT_COLORED = 1;
@@ -54,7 +54,7 @@ public class PDTilingPattern extends PDP
public PDTilingPattern()
{
super();
- getCOSDictionary().setInt(COSName.PATTERN_TYPE,
PDPatternDictionary.TYPE_TILING_PATTERN);
+ getCOSDictionary().setInt(COSName.PATTERN_TYPE,
PDAbstractPattern.TYPE_TILING_PATTERN);
}
/**
@@ -69,7 +69,7 @@ public class PDTilingPattern extends PDP
@Override
public int getPatternType()
{
- return PDPatternDictionary.TYPE_TILING_PATTERN;
+ return PDAbstractPattern.TYPE_TILING_PATTERN;
}
/**
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/GouraudShadingContext.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/GouraudShadingContext.java?rev=1571933&r1=1571932&r2=1571933&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/GouraudShadingContext.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/GouraudShadingContext.java
Wed Feb 26 06:52:04 2014
@@ -34,11 +34,7 @@ import javax.imageio.stream.ImageInputSt
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.pdmodel.common.PDRange;
-import org.apache.pdfbox.pdmodel.common.function.PDFunction;
import org.apache.pdfbox.pdmodel.graphics.color.PDColorSpace;
-import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceN;
-import org.apache.pdfbox.pdmodel.graphics.color.PDDeviceRGB;
-import org.apache.pdfbox.pdmodel.graphics.color.PDSeparation;
import org.apache.pdfbox.util.Matrix;
/**
@@ -77,7 +73,7 @@ public abstract class GouraudShadingCont
*/
protected float[] background;
private final boolean hasFunction;
- private final PDShadingResources gouraudShadingType;
+ private final PDShading gouraudShadingType;
/**
* Constructor creates an instance to be used for fill operations.
@@ -90,7 +86,7 @@ public abstract class GouraudShadingCont
* @throws IOException if something went wrong
*
*/
- protected GouraudShadingContext(PDShadingResources shadingType, ColorModel
colorModelValue,
+ protected GouraudShadingContext(PDShading shadingType, ColorModel
colorModelValue,
AffineTransform xform, Matrix ctm, int pageHeight) throws
IOException
{
gouraudShadingType = shadingType;
Copied:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShading.java
(from r1571906,
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingResources.java)
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShading.java?p2=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShading.java&p1=pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingResources.java&r1=1571906&r2=1571933&rev=1571933&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingResources.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShading.java
Wed Feb 26 06:52:04 2014
@@ -16,8 +16,6 @@
*/
package org.apache.pdfbox.pdmodel.graphics.shading;
-
-
import java.io.IOException;
import org.apache.pdfbox.cos.COSArray;
@@ -32,9 +30,9 @@ import org.apache.pdfbox.pdmodel.graphic
/**
* This represents resources for a shading.
*
- * @version $Revision: 1.0 $
+ * @author Andreas Lehmkühler
*/
-public abstract class PDShadingResources implements COSObjectable
+public abstract class PDShading implements COSObjectable
{
private COSDictionary dictionary;
private COSArray background = null;
@@ -75,7 +73,7 @@ public abstract class PDShadingResources
/**
* Default constructor.
*/
- public PDShadingResources()
+ public PDShading()
{
dictionary = new COSDictionary();
}
@@ -85,7 +83,7 @@ public abstract class PDShadingResources
*
* @param shadingDictionary The dictionary for this shading.
*/
- public PDShadingResources( COSDictionary shadingDictionary )
+ public PDShading(COSDictionary shadingDictionary)
{
dictionary = shadingDictionary;
}
@@ -264,9 +262,9 @@ public abstract class PDShadingResources
*
* @throws IOException If we are unable to create the PDShading object.
*/
- public static PDShadingResources create(COSDictionary resourceDictionary)
throws IOException
+ public static PDShading create(COSDictionary resourceDictionary) throws
IOException
{
- PDShadingResources shading = null;
+ PDShading shading = null;
int shadingType = resourceDictionary.getInt( COSName.SHADING_TYPE, 0 );
switch (shadingType)
{
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType1.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType1.java?rev=1571933&r1=1571932&r2=1571933&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType1.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType1.java
Wed Feb 26 06:52:04 2014
@@ -29,7 +29,7 @@ import org.apache.pdfbox.util.Matrix;
* This represents resources for a function based shading.
*
*/
-public class PDShadingType1 extends PDShadingResources
+public class PDShadingType1 extends PDShading
{
private COSArray domain = null;
@@ -49,7 +49,7 @@ public class PDShadingType1 extends PDSh
*/
public int getShadingType()
{
- return PDShadingResources.SHADING_TYPE1;
+ return PDShading.SHADING_TYPE1;
}
/**
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType2.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType2.java?rev=1571933&r1=1571932&r2=1571933&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType2.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType2.java
Wed Feb 26 06:52:04 2014
@@ -25,7 +25,7 @@ import org.apache.pdfbox.cos.COSName;
*
* @version $Revision: 1.0 $
*/
-public class PDShadingType2 extends PDShadingResources
+public class PDShadingType2 extends PDShading
{
private COSArray coords = null;
private COSArray domain = null;
@@ -46,7 +46,7 @@ public class PDShadingType2 extends PDSh
*/
public int getShadingType()
{
- return PDShadingResources.SHADING_TYPE2;
+ return PDShading.SHADING_TYPE2;
}
/**
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType3.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType3.java?rev=1571933&r1=1571932&r2=1571933&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType3.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType3.java
Wed Feb 26 06:52:04 2014
@@ -40,6 +40,6 @@ public class PDShadingType3 extends PDSh
*/
public int getShadingType()
{
- return PDShadingResources.SHADING_TYPE3;
+ return PDShading.SHADING_TYPE3;
}
}
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType4.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType4.java?rev=1571933&r1=1571932&r2=1571933&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType4.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType4.java
Wed Feb 26 06:52:04 2014
@@ -26,7 +26,7 @@ import org.apache.pdfbox.pdmodel.common.
* Triangle Meshes).
*
*/
-public class PDShadingType4 extends PDShadingResources
+public class PDShadingType4 extends PDShading
{
/**
@@ -51,7 +51,7 @@ public class PDShadingType4 extends PDSh
*/
public int getShadingType()
{
- return PDShadingResources.SHADING_TYPE4;
+ return PDShading.SHADING_TYPE4;
}
/**
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType5.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType5.java?rev=1571933&r1=1571932&r2=1571933&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType5.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType5.java
Wed Feb 26 06:52:04 2014
@@ -26,7 +26,7 @@ import org.apache.pdfbox.pdmodel.common.
* Triangle Meshes).
*
*/
-public class PDShadingType5 extends PDShadingResources
+public class PDShadingType5 extends PDShading
{
/**
@@ -51,7 +51,7 @@ public class PDShadingType5 extends PDSh
*/
public int getShadingType()
{
- return PDShadingResources.SHADING_TYPE5;
+ return PDShading.SHADING_TYPE5;
}
/**
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType6.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType6.java?rev=1571933&r1=1571932&r2=1571933&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType6.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType6.java
Wed Feb 26 06:52:04 2014
@@ -40,6 +40,6 @@ public class PDShadingType6 extends PDSh
*/
public int getShadingType()
{
- return PDShadingResources.SHADING_TYPE6;
+ return PDShading.SHADING_TYPE6;
}
}
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType7.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType7.java?rev=1571933&r1=1571932&r2=1571933&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType7.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType7.java
Wed Feb 26 06:52:04 2014
@@ -40,6 +40,6 @@ public class PDShadingType7 extends PDSh
*/
public int getShadingType()
{
- return PDShadingResources.SHADING_TYPE6;
+ return PDShading.SHADING_TYPE6;
}
}
Modified:
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/ResourcesValidationProcess.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/ResourcesValidationProcess.java?rev=1571933&r1=1571932&r2=1571933&view=diff
==============================================================================
---
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/ResourcesValidationProcess.java
(original)
+++
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/ResourcesValidationProcess.java
Wed Feb 26 06:52:04 2014
@@ -40,9 +40,9 @@ import org.apache.pdfbox.cos.COSName;
import org.apache.pdfbox.cos.COSStream;
import org.apache.pdfbox.pdmodel.PDResources;
import org.apache.pdfbox.pdmodel.font.PDFont;
-import org.apache.pdfbox.pdmodel.graphics.pattern.PDPatternDictionary;
+import org.apache.pdfbox.pdmodel.graphics.pattern.PDAbstractPattern;
import org.apache.pdfbox.pdmodel.graphics.pattern.PDTilingPattern;
-import org.apache.pdfbox.pdmodel.graphics.shading.PDShadingResources;
+import org.apache.pdfbox.pdmodel.graphics.shading.PDShading;
import org.apache.pdfbox.pdmodel.graphics.PDXObject;
import org.apache.pdfbox.preflight.PreflightConstants;
import org.apache.pdfbox.preflight.PreflightContext;
@@ -126,10 +126,10 @@ public class ResourcesValidationProcess
{
try
{
- Map<String, PDShadingResources> shadingResources =
resources.getShadings();
+ Map<String, PDShading> shadingResources = resources.getShadings();
if (shadingResources != null)
{
- for (Entry<String, PDShadingResources> entry :
shadingResources.entrySet())
+ for (Entry<String, PDShading> entry :
shadingResources.entrySet())
{
ContextHelper.validateElement(context, entry.getValue(),
SHADDING_PATTERN_PROCESS);
}
@@ -152,10 +152,10 @@ public class ResourcesValidationProcess
{
try
{
- Map<String, PDPatternDictionary> patternResources =
resources.getPatterns();
+ Map<String, PDAbstractPattern> patternResources =
resources.getPatterns();
if (patternResources != null)
{
- for (Entry<String, PDPatternDictionary> entry :
patternResources.entrySet())
+ for (Entry<String, PDAbstractPattern> entry :
patternResources.entrySet())
{
if (entry.getValue() instanceof PDTilingPattern)
{
Modified:
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/ShaddingPatternValidationProcess.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/ShaddingPatternValidationProcess.java?rev=1571933&r1=1571932&r2=1571933&view=diff
==============================================================================
---
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/ShaddingPatternValidationProcess.java
(original)
+++
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/ShaddingPatternValidationProcess.java
Wed Feb 26 06:52:04 2014
@@ -30,7 +30,7 @@ import java.io.IOException;
import org.apache.pdfbox.cos.COSDictionary;
import org.apache.pdfbox.pdmodel.PDPage;
import org.apache.pdfbox.pdmodel.graphics.color.PDColorSpace;
-import org.apache.pdfbox.pdmodel.graphics.shading.PDShadingResources;
+import org.apache.pdfbox.pdmodel.graphics.shading.PDShading;
import org.apache.pdfbox.preflight.PreflightConfiguration;
import org.apache.pdfbox.preflight.PreflightConstants;
import org.apache.pdfbox.preflight.PreflightContext;
@@ -52,13 +52,13 @@ public class ShaddingPatternValidationPr
if (vPath.isEmpty()) {
return;
}
- else if (!vPath.isExpectedType(PDShadingResources.class))
+ else if (!vPath.isExpectedType(PDShading.class))
{
context.addValidationError(new
ValidationError(PreflightConstants.ERROR_GRAPHIC_MISSING_OBJECT,
"ShadingPattern validation required at least a PDResources"));
}
else
{
- PDShadingResources shaddingResource = (PDShadingResources)
vPath.peek();
+ PDShading shaddingResource = (PDShading) vPath.peek();
PDPage page = vPath.getClosestPathElement(PDPage.class);
checkColorSpace(context, page, shaddingResource);
checkGraphicState(context, page, shaddingResource);
@@ -76,7 +76,7 @@ public class ShaddingPatternValidationPr
* @return true if the Shading pattern is valid, false otherwise.
* @throws ValidationException
*/
- protected void checkColorSpace(PreflightContext context, PDPage page,
PDShadingResources shadingRes)
+ protected void checkColorSpace(PreflightContext context, PDPage page,
PDShading shadingRes)
throws ValidationException
{
try
@@ -100,7 +100,7 @@ public class ShaddingPatternValidationPr
* @return true is the ExtGState is missing or valid, false otherwise.
* @throws ValidationException
*/
- protected void checkGraphicState(PreflightContext context, PDPage page,
PDShadingResources shadingRes)
+ protected void checkGraphicState(PreflightContext context, PDPage page,
PDShading shadingRes)
throws ValidationException
{
COSDictionary resources = (COSDictionary)
shadingRes.getCOSDictionary().getDictionaryObject(
