Author: tilman
Date: Sat May 2 11:27:40 2015
New Revision: 1677304
URL: http://svn.apache.org/r1677304
Log:
PDFBOX-2783: Use getCOSObject() instead of getCOSDictionary()
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDAttributeObject.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDDefaultAttributeObject.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDUserAttributeObject.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDUserProperty.java
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDAttributeObject.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDAttributeObject.java?rev=1677304&r1=1677303&r2=1677304&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDAttributeObject.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDAttributeObject.java
Sat May 2 11:27:40 2015
@@ -125,7 +125,7 @@ public abstract class PDAttributeObject
*/
public String getOwner()
{
- return this.getCOSDictionary().getNameAsString(COSName.O);
+ return this.getCOSObject().getNameAsString(COSName.O);
}
/**
@@ -135,7 +135,7 @@ public abstract class PDAttributeObject
*/
protected void setOwner(String owner)
{
- this.getCOSDictionary().setName(COSName.O, owner);
+ this.getCOSObject().setName(COSName.O, owner);
}
/**
@@ -147,7 +147,7 @@ public abstract class PDAttributeObject
public boolean isEmpty()
{
// only entry is the owner?
- return (this.getCOSDictionary().size() == 1) && (this.getOwner() !=
null);
+ return (this.getCOSObject().size() == 1) && (this.getOwner() != null);
}
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDDefaultAttributeObject.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDDefaultAttributeObject.java?rev=1677304&r1=1677303&r2=1677304&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDDefaultAttributeObject.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDDefaultAttributeObject.java
Sat May 2 11:27:40 2015
@@ -59,7 +59,7 @@ public class PDDefaultAttributeObject ex
public List<String> getAttributeNames()
{
List<String> attrNames = new ArrayList<String>();
- for (Entry<COSName, COSBase> entry :
this.getCOSDictionary().entrySet())
+ for (Entry<COSName, COSBase> entry : this.getCOSObject().entrySet())
{
COSName key = entry.getKey();
if (!COSName.O.equals(key))
@@ -78,7 +78,7 @@ public class PDDefaultAttributeObject ex
*/
public COSBase getAttributeValue(String attrName)
{
- return this.getCOSDictionary().getDictionaryObject(attrName);
+ return this.getCOSObject().getDictionaryObject(attrName);
}
/**
@@ -90,7 +90,7 @@ public class PDDefaultAttributeObject ex
*/
protected COSBase getAttributeValue(String attrName, COSBase defaultValue)
{
- COSBase value = this.getCOSDictionary().getDictionaryObject(attrName);
+ COSBase value = this.getCOSObject().getDictionaryObject(attrName);
if (value == null)
{
return defaultValue;
@@ -107,7 +107,7 @@ public class PDDefaultAttributeObject ex
public void setAttribute(String attrName, COSBase attrValue)
{
COSBase old = this.getAttributeValue(attrName);
- this.getCOSDictionary().setItem(COSName.getPDFName(attrName),
attrValue);
+ this.getCOSObject().setItem(COSName.getPDFName(attrName), attrValue);
this.potentiallyNotifyChanged(old, attrValue);
}
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDUserAttributeObject.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDUserAttributeObject.java?rev=1677304&r1=1677303&r2=1677304&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDUserAttributeObject.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDUserAttributeObject.java
Sat May 2 11:27:40 2015
@@ -62,7 +62,7 @@ public class PDUserAttributeObject exten
*/
public List<PDUserProperty> getOwnerUserProperties()
{
- COSArray p = (COSArray) this.getCOSDictionary()
+ COSArray p = (COSArray) this.getCOSObject()
.getDictionaryObject(COSName.P);
List<PDUserProperty> properties = new
ArrayList<PDUserProperty>(p.size());
for (int i = 0; i < p.size(); i++)
@@ -85,7 +85,7 @@ public class PDUserAttributeObject exten
{
p.add(userProperty);
}
- this.getCOSDictionary().setItem(COSName.P, p);
+ this.getCOSObject().setItem(COSName.P, p);
}
/**
@@ -95,8 +95,7 @@ public class PDUserAttributeObject exten
*/
public void addUserProperty(PDUserProperty userProperty)
{
- COSArray p = (COSArray) this.getCOSDictionary()
- .getDictionaryObject(COSName.P);
+ COSArray p = (COSArray)
this.getCOSObject().getDictionaryObject(COSName.P);
p.add(userProperty);
this.notifyChanged();
}
@@ -112,8 +111,7 @@ public class PDUserAttributeObject exten
{
return;
}
- COSArray p = (COSArray) this.getCOSDictionary()
- .getDictionaryObject(COSName.P);
+ COSArray p = (COSArray)
this.getCOSObject().getDictionaryObject(COSName.P);
p.remove(userProperty.getCOSObject());
this.notifyChanged();
}
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDUserProperty.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDUserProperty.java?rev=1677304&r1=1677303&r2=1677304&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDUserProperty.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/documentinterchange/logicalstructure/PDUserProperty.java
Sat May 2 11:27:40 2015
@@ -62,7 +62,7 @@ public class PDUserProperty extends PDDi
*/
public String getName()
{
- return this.getCOSDictionary().getNameAsString(COSName.N);
+ return this.getCOSObject().getNameAsString(COSName.N);
}
/**
@@ -73,7 +73,7 @@ public class PDUserProperty extends PDDi
public void setName(String name)
{
this.potentiallyNotifyChanged(this.getName(), name);
- this.getCOSDictionary().setName(COSName.N, name);
+ this.getCOSObject().setName(COSName.N, name);
}
/**
@@ -83,7 +83,7 @@ public class PDUserProperty extends PDDi
*/
public COSBase getValue()
{
- return this.getCOSDictionary().getDictionaryObject(COSName.V);
+ return this.getCOSObject().getDictionaryObject(COSName.V);
}
/**
@@ -94,7 +94,7 @@ public class PDUserProperty extends PDDi
public void setValue(COSBase value)
{
this.potentiallyNotifyChanged(this.getValue(), value);
- this.getCOSDictionary().setItem(COSName.V, value);
+ this.getCOSObject().setItem(COSName.V, value);
}
/**
@@ -104,7 +104,7 @@ public class PDUserProperty extends PDDi
*/
public String getFormattedValue()
{
- return this.getCOSDictionary().getString(COSName.F);
+ return this.getCOSObject().getString(COSName.F);
}
/**
@@ -115,7 +115,7 @@ public class PDUserProperty extends PDDi
public void setFormattedValue(String formattedValue)
{
this.potentiallyNotifyChanged(this.getFormattedValue(),
formattedValue);
- this.getCOSDictionary().setString(COSName.F, formattedValue);
+ this.getCOSObject().setString(COSName.F, formattedValue);
}
/**
@@ -126,7 +126,7 @@ public class PDUserProperty extends PDDi
*/
public boolean isHidden()
{
- return this.getCOSDictionary().getBoolean(COSName.H, false);
+ return this.getCOSObject().getBoolean(COSName.H, false);
}
/**
@@ -138,7 +138,7 @@ public class PDUserProperty extends PDDi
public void setHidden(boolean hidden)
{
this.potentiallyNotifyChanged(this.isHidden(), hidden);
- this.getCOSDictionary().setBoolean(COSName.H, hidden);
+ this.getCOSObject().setBoolean(COSName.H, hidden);
}
