svn commit: r1418053 - in /pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight: PreflightDocument.java process/reflect/AnnotationValidationProcess.java

[leleueri]

Author: leleueri
Date: Thu Dec  6 20:14:19 2012
New Revision: 1418053

URL: http://svn.apache.org/viewvc?rev=1418053&view=rev
Log:
[https://issues.apache.org/jira/browse/PDFBOX-1446] Fix initialization issue

Modified:
    
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/PreflightDocument.java
    
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/AnnotationValidationProcess.java

Modified: 
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/PreflightDocument.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/PreflightDocument.java?rev=1418053&r1=1418052&r2=1418053&view=diff
==============================================================================
--- 
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/PreflightDocument.java
 (original)
+++ 
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/PreflightDocument.java
 Thu Dec  6 20:14:19 2012
@@ -71,12 +71,7 @@ public class PreflightDocument extends P
         * @throws IOException
         */
        public PreflightDocument(Format format, PreflightConfiguration cfg) 
throws IOException {
-               super();
-               this.specification = format;
-               this.config = cfg;
-               if (this.config == null) {
-                       initConfiguration(format);
-               }
+               this(new COSDocument(), format, cfg);
        }
 
        /**
@@ -91,6 +86,7 @@ public class PreflightDocument extends P
        public PreflightDocument(COSDocument doc, Format format, 
PreflightConfiguration cfg) {
                super(doc);
                this.specification = format;
+               this.config = cfg;
                if (this.config == null) {
                        initConfiguration(format);
                }

Modified: 
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/AnnotationValidationProcess.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/AnnotationValidationProcess.java?rev=1418053&r1=1418052&r2=1418053&view=diff
==============================================================================
--- 
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/AnnotationValidationProcess.java
 (original)
+++ 
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/AnnotationValidationProcess.java
 Thu Dec  6 20:14:19 2012
@@ -35,16 +35,17 @@ public class AnnotationValidationProcess
        public void validate(PreflightContext context) throws 
ValidationException {
                PreflightPath vPath = context.getValidationPath();
                if (vPath.isEmpty() || 
!vPath.isExpectedType(COSDictionary.class)) {
-                throw new ValidationException("Annotation validation process 
needs at least one COSDictionary object");
+                       throw new ValidationException("Annotation validation 
process needs at least one COSDictionary object");
                }
 
                COSDictionary annotDict = (COSDictionary)vPath.peek();
 
                PreflightConfiguration config = context.getConfig();
                AnnotationValidatorFactory factory = config.getAnnotFact();
-           AnnotationValidator annotValidator = 
factory.getAnnotationValidator(context, annotDict);
-           if (annotValidator != null)
-               annotValidator.validate();
+               AnnotationValidator annotValidator = 
factory.getAnnotationValidator(context, annotDict);
+               if (annotValidator != null) {
+                       annotValidator.validate();
+               }
        }
 
 }