svn commit: r1654470 - in /pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight: PreflightContext.java parser/PreflightParser.java process/TrailerValidationProcess.java

[tilman]

Author: tilman
Date: Sat Jan 24 06:15:55 2015
New Revision: 1654470

URL: http://svn.apache.org/r1654470
Log:
PDFBOX-2576: name everything related to XrefTrailerResolver 
"xrefTrailerResolver", not "xrefTableResolver"; avoid "local variable hides a 
field" warning

Modified:
    
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/PreflightContext.java
    
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/parser/PreflightParser.java
    
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/TrailerValidationProcess.java

Modified: 
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/PreflightContext.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/PreflightContext.java?rev=1654470&r1=1654469&r2=1654470&view=diff
==============================================================================
--- 
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/PreflightContext.java
 (original)
+++ 
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/PreflightContext.java
 Sat Jan 24 06:15:55 2015
@@ -56,7 +56,7 @@ public class PreflightContext implements
     /**
      * Contains all Xref/trailer objects and resolves them into single object 
using startxref reference.
      */
-    private XrefTrailerResolver xrefTableResolver;
+    private XrefTrailerResolver xrefTrailerResolver;
 
     /**
      * This wrapper contains the ICCProfile used by the PDF file.
@@ -119,14 +119,14 @@ public class PreflightContext implements
         return document;
     }
 
-    public XrefTrailerResolver getXrefTableResolver()
+    public XrefTrailerResolver getXrefTrailerResolver()
     {
-        return xrefTableResolver;
+        return xrefTrailerResolver;
     }
 
-    public void setXrefTableResolver(XrefTrailerResolver xrefTableResolver)
+    public void setXrefTrailerResolver(XrefTrailerResolver xrefTrailerResolver)
     {
-        this.xrefTableResolver = xrefTableResolver;
+        this.xrefTrailerResolver = xrefTrailerResolver;
     }
 
     /**
@@ -219,9 +219,9 @@ public class PreflightContext implements
      */
     public void addValidationError(ValidationError error)
     {
-        PreflightDocument document = (PreflightDocument) this.document;
+        PreflightDocument pfDoc = (PreflightDocument) this.document;
         error.setPageNumber(currentPageNumber);
-        document.addValidationError(error);
+        pfDoc.addValidationError(error);
     }
 
     /**
@@ -231,10 +231,10 @@ public class PreflightContext implements
      */
     public void addValidationErrors(List<ValidationError> errors)
     {
-        PreflightDocument document = (PreflightDocument) this.document;
+        PreflightDocument pfDoc = (PreflightDocument) this.document;
         for (ValidationError error : errors)
         {
-            document.addValidationError(error);
+            pfDoc.addValidationError(error);
         }
     }
 

Modified: 
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/parser/PreflightParser.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/parser/PreflightParser.java?rev=1654470&r1=1654469&r2=1654470&view=diff
==============================================================================
--- 
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/parser/PreflightParser.java
 (original)
+++ 
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/parser/PreflightParser.java
 Sat Jan 24 06:15:55 2015
@@ -210,7 +210,7 @@ public class PreflightParser extends Non
         this.ctx = new PreflightContext(this.originalDocument);
         ctx.setDocument(preflightDocument);
         preflightDocument.setContext(ctx);
-        ctx.setXrefTableResolver(xrefTrailerResolver);
+        ctx.setXrefTrailerResolver(xrefTrailerResolver);
     }
 
     @Override

Modified: 
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/TrailerValidationProcess.java
URL: 
http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/TrailerValidationProcess.java?rev=1654470&r1=1654469&r2=1654470&view=diff
==============================================================================
--- 
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/TrailerValidationProcess.java
 (original)
+++ 
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/TrailerValidationProcess.java
 Sat Jan 24 06:15:55 2015
@@ -95,14 +95,14 @@ public class TrailerValidationProcess ex
      */
     protected void checkTrailersForLinearizedPDF14(PreflightContext ctx)
     {
-        COSDictionary first = ctx.getXrefTableResolver().getFirstTrailer();
+        COSDictionary first = ctx.getXrefTrailerResolver().getFirstTrailer();
         if (first == null)
         {
             addValidationError(ctx, new ValidationError(ERROR_SYNTAX_TRAILER, 
"There are no trailer in the PDF file"));
         }
         else
         {
-            COSDictionary last = ctx.getXrefTableResolver().getLastTrailer();
+            COSDictionary last = ctx.getXrefTrailerResolver().getLastTrailer();
             COSDocument cosDoc = new COSDocument();
             checkMainTrailer(ctx, first);
             if (!compareIds(first, last, cosDoc))