You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2015/05/01 13:56:15 UTC
svn commit: r1677115 - in
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern:
PDAbstractPattern.java PDShadingPattern.java PDTilingPattern.java
Author: tilman
Date: Fri May 1 11:56:15 2015
New Revision: 1677115
URL: http://svn.apache.org/r1677115
Log:
PDFBOX-2783: Remove getCOSDictionary() method, adjust getCOSObject() return type; don't use removeItem()
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/PDAbstractPattern.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
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/PDAbstractPattern.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/PDAbstractPattern.java?rev=1677115&r1=1677114&r2=1677115&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/PDAbstractPattern.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/PDAbstractPattern.java Fri May 1 11:56:15 2015
@@ -20,7 +20,6 @@ import java.awt.geom.AffineTransform;
import java.io.IOException;
import org.apache.pdfbox.cos.COSArray;
-import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSDictionary;
import org.apache.pdfbox.cos.COSFloat;
import org.apache.pdfbox.cos.COSName;
@@ -83,20 +82,11 @@ public abstract class PDAbstractPattern
}
/**
- * This will get the underlying dictionary.
- * @return The dictionary for these pattern resources.
- */
- public COSDictionary getCOSDictionary()
- {
- return patternDictionary;
- }
-
- /**
* Convert this standard java object to a COS object.
* @return The cos object that matches this Java object.
*/
@Override
- public COSBase getCOSObject()
+ public COSDictionary getCOSObject()
{
return patternDictionary;
}
@@ -175,7 +165,7 @@ public abstract class PDAbstractPattern
*/
public Matrix getMatrix()
{
- COSArray array = (COSArray)getCOSDictionary().getDictionaryObject(COSName.MATRIX);
+ COSArray array = (COSArray)getCOSObject().getDictionaryObject(COSName.MATRIX);
if (array != null)
{
return new Matrix(array);
@@ -200,7 +190,7 @@ public abstract class PDAbstractPattern
{
matrix.add(new COSFloat((float)v));
}
- getCOSDictionary().setItem(COSName.MATRIX, matrix);
+ getCOSObject().setItem(COSName.MATRIX, matrix);
}
}
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=1677115&r1=1677114&r2=1677115&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 Fri May 1 11:56:15 2015
@@ -38,7 +38,7 @@ public class PDShadingPattern extends PD
public PDShadingPattern()
{
super();
- getCOSDictionary().setInt(COSName.PATTERN_TYPE, PDAbstractPattern.TYPE_SHADING_PATTERN);
+ getCOSObject().setInt(COSName.PATTERN_TYPE, PDAbstractPattern.TYPE_SHADING_PATTERN);
}
/**
@@ -64,7 +64,7 @@ public class PDShadingPattern extends PD
{
if (extendedGraphicsState == null)
{
- COSDictionary dictionary = (COSDictionary)getCOSDictionary()
+ COSDictionary dictionary = (COSDictionary)getCOSObject()
.getDictionaryObject(COSName.EXT_G_STATE);
if( dictionary != null )
@@ -82,14 +82,7 @@ public class PDShadingPattern extends PD
public void setExtendedGraphicsState(PDExtendedGraphicsState extendedGraphicsState)
{
this.extendedGraphicsState = extendedGraphicsState;
- if (extendedGraphicsState != null)
- {
- getCOSDictionary().setItem( COSName.EXT_G_STATE, extendedGraphicsState);
- }
- else
- {
- getCOSDictionary().removeItem(COSName.EXT_G_STATE);
- }
+ getCOSObject().setItem(COSName.EXT_G_STATE, extendedGraphicsState);
}
/**
@@ -101,9 +94,7 @@ public class PDShadingPattern extends PD
{
if (shading == null)
{
- COSDictionary dictionary = (COSDictionary)getCOSDictionary()
- .getDictionaryObject(COSName.SHADING);
-
+ COSDictionary dictionary = (COSDictionary) getCOSObject().getDictionaryObject(COSName.SHADING);
if( dictionary != null )
{
shading = PDShading.create(dictionary);
@@ -119,13 +110,6 @@ public class PDShadingPattern extends PD
public void setShading( PDShading shadingResources )
{
shading = shadingResources;
- if (shadingResources != null)
- {
- getCOSDictionary().setItem( COSName.SHADING, shadingResources );
- }
- else
- {
- getCOSDictionary().removeItem(COSName.SHADING);
- }
+ getCOSObject().setItem(COSName.SHADING, shadingResources);
}
}
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=1677115&r1=1677114&r2=1677115&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 Fri May 1 11:56:15 2015
@@ -51,7 +51,7 @@ public class PDTilingPattern extends PDA
public PDTilingPattern()
{
super();
- getCOSDictionary().setInt(COSName.PATTERN_TYPE, PDAbstractPattern.TYPE_TILING_PATTERN);
+ getCOSObject().setInt(COSName.PATTERN_TYPE, PDAbstractPattern.TYPE_TILING_PATTERN);
}
/**
@@ -76,7 +76,7 @@ public class PDTilingPattern extends PDA
@Override
public void setLength(int length)
{
- getCOSDictionary().setInt(COSName.LENGTH, length);
+ getCOSObject().setInt(COSName.LENGTH, length);
}
/**
@@ -86,7 +86,7 @@ public class PDTilingPattern extends PDA
@Override
public int getLength()
{
- return getCOSDictionary().getInt( COSName.LENGTH, 0 );
+ return getCOSObject().getInt( COSName.LENGTH, 0 );
}
/**
@@ -96,7 +96,7 @@ public class PDTilingPattern extends PDA
@Override
public void setPaintType(int paintType)
{
- getCOSDictionary().setInt(COSName.PAINT_TYPE, paintType);
+ getCOSObject().setInt(COSName.PAINT_TYPE, paintType);
}
/**
@@ -105,7 +105,7 @@ public class PDTilingPattern extends PDA
*/
public int getPaintType()
{
- return getCOSDictionary().getInt( COSName.PAINT_TYPE, 0 );
+ return getCOSObject().getInt( COSName.PAINT_TYPE, 0 );
}
/**
@@ -114,7 +114,7 @@ public class PDTilingPattern extends PDA
*/
public void setTilingType(int tilingType)
{
- getCOSDictionary().setInt(COSName.TILING_TYPE, tilingType);
+ getCOSObject().setInt(COSName.TILING_TYPE, tilingType);
}
/**
@@ -123,7 +123,7 @@ public class PDTilingPattern extends PDA
*/
public int getTilingType()
{
- return getCOSDictionary().getInt( COSName.TILING_TYPE, 0 );
+ return getCOSObject().getInt( COSName.TILING_TYPE, 0 );
}
/**
@@ -132,7 +132,7 @@ public class PDTilingPattern extends PDA
*/
public void setXStep(float xStep)
{
- getCOSDictionary().setFloat(COSName.X_STEP, xStep);
+ getCOSObject().setFloat(COSName.X_STEP, xStep);
}
/**
@@ -142,7 +142,7 @@ public class PDTilingPattern extends PDA
public float getXStep()
{
// ignores invalid values, see PDFBOX-1094-065514-XStep32767.pdf
- float xStep = getCOSDictionary().getFloat( COSName.X_STEP, 0 );
+ float xStep = getCOSObject().getFloat( COSName.X_STEP, 0 );
return xStep == Short.MAX_VALUE ? 0 : xStep;
}
@@ -152,7 +152,7 @@ public class PDTilingPattern extends PDA
*/
public void setYStep(float yStep)
{
- getCOSDictionary().setFloat(COSName.Y_STEP, yStep);
+ getCOSObject().setFloat(COSName.Y_STEP, yStep);
}
/**
@@ -162,7 +162,7 @@ public class PDTilingPattern extends PDA
public float getYStep()
{
// ignores invalid values, see PDFBOX-1094-065514-XStep32767.pdf
- float yStep = getCOSDictionary().getFloat( COSName.Y_STEP, 0 );
+ float yStep = getCOSObject().getFloat( COSName.Y_STEP, 0 );
return yStep == Short.MAX_VALUE ? 0 : yStep;
}
@@ -181,8 +181,7 @@ public class PDTilingPattern extends PDA
public PDResources getResources()
{
PDResources retval = null;
- COSDictionary resources = (COSDictionary)getCOSDictionary()
- .getDictionaryObject( COSName.RESOURCES );
+ COSDictionary resources = (COSDictionary) getCOSObject().getDictionaryObject(COSName.RESOURCES);
if( resources != null )
{
retval = new PDResources( resources );
@@ -196,14 +195,7 @@ public class PDTilingPattern extends PDA
*/
public void setResources( PDResources resources )
{
- if (resources != null)
- {
- getCOSDictionary().setItem( COSName.RESOURCES, resources );
- }
- else
- {
- getCOSDictionary().removeItem( COSName.RESOURCES );
- }
+ getCOSObject().setItem(COSName.RESOURCES, resources);
}
/**
@@ -217,7 +209,7 @@ public class PDTilingPattern extends PDA
public PDRectangle getBBox()
{
PDRectangle retval = null;
- COSArray array = (COSArray)getCOSDictionary().getDictionaryObject( COSName.BBOX );
+ COSArray array = (COSArray)getCOSObject().getDictionaryObject( COSName.BBOX );
if( array != null )
{
retval = new PDRectangle( array );
@@ -233,11 +225,11 @@ public class PDTilingPattern extends PDA
{
if( bbox == null )
{
- getCOSDictionary().removeItem( COSName.BBOX );
+ getCOSObject().removeItem( COSName.BBOX );
}
else
{
- getCOSDictionary().setItem( COSName.BBOX, bbox.getCOSArray() );
+ getCOSObject().setItem( COSName.BBOX, bbox.getCOSArray() );
}
}
}