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:34:00 UTC
svn commit: r1677113 -
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/
Author: tilman
Date: Fri May 1 11:34:00 2015
New Revision: 1677113
URL: http://svn.apache.org/r1677113
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/shading/PDShading.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/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/PDTriangleBasedShadingType.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type4ShadingContext.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type5ShadingContext.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type6ShadingContext.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type7ShadingContext.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShading.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShading.java?rev=1677113&r1=1677112&r2=1677113&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShading.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShading.java Fri May 1 11:34:00 2015
@@ -98,20 +98,10 @@ public abstract class PDShading implemen
/**
* This will get the underlying dictionary.
*
- * @return the dictionary for this shading
- */
- public COSDictionary getCOSDictionary()
- {
- return dictionary;
- }
-
- /**
- * Convert this standard java object to a COS object.
- *
- * @return the cos object that matches this Java object
+ * @return the dictionary for this shading.
*/
@Override
- public COSBase getCOSObject()
+ public COSDictionary getCOSObject()
{
return dictionary;
}
@@ -309,14 +299,7 @@ public abstract class PDShading implemen
{
functionArray = null;
function = newFunction;
- if (newFunction == null)
- {
- getCOSDictionary().removeItem(COSName.FUNCTION);
- }
- else
- {
- getCOSDictionary().setItem(COSName.FUNCTION, newFunction);
- }
+ getCOSObject().setItem(COSName.FUNCTION, newFunction);
}
/**
@@ -328,14 +311,7 @@ public abstract class PDShading implemen
{
functionArray = null;
function = null;
- if (newFunctions == null)
- {
- getCOSDictionary().removeItem(COSName.FUNCTION);
- }
- else
- {
- getCOSDictionary().setItem(COSName.FUNCTION, newFunctions);
- }
+ getCOSObject().setItem(COSName.FUNCTION, newFunctions);
}
/**
@@ -348,7 +324,7 @@ public abstract class PDShading implemen
{
if (function == null)
{
- COSBase dictionaryFunctionObject = getCOSDictionary().getDictionaryObject(COSName.FUNCTION);
+ COSBase dictionaryFunctionObject = getCOSObject().getDictionaryObject(COSName.FUNCTION);
if (dictionaryFunctionObject != null)
{
function = PDFunction.create(dictionaryFunctionObject);
@@ -367,7 +343,7 @@ public abstract class PDShading implemen
{
if (functionArray == null)
{
- COSBase functionObject = getCOSDictionary().getDictionaryObject(COSName.FUNCTION);
+ COSBase functionObject = getCOSObject().getDictionaryObject(COSName.FUNCTION);
if (functionObject instanceof COSDictionary)
{
functionArray = new PDFunction[1];
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=1677113&r1=1677112&r2=1677113&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 Fri May 1 11:34:00 2015
@@ -55,7 +55,7 @@ public class PDShadingType1 extends PDSh
*/
public Matrix getMatrix()
{
- COSArray array = (COSArray) getCOSDictionary().getDictionaryObject(COSName.MATRIX);
+ COSArray array = (COSArray) getCOSObject().getDictionaryObject(COSName.MATRIX);
if (array != null)
{
return new Matrix(array);
@@ -81,7 +81,7 @@ public class PDShadingType1 extends PDSh
{
matrix.add(new COSFloat((float) v));
}
- getCOSDictionary().setItem(COSName.MATRIX, matrix);
+ getCOSObject().setItem(COSName.MATRIX, matrix);
}
/**
@@ -93,7 +93,7 @@ public class PDShadingType1 extends PDSh
{
if (domain == null)
{
- domain = (COSArray) getCOSDictionary().getDictionaryObject(COSName.DOMAIN);
+ domain = (COSArray) getCOSObject().getDictionaryObject(COSName.DOMAIN);
}
return domain;
}
@@ -106,7 +106,7 @@ public class PDShadingType1 extends PDSh
public void setDomain(COSArray newDomain)
{
domain = newDomain;
- getCOSDictionary().setItem(COSName.DOMAIN, newDomain);
+ getCOSObject().setItem(COSName.DOMAIN, newDomain);
}
@Override
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=1677113&r1=1677112&r2=1677113&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 Fri May 1 11:34:00 2015
@@ -57,7 +57,7 @@ public class PDShadingType2 extends PDSh
{
if (extend == null)
{
- extend = (COSArray) getCOSDictionary().getDictionaryObject(COSName.EXTEND);
+ extend = (COSArray) getCOSObject().getDictionaryObject(COSName.EXTEND);
}
return extend;
}
@@ -70,14 +70,7 @@ public class PDShadingType2 extends PDSh
public void setExtend(COSArray newExtend)
{
extend = newExtend;
- if (newExtend == null)
- {
- getCOSDictionary().removeItem(COSName.EXTEND);
- }
- else
- {
- getCOSDictionary().setItem(COSName.EXTEND, newExtend);
- }
+ getCOSObject().setItem(COSName.EXTEND, newExtend);
}
/**
@@ -89,7 +82,7 @@ public class PDShadingType2 extends PDSh
{
if (domain == null)
{
- domain = (COSArray) getCOSDictionary().getDictionaryObject(COSName.DOMAIN);
+ domain = (COSArray) getCOSObject().getDictionaryObject(COSName.DOMAIN);
}
return domain;
}
@@ -102,14 +95,7 @@ public class PDShadingType2 extends PDSh
public void setDomain(COSArray newDomain)
{
domain = newDomain;
- if (newDomain == null)
- {
- getCOSDictionary().removeItem(COSName.DOMAIN);
- }
- else
- {
- getCOSDictionary().setItem(COSName.DOMAIN, newDomain);
- }
+ getCOSObject().setItem(COSName.DOMAIN, newDomain);
}
/**
@@ -121,7 +107,7 @@ public class PDShadingType2 extends PDSh
{
if (coords == null)
{
- coords = (COSArray) getCOSDictionary().getDictionaryObject(COSName.COORDS);
+ coords = (COSArray) getCOSObject().getDictionaryObject(COSName.COORDS);
}
return coords;
}
@@ -134,14 +120,7 @@ public class PDShadingType2 extends PDSh
public void setCoords(COSArray newCoords)
{
coords = newCoords;
- if (newCoords == null)
- {
- getCOSDictionary().removeItem(COSName.COORDS);
- }
- else
- {
- getCOSDictionary().setItem(COSName.COORDS, newCoords);
- }
+ getCOSObject().setItem(COSName.COORDS, newCoords);
}
@Override
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=1677113&r1=1677112&r2=1677113&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 Fri May 1 11:34:00 2015
@@ -51,7 +51,7 @@ public class PDShadingType4 extends PDTr
*/
public int getBitsPerFlag()
{
- return getCOSDictionary().getInt(COSName.BITS_PER_FLAG, -1);
+ return getCOSObject().getInt(COSName.BITS_PER_FLAG, -1);
}
/**
@@ -61,7 +61,7 @@ public class PDShadingType4 extends PDTr
*/
public void setBitsPerFlag(int bitsPerFlag)
{
- getCOSDictionary().setInt(COSName.BITS_PER_FLAG, bitsPerFlag);
+ getCOSObject().setInt(COSName.BITS_PER_FLAG, bitsPerFlag);
}
@Override
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=1677113&r1=1677112&r2=1677113&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 Fri May 1 11:34:00 2015
@@ -51,7 +51,7 @@ public class PDShadingType5 extends PDTr
*/
public int getVerticesPerRow()
{
- return getCOSDictionary().getInt(COSName.VERTICES_PER_ROW, -1);
+ return getCOSObject().getInt(COSName.VERTICES_PER_ROW, -1);
}
/**
@@ -61,7 +61,7 @@ public class PDShadingType5 extends PDTr
*/
public void setVerticesPerRow(int verticesPerRow)
{
- getCOSDictionary().setInt(COSName.VERTICES_PER_ROW, verticesPerRow);
+ getCOSObject().setInt(COSName.VERTICES_PER_ROW, verticesPerRow);
}
@Override
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDTriangleBasedShadingType.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDTriangleBasedShadingType.java?rev=1677113&r1=1677112&r2=1677113&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDTriangleBasedShadingType.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDTriangleBasedShadingType.java Fri May 1 11:34:00 2015
@@ -43,7 +43,7 @@ abstract class PDTriangleBasedShadingTyp
*/
public int getBitsPerComponent()
{
- return getCOSDictionary().getInt(COSName.BITS_PER_COMPONENT, -1);
+ return getCOSObject().getInt(COSName.BITS_PER_COMPONENT, -1);
}
/**
@@ -53,7 +53,7 @@ abstract class PDTriangleBasedShadingTyp
*/
public void setBitsPerComponent(int bitsPerComponent)
{
- getCOSDictionary().setInt(COSName.BITS_PER_COMPONENT, bitsPerComponent);
+ getCOSObject().setInt(COSName.BITS_PER_COMPONENT, bitsPerComponent);
}
/**
@@ -64,7 +64,7 @@ abstract class PDTriangleBasedShadingTyp
*/
public int getBitsPerCoordinate()
{
- return getCOSDictionary().getInt(COSName.BITS_PER_COORDINATE, -1);
+ return getCOSObject().getInt(COSName.BITS_PER_COORDINATE, -1);
}
/**
@@ -74,7 +74,7 @@ abstract class PDTriangleBasedShadingTyp
*/
public void setBitsPerCoordinate(int bitsPerComponent)
{
- getCOSDictionary().setInt(COSName.BITS_PER_COORDINATE, bitsPerComponent);
+ getCOSObject().setInt(COSName.BITS_PER_COORDINATE, bitsPerComponent);
}
/**
@@ -86,7 +86,7 @@ abstract class PDTriangleBasedShadingTyp
{
if (decode == null)
{
- decode = (COSArray) getCOSDictionary().getDictionaryObject(COSName.DECODE);
+ decode = (COSArray) getCOSObject().getDictionaryObject(COSName.DECODE);
}
return decode;
}
@@ -99,7 +99,7 @@ abstract class PDTriangleBasedShadingTyp
public void setDecodeValues(COSArray decodeValues)
{
decode = decodeValues;
- getCOSDictionary().setItem(COSName.DECODE, decodeValues);
+ getCOSObject().setItem(COSName.DECODE, decodeValues);
}
/**
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type4ShadingContext.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type4ShadingContext.java?rev=1677113&r1=1677112&r2=1677113&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type4ShadingContext.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type4ShadingContext.java Fri May 1 11:34:00 2015
@@ -69,7 +69,7 @@ class Type4ShadingContext extends Gourau
throws IOException
{
PDShadingType4 freeTriangleShadingType = (PDShadingType4) shading;
- COSDictionary dict = freeTriangleShadingType.getCOSDictionary();
+ COSDictionary dict = freeTriangleShadingType.getCOSObject();
PDRange rangeX = freeTriangleShadingType.getDecodeForParameter(0);
PDRange rangeY = freeTriangleShadingType.getDecodeForParameter(1);
PDRange[] colRange = new PDRange[numberOfColorComponents];
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type5ShadingContext.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type5ShadingContext.java?rev=1677113&r1=1677112&r2=1677113&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type5ShadingContext.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type5ShadingContext.java Fri May 1 11:34:00 2015
@@ -68,7 +68,7 @@ class Type5ShadingContext extends Gourau
{
List<ShadedTriangle> list = new ArrayList<ShadedTriangle>();
PDShadingType5 latticeTriangleShadingType = (PDShadingType5) shading;
- COSDictionary cosDictionary = latticeTriangleShadingType.getCOSDictionary();
+ COSDictionary cosDictionary = latticeTriangleShadingType.getCOSObject();
PDRange rangeX = latticeTriangleShadingType.getDecodeForParameter(0);
PDRange rangeY = latticeTriangleShadingType.getDecodeForParameter(1);
int numPerRow = latticeTriangleShadingType.getVerticesPerRow();
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type6ShadingContext.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type6ShadingContext.java?rev=1677113&r1=1677112&r2=1677113&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type6ShadingContext.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type6ShadingContext.java Fri May 1 11:34:00 2015
@@ -55,7 +55,7 @@ class Type6ShadingContext extends PatchM
private List<Patch> getCoonsPatchList(AffineTransform xform, Matrix matrix) throws IOException
{
PDShadingType6 coonsShadingType = (PDShadingType6) patchMeshesShadingType;
- COSDictionary dict = coonsShadingType.getCOSDictionary();
+ COSDictionary dict = coonsShadingType.getCOSObject();
PDRange rangeX = coonsShadingType.getDecodeForParameter(0);
PDRange rangeY = coonsShadingType.getDecodeForParameter(1);
PDRange[] colRange = new PDRange[numberOfColorComponents];
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type7ShadingContext.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type7ShadingContext.java?rev=1677113&r1=1677112&r2=1677113&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type7ShadingContext.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type7ShadingContext.java Fri May 1 11:34:00 2015
@@ -55,7 +55,7 @@ class Type7ShadingContext extends PatchM
private List<Patch> getTensorPatchList(AffineTransform xform, Matrix matrix) throws IOException
{
PDShadingType7 tensorShadingType = (PDShadingType7) patchMeshesShadingType;
- COSDictionary dict = tensorShadingType.getCOSDictionary();
+ COSDictionary dict = tensorShadingType.getCOSObject();
PDRange rangeX = tensorShadingType.getDecodeForParameter(0);
PDRange rangeY = tensorShadingType.getDecodeForParameter(1);
PDRange[] colRange = new PDRange[numberOfColorComponents];