Author: leleueri
Date: Thu Jun 27 19:51:38 2013
New Revision: 1497532
URL: http://svn.apache.org/r1497532
Log:
[PDFBOX-1630] Change exception to ValidationError on getCreationDate &
getModifyDate information
Modified:
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/PreflightConstants.java
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/metadata/SynchronizedMetaDataValidation.java
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/metadata/TestSynchronizedMetadataValidation.java
Modified:
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/PreflightConstants.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/PreflightConstants.java?rev=1497532&r1=1497531&r2=1497532&view=diff
==============================================================================
---
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/PreflightConstants.java
(original)
+++
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/PreflightConstants.java
Thu Jun 27 19:51:38 2013
@@ -940,7 +940,11 @@ public interface PreflightConstants
* a category has an invalid value in one property description (must be
internal or external)
*/
String ERROR_METADATA_CATEGORY_PROPERTY_INVALID = "7.5.1";
-
+
+ /**
+ * the infor dictionary is corrupt or value can't be read
+ */
+ String ERROR_METADATA_DICT_INFO_CORRUPT = "7.12";
/**
* Error about PDF processing : that is not necessary a specific PDF/A
validation error
* but a PDF specification requirement that isn't respected.
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=1497532&r1=1497531&r2=1497532&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 Jun 27 19:51:38 2013
@@ -341,7 +341,7 @@ public class SynchronizedMetaDataValidat
protected void analyzeCreationDateProperty(PDDocumentInformation dico,
XMPBasicSchema xmp, List<ValidationError> ve)
throws ValidationException
{
- Calendar creationDate;
+ Calendar creationDate = null;
try
{
creationDate = dico.getCreationDate();
@@ -349,7 +349,7 @@ public class SynchronizedMetaDataValidat
catch (IOException e)
{
// If there is an error while converting this property to a date
- throw formatAccessException("Document Information",
"CreationDate", e);
+ ve.add(new
ValidationError(PreflightConstants.ERROR_METADATA_DICT_INFO_CORRUPT, "Document
Information 'CreationDate' can't be read : " + e.getMessage()));
}
if (creationDate != null)
{
@@ -424,7 +424,7 @@ public class SynchronizedMetaDataValidat
catch (IOException e)
{
// If there is an error while converting this property to a date
- throw formatAccessException("Document Information", "ModifyDate",
e);
+ ve.add(new
ValidationError(PreflightConstants.ERROR_METADATA_DICT_INFO_CORRUPT, "Document
Information 'ModifyDate' can't be read : " + e.getMessage()));
}
}
@@ -508,24 +508,6 @@ public class SynchronizedMetaDataValidat
}
/**
- * Return an exception formatted on IOException when accessing metadata
- *
- * @param type
- * type of property (Document Info or XMP)
- * @param target
- * the name of the metadata
- * @param cause
- * the raised IOException
- * @return the generated exception
- */
- protected ValidationException formatAccessException(String type, String
target, Throwable cause)
- {
- StringBuilder sb = new StringBuilder(80);
- sb.append("Cannot treat ").append(type).append("
").append(target).append(" property");
- return new ValidationException(sb.toString(), cause);
- }
-
- /**
* Return an exception formatted on IOException when accessing on metadata
schema
*
* @param target
Modified:
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/metadata/TestSynchronizedMetadataValidation.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/metadata/TestSynchronizedMetadataValidation.java?rev=1497532&r1=1497531&r2=1497532&view=diff
==============================================================================
---
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/metadata/TestSynchronizedMetadataValidation.java
(original)
+++
pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/metadata/TestSynchronizedMetadataValidation.java
Thu Jun 27 19:51:38 2013
@@ -436,19 +436,6 @@ public class TestSynchronizedMetadataVal
}
}
-
- /**
- * Check if FormatAccessException Generator is ok
- *
- * @throws Exception
- */
- @Test
- public void checkformatAccessException() throws Exception
- {
- Throwable cause = new Throwable();
- Assert.assertSame(cause, sync.formatAccessException("test", "test",
cause).getCause());
- }
-
/**
* Check if SchemaAccessException Generator is ok
*
