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 2019/12/14 09:09:27 UTC

svn commit: r1871422 - in /pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight: action/ process/

Author: tilman
Date: Sat Dec 14 09:09:27 2019
New Revision: 1871422

URL: http://svn.apache.org/viewvc?rev=1871422&view=rev
Log:
PDFBOX-4071: revert most of last commit because it would break API

Modified:
    pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/action/AbstractActionManager.java
    pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/action/GoToAction.java
    pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/action/GoToRemoteAction.java
    pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/action/HideAction.java
    pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/action/NamedAction.java
    pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/action/SubmitAction.java
    pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/action/ThreadAction.java
    pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/action/UriAction.java
    pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/process/TrailerValidationProcess.java

Modified: pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/action/AbstractActionManager.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/action/AbstractActionManager.java?rev=1871422&r1=1871421&r2=1871422&view=diff
==============================================================================
--- pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/action/AbstractActionManager.java (original)
+++ pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/action/AbstractActionManager.java Sat Dec 14 09:09:27 2019
@@ -43,7 +43,7 @@ public abstract class AbstractActionMana
     /**
      * The action dictionary checked by this class
      */
-    protected COSDictionary actionDictionary = null;
+    protected COSDictionary actionDictionnary = null;
     /**
      * The validation context
      */
@@ -63,7 +63,7 @@ public abstract class AbstractActionMana
     AbstractActionManager(ActionManagerFactory amFact, COSDictionary adict, PreflightContext ctx, String aaKey)
     {
         this.actionFact = amFact;
-        this.actionDictionary = adict;
+        this.actionDictionnary = adict;
         this.aaKey = aaKey;
         this.context = ctx;
     }
@@ -79,9 +79,9 @@ public abstract class AbstractActionMana
     /**
      * @return the actionDictionary
      */
