Author: jahewson
Date: Wed Oct 22 00:49:51 2014
New Revision: 1633502
URL: http://svn.apache.org/r1633502
Log:
PDFBOX-2423: Replaced calls to PDDocumentCatalog#getCOSDictionary with
getCOSObject
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocumentCatalog.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocumentNameDictionary.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFMergerUtility.java
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/ICCProfileWrapper.java
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/CatalogValidationProcess.java
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocumentCatalog.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocumentCatalog.java?rev=1633502&r1=1633501&r2=1633502&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocumentCatalog.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocumentCatalog.java
Wed Oct 22 00:49:51 2014
@@ -85,17 +85,7 @@ public class PDDocumentCatalog implement
* @return The cos object that matches this Java object.
*/
@Override
- public COSBase getCOSObject()
- {
- return root;
- }
-
- /**
- * Convert this standard java object to a COS object.
- *
- * @return The cos object that matches this Java object.
- */
- public COSDictionary getCOSDictionary()
+ public COSDictionary getCOSObject()
{
return root;
}
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocumentNameDictionary.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocumentNameDictionary.java?rev=1633502&r1=1633501&r2=1633502&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocumentNameDictionary.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/PDDocumentNameDictionary.java
Wed Oct 22 00:49:51 2014
@@ -39,7 +39,7 @@ public class PDDocumentNameDictionary im
*/
public PDDocumentNameDictionary( PDDocumentCatalog cat )
{
- COSBase names =
cat.getCOSDictionary().getDictionaryObject(COSName.NAMES);
+ COSBase names = cat.getCOSObject().getDictionaryObject(COSName.NAMES);
if (names != null)
{
nameDictionary = (COSDictionary)names;
@@ -47,7 +47,7 @@ public class PDDocumentNameDictionary im
else
{
nameDictionary = new COSDictionary();
- cat.getCOSDictionary().setItem(COSName.NAMES, nameDictionary);
+ cat.getCOSObject().setItem(COSName.NAMES, nameDictionary);
}
catalog = cat;
}
@@ -100,7 +100,7 @@ public class PDDocumentNameDictionary im
//so check there as well.
if( dic == null )
{
- dic =
(COSDictionary)catalog.getCOSDictionary().getDictionaryObject( COSName.DESTS );
+ dic = (COSDictionary)catalog.getCOSObject().getDictionaryObject(
COSName.DESTS );
}
if( dic != null )
@@ -125,7 +125,7 @@ public class PDDocumentNameDictionary im
//names dictionary for now unless there is a reason to do
//something else.
//clear the potentially out of date Dests reference.
- catalog.getCOSDictionary().setItem( COSName.DESTS,
(COSObjectable)null);
+ catalog.getCOSObject().setItem( COSName.DESTS, (COSObjectable)null);
}
/**
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFMergerUtility.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFMergerUtility.java?rev=1633502&r1=1633501&r2=1633502&view=diff
==============================================================================
---
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFMergerUtility.java
(original)
+++
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/PDFMergerUtility.java
Wed Oct 22 00:49:51 2014
@@ -307,12 +307,12 @@ public class PDFMergerUtility
}
}
- COSArray destThreads = (COSArray)
destCatalog.getCOSDictionary().getDictionaryObject(COSName.THREADS);
- COSArray srcThreads = (COSArray)
cloner.cloneForNewDocument(destCatalog.getCOSDictionary().getDictionaryObject(
+ COSArray destThreads = (COSArray)
destCatalog.getCOSObject().getDictionaryObject(COSName.THREADS);
+ COSArray srcThreads = (COSArray)
cloner.cloneForNewDocument(destCatalog.getCOSObject().getDictionaryObject(
COSName.THREADS));
if (destThreads == null)
{
- destCatalog.getCOSDictionary().setItem(COSName.THREADS,
srcThreads);
+ destCatalog.getCOSObject().setItem(COSName.THREADS, srcThreads);
}
else
{
@@ -325,7 +325,7 @@ public class PDFMergerUtility
{
if (destNames == null)
{
- destCatalog.getCOSDictionary().setItem(COSName.NAMES,
cloner.cloneForNewDocument(srcNames));
+ destCatalog.getCOSObject().setItem(COSName.NAMES,
cloner.cloneForNewDocument(srcNames));
}
else
{
@@ -360,9 +360,9 @@ public class PDFMergerUtility
destCatalog.setPageMode(srcPageMode);
}
- COSDictionary destLabels = (COSDictionary)
destCatalog.getCOSDictionary().getDictionaryObject(
+ COSDictionary destLabels = (COSDictionary)
destCatalog.getCOSObject().getDictionaryObject(
COSName.PAGE_LABELS);
- COSDictionary srcLabels = (COSDictionary) srcCatalog.getCOSDictionary()
+ COSDictionary srcLabels = (COSDictionary) srcCatalog.getCOSObject()
.getDictionaryObject(COSName.PAGE_LABELS);
if (srcLabels != null)
{
@@ -373,7 +373,7 @@ public class PDFMergerUtility
destLabels = new COSDictionary();
destNums = new COSArray();
destLabels.setItem(COSName.NUMS, destNums);
- destCatalog.getCOSDictionary().setItem(COSName.PAGE_LABELS,
destLabels);
+ destCatalog.getCOSObject().setItem(COSName.PAGE_LABELS,
destLabels);
}
else
{
@@ -392,14 +392,14 @@ public class PDFMergerUtility
}
}
- COSStream destMetadata = (COSStream)
destCatalog.getCOSDictionary().getDictionaryObject(COSName.METADATA);
- COSStream srcMetadata = (COSStream)
srcCatalog.getCOSDictionary().getDictionaryObject(COSName.METADATA);
+ COSStream destMetadata = (COSStream)
destCatalog.getCOSObject().getDictionaryObject(COSName.METADATA);
+ COSStream srcMetadata = (COSStream)
srcCatalog.getCOSObject().getDictionaryObject(COSName.METADATA);
if (destMetadata == null && srcMetadata != null)
{
PDStream newStream = new PDStream(destination,
srcMetadata.getUnfilteredStream(), false);
newStream.getStream().mergeInto(srcMetadata);
newStream.addCompression();
- destCatalog.getCOSDictionary().setItem(COSName.METADATA,
newStream);
+ destCatalog.getCOSObject().setItem(COSName.METADATA, newStream);
}
// merge logical structure hierarchy if logical structure information
is available in both source pdf and
Modified:
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/ICCProfileWrapper.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/ICCProfileWrapper.java?rev=1633502&r1=1633501&r2=1633502&view=diff
==============================================================================
---
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/ICCProfileWrapper.java
(original)
+++
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/graphic/ICCProfileWrapper.java
Wed Oct 22 00:49:51 2014
@@ -123,7 +123,7 @@ public class ICCProfileWrapper
{
PreflightDocument document = context.getDocument();
PDDocumentCatalog catalog = document.getDocumentCatalog();
- COSBase cBase =
catalog.getCOSDictionary().getItem(COSName.getPDFName(DOCUMENT_DICTIONARY_KEY_OUTPUT_INTENTS));
+ COSBase cBase =
catalog.getCOSObject().getItem(COSName.getPDFName(DOCUMENT_DICTIONARY_KEY_OUTPUT_INTENTS));
COSArray outputIntents = COSUtils.getAsArray(cBase,
document.getDocument());
for (int i = 0; outputIntents != null && i < outputIntents.size(); ++i)
Modified:
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/CatalogValidationProcess.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/CatalogValidationProcess.java?rev=1633502&r1=1633501&r2=1633502&view=diff
==============================================================================
---
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/CatalogValidationProcess.java
(original)
+++
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/CatalogValidationProcess.java
Wed Oct 22 00:49:51 2014
@@ -224,9 +224,9 @@ public class CatalogValidationProcess ex
*/
protected void validateActions(PreflightContext ctx) throws
ValidationException
{
- ContextHelper.validateElement(ctx, catalog.getCOSDictionary(),
ACTIONS_PROCESS);
+ ContextHelper.validateElement(ctx, catalog.getCOSObject(),
ACTIONS_PROCESS);
// AA entry if forbidden in PDF/A-1
- COSBase aa =
catalog.getCOSDictionary().getItem(DICTIONARY_KEY_ADDITIONAL_ACTION);
+ COSBase aa =
catalog.getCOSObject().getItem(DICTIONARY_KEY_ADDITIONAL_ACTION);
if (aa != null)
{
addValidationError(ctx, new
ValidationError(ERROR_ACTION_FORBIDDEN_ADDITIONAL_ACTION,
@@ -299,7 +299,7 @@ public class CatalogValidationProcess ex
public void validateOutputIntent(PreflightContext ctx) throws
ValidationException
{
COSDocument cosDocument = ctx.getDocument().getDocument();
- COSBase cBase =
catalog.getCOSDictionary().getItem(COSName.getPDFName(DOCUMENT_DICTIONARY_KEY_OUTPUT_INTENTS));
+ COSBase cBase =
catalog.getCOSObject().getItem(COSName.getPDFName(DOCUMENT_DICTIONARY_KEY_OUTPUT_INTENTS));
COSArray outputIntents = COSUtils.getAsArray(cBase, cosDocument);
Map<COSObjectKey, Boolean> tmpDestOutputProfile = new
HashMap<COSObjectKey, Boolean>();
