You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by le...@apache.org on 2011/08/21 13:50:57 UTC
svn commit: r1159967 - in
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern:
PDShadingPatternResources.java PDTilingPatternResources.java
Author: lehmi
Date: Sun Aug 21 11:50:57 2011
New Revision: 1159967
URL: http://svn.apache.org/viewvc?rev=1159967&view=rev
Log:
PDFBOX-1094: removed doubled resource variable
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/PDShadingPatternResources.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/PDTilingPatternResources.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/PDShadingPatternResources.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/PDShadingPatternResources.java?rev=1159967&r1=1159966&r2=1159967&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/PDShadingPatternResources.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/PDShadingPatternResources.java Sun Aug 21 11:50:57 2011
@@ -35,7 +35,6 @@ import org.apache.pdfbox.util.Matrix;
*/
public class PDShadingPatternResources extends PDPatternResources
{
- private COSDictionary patternDictionary;
private PDExtendedGraphicsState extendedGraphicsState;
private COSArray matrix = null;
@@ -45,7 +44,7 @@ public class PDShadingPatternResources e
public PDShadingPatternResources()
{
super();
- patternDictionary.setInt(COSName.PATTERN_TYPE, PDPatternResources.SHADING_PATTERN);
+ getCOSDictionary().setInt(COSName.PATTERN_TYPE, PDPatternResources.SHADING_PATTERN);
}
/**
@@ -55,7 +54,7 @@ public class PDShadingPatternResources e
*/
public PDShadingPatternResources( COSDictionary resourceDictionary )
{
- patternDictionary = resourceDictionary;
+ super(resourceDictionary);
}
/**
@@ -76,7 +75,7 @@ public class PDShadingPatternResources e
Matrix returnMatrix = null;
if (matrix == null)
{
- matrix = (COSArray)patternDictionary.getDictionaryObject( COSName.MATRIX );
+ matrix = (COSArray)getCOSDictionary().getDictionaryObject( COSName.MATRIX );
}
if( matrix != null )
{
@@ -104,7 +103,7 @@ public class PDShadingPatternResources e
{
matrix.add(new COSFloat((float)v));
}
- patternDictionary.setItem(COSName.MATRIX, matrix);
+ getCOSDictionary().setItem(COSName.MATRIX, matrix);
}
/**
@@ -116,7 +115,7 @@ public class PDShadingPatternResources e
{
if (extendedGraphicsState == null)
{
- COSDictionary dictionary = (COSDictionary)patternDictionary.getDictionaryObject( COSName.EXT_G_STATE );
+ COSDictionary dictionary = (COSDictionary)getCOSDictionary().getDictionaryObject( COSName.EXT_G_STATE );
if( dictionary != null )
{
extendedGraphicsState = new PDExtendedGraphicsState( dictionary );
@@ -135,11 +134,11 @@ public class PDShadingPatternResources e
this.extendedGraphicsState = extendedGraphicsState;
if (extendedGraphicsState != null)
{
- patternDictionary.setItem( COSName.EXT_G_STATE, extendedGraphicsState );
+ getCOSDictionary().setItem( COSName.EXT_G_STATE, extendedGraphicsState );
}
else
{
- patternDictionary.removeItem(COSName.EXT_G_STATE);
+ getCOSDictionary().removeItem(COSName.EXT_G_STATE);
}
}
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/PDTilingPatternResources.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/PDTilingPatternResources.java?rev=1159967&r1=1159966&r2=1159967&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/PDTilingPatternResources.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/pattern/PDTilingPatternResources.java Sun Aug 21 11:50:57 2011
@@ -36,7 +36,6 @@ import org.apache.pdfbox.util.Matrix;
*/
public class PDTilingPatternResources extends PDPatternResources
{
- private COSDictionary patternDictionary;
/**
* Default constructor.
@@ -44,7 +43,7 @@ public class PDTilingPatternResources ex
public PDTilingPatternResources()
{
super();
- patternDictionary.setInt(COSName.PATTERN_TYPE, PDPatternResources.TILING_PATTERN);
+ getCOSDictionary().setInt(COSName.PATTERN_TYPE, PDPatternResources.TILING_PATTERN);
}
/**
@@ -54,7 +53,7 @@ public class PDTilingPatternResources ex
*/
public PDTilingPatternResources( COSDictionary resourceDictionary )
{
- patternDictionary = resourceDictionary;
+ super(resourceDictionary);
}
/**
@@ -72,7 +71,7 @@ public class PDTilingPatternResources ex
*/
public void setLength(int length)
{
- patternDictionary.setInt(COSName.LENGTH, length);
+ getCOSDictionary().setInt(COSName.LENGTH, length);
}
/**
@@ -82,7 +81,7 @@ public class PDTilingPatternResources ex
*/
public int getLength()
{
- return patternDictionary.getInt( COSName.LENGTH, 0 );
+ return getCOSDictionary().getInt( COSName.LENGTH, 0 );
}
/**
@@ -92,7 +91,7 @@ public class PDTilingPatternResources ex
*/
public void setPaintType(int paintType)
{
- patternDictionary.setInt(COSName.PAINT_TYPE, paintType);
+ getCOSDictionary().setInt(COSName.PAINT_TYPE, paintType);
}
/**
@@ -102,7 +101,7 @@ public class PDTilingPatternResources ex
*/
public int getPaintType()
{
- return patternDictionary.getInt( COSName.PAINT_TYPE, 0 );
+ return getCOSDictionary().getInt( COSName.PAINT_TYPE, 0 );
}
/**
@@ -112,7 +111,7 @@ public class PDTilingPatternResources ex
*/
public void setTilingType(int tilingType)
{
- patternDictionary.setInt(COSName.TILING_TYPE, tilingType);
+ getCOSDictionary().setInt(COSName.TILING_TYPE, tilingType);
}
/**
@@ -122,7 +121,7 @@ public class PDTilingPatternResources ex
*/
public int getTilingType()
{
- return patternDictionary.getInt( COSName.TILING_TYPE, 0 );
+ return getCOSDictionary().getInt( COSName.TILING_TYPE, 0 );
}
/**
@@ -132,7 +131,7 @@ public class PDTilingPatternResources ex
*/
public void setXStep(int xStep)
{
- patternDictionary.setInt(COSName.X_STEP, xStep);
+ getCOSDictionary().setInt(COSName.X_STEP, xStep);
}
/**
@@ -142,7 +141,7 @@ public class PDTilingPatternResources ex
*/
public int getXStep()
{
- return patternDictionary.getInt( COSName.X_STEP, 0 );
+ return getCOSDictionary().getInt( COSName.X_STEP, 0 );
}
/**
@@ -152,7 +151,7 @@ public class PDTilingPatternResources ex
*/
public void setYStep(int yStep)
{
- patternDictionary.setInt(COSName.Y_STEP, yStep);
+ getCOSDictionary().setInt(COSName.Y_STEP, yStep);
}
/**
@@ -162,7 +161,7 @@ public class PDTilingPatternResources ex
*/
public int getYStep()
{
- return patternDictionary.getInt( COSName.Y_STEP, 0 );
+ return getCOSDictionary().getInt( COSName.Y_STEP, 0 );
}
/**
@@ -174,7 +173,7 @@ public class PDTilingPatternResources ex
public PDResources getResources()
{
PDResources retval = null;
- COSDictionary resources = (COSDictionary)patternDictionary.getDictionaryObject( COSName.RESOURCES );
+ COSDictionary resources = (COSDictionary)getCOSDictionary().getDictionaryObject( COSName.RESOURCES );
if( resources != null )
{
retval = new PDResources( resources );
@@ -191,11 +190,11 @@ public class PDTilingPatternResources ex
{
if (resources != null)
{
- patternDictionary.setItem( COSName.RESOURCES, resources );
+ getCOSDictionary().setItem( COSName.RESOURCES, resources );
}
else
{
- patternDictionary.removeItem( COSName.RESOURCES );
+ getCOSDictionary().removeItem( COSName.RESOURCES );
}
}
@@ -209,7 +208,7 @@ public class PDTilingPatternResources ex
public PDRectangle getBBox()
{
PDRectangle retval = null;
- COSArray array = (COSArray)patternDictionary.getDictionaryObject( COSName.BBOX );
+ COSArray array = (COSArray)getCOSDictionary().getDictionaryObject( COSName.BBOX );
if( array != null )
{
retval = new PDRectangle( array );
@@ -226,11 +225,11 @@ public class PDTilingPatternResources ex
{
if( bbox == null )
{
- patternDictionary.removeItem( COSName.BBOX );
+ getCOSDictionary().removeItem( COSName.BBOX );
}
else
{
- patternDictionary.setItem( COSName.BBOX, bbox.getCOSArray() );
+ getCOSDictionary().setItem( COSName.BBOX, bbox.getCOSArray() );
}
}
@@ -242,7 +241,7 @@ public class PDTilingPatternResources ex
public Matrix getMatrix()
{
Matrix retval = null;
- COSArray array = (COSArray)patternDictionary.getDictionaryObject( COSName.MATRIX );
+ COSArray array = (COSArray)getCOSDictionary().getDictionaryObject( COSName.MATRIX );
if( array != null )
{
retval = new Matrix();
@@ -269,7 +268,7 @@ public class PDTilingPatternResources ex
{
matrix.add(new COSFloat((float)v));
}
- patternDictionary.setItem(COSName.MATRIX, matrix);
+ getCOSDictionary().setItem(COSName.MATRIX, matrix);
}
}