-    public COSDictionary getActionDictionary()
+    public COSDictionary getActionDictionnary()
     {
-        return actionDictionary;
+        return actionDictionnary;
     }
 
     /**
@@ -101,7 +101,7 @@ public abstract class AbstractActionMana
      */
     protected boolean validNextActions() throws ValidationException
     {
-        List<AbstractActionManager> lActions = this.actionFact.getNextActions(this.context, this.actionDictionary);
+        List<AbstractActionManager> lActions = this.actionFact.getNextActions(this.context, this.actionDictionnary);
         for (AbstractActionManager nAction : lActions)
         {
             if (!nAction.innerValid())

Modified: pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/action/GoToAction.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/action/GoToAction.java?rev=1871422&r1=1871421&r2=1871422&view=diff
==============================================================================
--- pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/action/GoToAction.java (original)
+++ pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/action/GoToAction.java Sat Dec 14 09:09:27 2019
@@ -57,7 +57,7 @@ public class GoToAction extends Abstract
     @Override
     protected boolean innerValid() throws ValidationException
     {
-        COSBase dest = this.actionDictionary.getItem(COSName.D);
+        COSBase dest = this.actionDictionnary.getItem(COSName.D);
 
         // ---- D entry is mandatory
         if (dest == null)

Modified: pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/action/GoToRemoteAction.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/action/GoToRemoteAction.java?rev=1871422&r1=1871421&r2=1871422&view=diff
==============================================================================
--- pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/action/GoToRemoteAction.java (original)
+++ pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/action/GoToRemoteAction.java Sat Dec 14 09:09:27 2019
@@ -65,7 +65,7 @@ public class GoToRemoteAction extends Go
     @Override
     protected boolean innerValid() throws ValidationException
     {
-        COSBase dest = this.actionDictionary.getItem(COSName.D);
+        COSBase dest = this.actionDictionnary.getItem(COSName.D);
 
         // ---- D entry is mandatory
         if (dest == null)
@@ -83,7 +83,7 @@ public class GoToRemoteAction extends Go
             return false;
         }
 
-        COSBase f = this.actionDictionary.getItem(COSName.F);
+        COSBase f = this.actionDictionnary.getItem(COSName.F);
         if (f == null)
         {
             context.addValidationError(new ValidationError(ERROR_ACTION_MISING_KEY,

Modified: pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/action/HideAction.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/action/HideAction.java?rev=1871422&r1=1871421&r2=1871422&view=diff
==============================================================================
--- pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/action/HideAction.java (original)
+++ pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/action/HideAction.java Sat Dec 14 09:09:27 2019
@@ -63,7 +63,7 @@ public class HideAction extends Abstract
     @Override
     protected boolean innerValid()
     {
-        COSBase t = this.actionDictionary.getItem(COSName.T);
+        COSBase t = this.actionDictionnary.getItem(COSName.T);
         // ---- T entry is mandatory
         if (t == null)
         {
@@ -92,7 +92,7 @@ public class HideAction extends Abstract
          * representation of the document or is not documented in the PDF Reference is not permitted. This includes the
          * /Hide action which isn't specifically prohibited by PDF/A-1, but should have been.
          */
-        boolean h = this.actionDictionary.getBoolean(COSName.H, true);
+        boolean h = this.actionDictionnary.getBoolean(COSName.H, true);
         if (h)
         {
             context.addValidationError(new ValidationError(ERROR_ACTION_HIDE_H_INVALID, "H entry is \"true\""));

Modified: pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/action/NamedAction.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/action/NamedAction.java?rev=1871422&r1=1871421&r2=1871422&view=diff
==============================================================================
--- pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/action/NamedAction.java (original)
+++ pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/action/NamedAction.java Sat Dec 14 09:09:27 2019
@@ -64,7 +64,7 @@ public class NamedAction extends Abstrac
     @Override
     protected boolean innerValid()
     {
-        String n = this.actionDictionary.getNameAsString(COSName.N);
+        String n = this.actionDictionnary.getNameAsString(COSName.N);
 
         // ---- N entry is mandatory
         if (n == null || "".equals(n))

Modified: pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/action/SubmitAction.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/action/SubmitAction.java?rev=1871422&r1=1871421&r2=1871422&view=diff
==============================================================================
--- pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/action/SubmitAction.java (original)
+++ pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/action/SubmitAction.java Sat Dec 14 09:09:27 2019
@@ -54,7 +54,7 @@ public class SubmitAction extends Abstra
     @Override
     protected boolean innerValid()
     {
-        COSBase f = this.actionDictionary.getItem(COSName.F);
+        COSBase f = this.actionDictionnary.getItem(COSName.F);
         if (f == null)
         {
             context.addValidationError(new ValidationError(ERROR_ACTION_MISING_KEY,

Modified: pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/action/ThreadAction.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/action/ThreadAction.java?rev=1871422&r1=1871421&r2=1871422&view=diff
==============================================================================
--- pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/action/ThreadAction.java (original)
+++ pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/action/ThreadAction.java Sat Dec 14 09:09:27 2019
@@ -57,7 +57,7 @@ public class ThreadAction extends Abstra
     @Override
     protected boolean innerValid()
     {
-        COSBase d = this.actionDictionary.getItem(COSName.D);
+        COSBase d = this.actionDictionnary.getItem(COSName.D);
 
         // ---- D entry is mandatory
         if (d == null)

Modified: pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/action/UriAction.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/action/UriAction.java?rev=1871422&r1=1871421&r2=1871422&view=diff
==============================================================================
--- pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/action/UriAction.java (original)
+++ pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/action/UriAction.java Sat Dec 14 09:09:27 2019
@@ -57,7 +57,7 @@ public class UriAction extends AbstractA
     @Override
     protected boolean innerValid()
     {
-        COSBase uri = this.actionDictionary.getItem(COSName.URI);
+        COSBase uri = this.actionDictionnary.getItem(COSName.URI);
         if (uri == null)
         {
             context.addValidationError(new ValidationError(ERROR_ACTION_MISING_KEY,

Modified: pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/process/TrailerValidationProcess.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/process/TrailerValidationProcess.java?rev=1871422&r1=1871421&r2=1871422&view=diff
==============================================================================
--- pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/process/TrailerValidationProcess.java (original)
+++ pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/process/TrailerValidationProcess.java Sat Dec 14 09:09:27 2019
@@ -69,7 +69,7 @@ public class TrailerValidationProcess ex
                 ctx.getFileLen() == linearizedDict.getLong(COSName.L))
         {
             // it is a linearized PDF, check the linearized dictionary
-            checkLinearizedDictionary(ctx, linearizedDict);
+            checkLinearizedDictionnary(ctx, linearizedDict);
 
             // if the pdf is a linearized pdf. the first trailer must be checked
             // and it must have the same ID than the last trailer.
@@ -392,7 +392,7 @@ public class TrailerValidationProcess ex
      * @param ctx the preflight context.
      * @param linearizedDict the linearization dictionary.
      */
-    protected void checkLinearizedDictionary(PreflightContext ctx, COSDictionary linearizedDict)
+    protected void checkLinearizedDictionnary(PreflightContext ctx, COSDictionary linearizedDict)
     {
         // ---- check if all keys are authorized in a linearized dictionary
         // ---- Linearized dictionary must contain the lhoent keys