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/29 00:21:33 UTC
svn commit: r1682348 -
/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/metadata/SynchronizedMetaDataValidation.java
Author: tilman
Date: Thu May 28 22:21:32 2015
New Revision: 1682348
URL: http://svn.apache.org/r1682348
Log:
PDFBOX-2804: revert the changes from rev 1681445 as per advice of Olaf Drümmer and veraPDF pull request 12 which modified 6-1-5-t01-fail-i.pdf to non-null value
Modified:
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/metadata/SynchronizedMetaDataValidation.java
Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/metadata/SynchronizedMetaDataValidation.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/metadata/SynchronizedMetaDataValidation.java?rev=1682348&r1=1682347&r2=1682348&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/metadata/SynchronizedMetaDataValidation.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/metadata/SynchronizedMetaDataValidation.java Thu May 28 22:21:32 2015
@@ -62,14 +62,10 @@ public class SynchronizedMetaDataValidat
protected void analyzeTitleProperty(PDDocumentInformation dico, DublinCoreSchema dc, List<ValidationError> ve)
{
String title = dico.getTitle();
- COSBase item = dico.getCOSObject().getItem(COSName.TITLE);
- if (item != null)
+ if (title != null)
{
// automatically strip trailing Nul values
- if (title != null)
- {
- title = removeTrailingNul(title);
- }
+ title = removeTrailingNul(title);
if (dc != null)
{
// Check the x-default value, if not found, check with the first value found
@@ -133,14 +129,10 @@ public class SynchronizedMetaDataValidat
protected void analyzeAuthorProperty(PDDocumentInformation dico, DublinCoreSchema dc, List<ValidationError> ve)
{
String author = dico.getAuthor();
- COSBase item = dico.getCOSObject().getItem(COSName.AUTHOR);
- if (item != null)
+ if (author != null)
{
// automatically strip trailing Nul values
- if (author != null)
- {
- author = removeTrailingNul(author);
- }
+ author = removeTrailingNul(author);
if (dc != null)
{
if (dc.getCreatorsProperty() != null)
@@ -188,14 +180,10 @@ public class SynchronizedMetaDataValidat
protected void analyzeSubjectProperty(PDDocumentInformation dico, DublinCoreSchema dc, List<ValidationError> ve)
{
String subject = dico.getSubject();
- COSBase item = dico.getCOSObject().getItem(COSName.SUBJECT);
- if (item != null)
+ if (subject != null)
{
// automatically strip trailing Nul values
- if (subject != null)
- {
- subject = removeTrailingNul(subject);
- }
+ subject = removeTrailingNul(subject);
if (dc != null)
{
// PDF/A Conformance Erratum (2007) specifies XMP Subject
@@ -239,14 +227,10 @@ public class SynchronizedMetaDataValidat
protected void analyzeKeywordsProperty(PDDocumentInformation dico, AdobePDFSchema pdf, List<ValidationError> ve)
{
String keyword = dico.getKeywords();
- COSBase item = dico.getCOSObject().getItem(COSName.KEYWORDS);
- if (item != null)
+ if (keyword != null)
{
// automatically strip trailing Nul values
- if (keyword != null)
- {
- keyword = removeTrailingNul(keyword);
- }
+ keyword = removeTrailingNul(keyword);
if (pdf != null)
{
if (pdf.getKeywordsProperty() == null)
@@ -279,14 +263,10 @@ public class SynchronizedMetaDataValidat
protected void analyzeProducerProperty(PDDocumentInformation dico, AdobePDFSchema pdf, List<ValidationError> ve)
{
String producer = dico.getProducer();
- COSBase item = dico.getCOSObject().getItem(COSName.PRODUCER);
- if (item != null)
+ if (producer != null)
{
// automatically strip trailing Nul values
- if (producer != null)
- {
- producer = removeTrailingNul(producer);
- }
+ producer = removeTrailingNul(producer);
if (pdf != null)
{
if (pdf.getProducerProperty() == null)
@@ -321,14 +301,10 @@ public class SynchronizedMetaDataValidat
protected void analyzeCreatorToolProperty(PDDocumentInformation dico, XMPBasicSchema xmp, List<ValidationError> ve)
{
String creatorTool = dico.getCreator();
- COSBase item = dico.getCOSObject().getItem(COSName.CREATOR);
- if (item != null)
+ if (creatorTool != null)
{
// automatically strip trailing Nul values
- if (creatorTool != null)
- {
- creatorTool = removeTrailingNul(creatorTool);
- }
+ creatorTool = removeTrailingNul(creatorTool);
if (xmp != null)
{
if (xmp.getCreatorToolProperty() == null)
@@ -364,11 +340,7 @@ public class SynchronizedMetaDataValidat
{
Calendar creationDate = dico.getCreationDate();
COSBase item = dico.getCOSObject().getItem(COSName.CREATION_DATE);
- if (!isValidPDFDateFormat(item))
- {
- creationDate = null;
- }
- if (item != null)
+ if (creationDate != null && isValidPDFDateFormat(item))
{
if (xmp != null)
{
@@ -380,8 +352,7 @@ public class SynchronizedMetaDataValidat
}
else
{
- if (creationDate == null ||
- !DateConverter.toISO8601(xmpCreationDate).equals(DateConverter.toISO8601(creationDate)))
+ if (!DateConverter.toISO8601(xmpCreationDate).equals(DateConverter.toISO8601(creationDate)))
{
ve.add(unsynchronizedMetaDataError("CreationDate"));
}
@@ -413,11 +384,7 @@ public class SynchronizedMetaDataValidat
{
Calendar modifyDate = dico.getModificationDate();
COSBase item = dico.getCOSObject().getItem(COSName.MOD_DATE);
- if (!isValidPDFDateFormat(item))
- {
- modifyDate = null;
- }
- if (item != null)
+ if (modifyDate != null && isValidPDFDateFormat(item))
{
if (xmp != null)
{
@@ -428,8 +395,7 @@ public class SynchronizedMetaDataValidat
}
else
{
- if (modifyDate == null ||
- !DateConverter.toISO8601(xmpModifyDate).equals(DateConverter.toISO8601(modifyDate)))
+ if (!DateConverter.toISO8601(xmpModifyDate).equals(DateConverter.toISO8601(modifyDate)))
{
ve.add(unsynchronizedMetaDataError("ModificationDate"));
}