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 2014/11/22 16:16:38 UTC
svn commit: r1641080 -
/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/annotation/
Author: tilman
Date: Sat Nov 22 15:16:38 2014
New Revision: 1641080
URL: http://svn.apache.org/r1641080
Log:
PDFBOX-1864: do all annotation checks everytime; code cleanup
Modified:
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/annotation/FreeTextAnnotationValidator.java
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/annotation/InkAnnotationValdiator.java
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/annotation/LineAnnotationValidator.java
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/annotation/LinkAnnotationValidator.java
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/annotation/MarkupAnnotationValidator.java
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/annotation/SquareCircleAnnotationValidator.java
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/annotation/WidgetAnnotationValidator.java
Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/annotation/FreeTextAnnotationValidator.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/annotation/FreeTextAnnotationValidator.java?rev=1641080&r1=1641079&r2=1641080&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/annotation/FreeTextAnnotationValidator.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/annotation/FreeTextAnnotationValidator.java Sat Nov 22 15:16:38 2014
@@ -43,6 +43,7 @@ public class FreeTextAnnotationValidator
this.pdAnnot = this.pdFreeText;
}
+ @Override
protected boolean checkSpecificMandatoryFields()
{
return this.annotDictionary.containsKey(COSName.DA);
Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/annotation/InkAnnotationValdiator.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/annotation/InkAnnotationValdiator.java?rev=1641080&r1=1641079&r2=1641080&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/annotation/InkAnnotationValdiator.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/annotation/InkAnnotationValdiator.java Sat Nov 22 15:16:38 2014
@@ -45,6 +45,7 @@ public class InkAnnotationValdiator exte
this.pdAnnot = this.pdUnk;
}
+ @Override
protected boolean checkSpecificMandatoryFields()
{
return this.annotDictionary.containsKey(COSName.getPDFName(ANNOT_DICTIONARY_KEY_INKLIST));
Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/annotation/LineAnnotationValidator.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/annotation/LineAnnotationValidator.java?rev=1641080&r1=1641079&r2=1641080&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/annotation/LineAnnotationValidator.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/annotation/LineAnnotationValidator.java Sat Nov 22 15:16:38 2014
@@ -55,9 +55,9 @@ public class LineAnnotationValidator ext
@Override
public boolean validate() throws ValidationException
{
- boolean isValide = super.validate();
- isValide = isValide && checkIColors();
- return isValide;
+ boolean isValid = super.validate();
+ isValid = checkIColors() && isValid;
+ return isValid;
}
/**
@@ -85,6 +85,7 @@ public class LineAnnotationValidator ext
*
* @see AnnotationValidator#checkMandatoryFields()
*/
+ @Override
protected boolean checkSpecificMandatoryFields()
{
return this.annotDictionary.containsKey(COSName.L);
Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/annotation/LinkAnnotationValidator.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/annotation/LinkAnnotationValidator.java?rev=1641080&r1=1641079&r2=1641080&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/annotation/LinkAnnotationValidator.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/annotation/LinkAnnotationValidator.java Sat Nov 22 15:16:38 2014
@@ -58,9 +58,9 @@ public class LinkAnnotationValidator ext
@Override
public boolean validate() throws ValidationException
{
- boolean isValide = super.validate();
- isValide = isValide && checkDest();
- return isValide;
+ boolean isValid = super.validate();
+ isValid = checkDest() && isValid;
+ return isValid;
}
/**
Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/annotation/MarkupAnnotationValidator.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/annotation/MarkupAnnotationValidator.java?rev=1641080&r1=1641079&r2=1641080&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/annotation/MarkupAnnotationValidator.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/annotation/MarkupAnnotationValidator.java Sat Nov 22 15:16:38 2014
@@ -45,6 +45,7 @@ public class MarkupAnnotationValidator e
this.pdAnnot = this.pdMarkup;
}
+ @Override
protected boolean checkSpecificMandatoryFields()
{
return this.annotDictionary.containsKey(COSName.getPDFName(ANNOT_DICTIONARY_KEY_QUADPOINTS));
Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/annotation/SquareCircleAnnotationValidator.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/annotation/SquareCircleAnnotationValidator.java?rev=1641080&r1=1641079&r2=1641080&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/annotation/SquareCircleAnnotationValidator.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/annotation/SquareCircleAnnotationValidator.java Sat Nov 22 15:16:38 2014
@@ -54,9 +54,9 @@ public class SquareCircleAnnotationValid
@Override
public boolean validate() throws ValidationException
{
- boolean isValide = super.validate();
- isValide = isValide && checkIColors();
- return isValide;
+ boolean isValid = super.validate();
+ isValid = checkIColors() && isValid;
+ return isValid;
}
/**
Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/annotation/WidgetAnnotationValidator.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/annotation/WidgetAnnotationValidator.java?rev=1641080&r1=1641079&r2=1641080&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/annotation/WidgetAnnotationValidator.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/annotation/WidgetAnnotationValidator.java Sat Nov 22 15:16:38 2014
@@ -54,9 +54,8 @@ public class WidgetAnnotationValidator e
@Override
public boolean validate() throws ValidationException
{
- boolean isValide = super.validate();
- isValide = isValide && checkAAField();
- return isValide;
+ boolean isValid = super.validate();
+ return checkAAField() && isValid;
}
/**