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 2015/03/01 13:16:23 UTC
svn commit: r1663088 -
/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/xobject/XObjFormValidator.java
Author: tilman
Date: Sun Mar 1 12:16:23 2015
New Revision: 1663088
URL: http://svn.apache.org/r1663088
Log:
PDFBOX-2576: combine if statements
Modified:
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/xobject/XObjFormValidator.java
Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/xobject/XObjFormValidator.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/xobject/XObjFormValidator.java?rev=1663088&r1=1663087&r2=1663088&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/xobject/XObjFormValidator.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/xobject/XObjFormValidator.java Sun Mar 1 12:16:23 2015
@@ -126,14 +126,16 @@ public class XObjFormValidator extends A
{
if (!XOBJECT_DICTIONARY_KEY_GROUP.equals(groupDictionary.getNameAsString(COSName.TYPE)))
{
- context.addValidationError(new ValidationError(PreflightConstants.ERROR_GRAPHIC_MISSING_FIELD, "The Group dictionary hasn't Group as Type value"));
+ context.addValidationError(new ValidationError(PreflightConstants.ERROR_GRAPHIC_MISSING_FIELD,
+ "The Group dictionary hasn't Group as Type value"));
}
else
{
String sVal = groupDictionary.getNameAsString(COSName.S);
if (sVal == null || XOBJECT_DICTIONARY_VALUE_S_TRANSPARENCY.equals(sVal))
{
- context.addValidationError(new ValidationError(ERROR_GRAPHIC_TRANSPARENCY_GROUP, "Group has a transparency S entry or the S entry is null ["+xobject.toString()+"]"));
+ context.addValidationError(new ValidationError(ERROR_GRAPHIC_TRANSPARENCY_GROUP,
+ "Group has a transparency S entry or the S entry is null ["+xobject.toString()+"]"));
return;
}
}
@@ -148,7 +150,8 @@ public class XObjFormValidator extends A
// 6.2.4 and 6.2.5 no PS
if (this.xobject.getItem(COSName.getPDFName("PS")) != null)
{
- context.addValidationError(new ValidationError(ERROR_GRAPHIC_UNEXPECTED_KEY, "Unexpected 'PS' Key"));
+ context.addValidationError(new ValidationError(ERROR_GRAPHIC_UNEXPECTED_KEY,
+ "Unexpected 'PS' Key"));
return;
}
}
@@ -159,14 +162,12 @@ public class XObjFormValidator extends A
protected void checkSubtype2Value()
{
// 6.2.5 if Subtype2, value not PS
- if (this.xobject.getItem(COSName.getPDFName("Subtype2")) != null)
+ if (this.xobject.getItem(COSName.getPDFName("Subtype2")) != null
+ && "PS".equals(this.xobject.getNameAsString("Subtype2")))
{
- if ("PS".equals(this.xobject.getNameAsString("Subtype2")))
- {
- context.addValidationError(new ValidationError(ERROR_GRAPHIC_UNEXPECTED_VALUE_FOR_KEY,
- "Unexpected 'PS' value for 'Subtype2' Key"));
- return;
- }
+ context.addValidationError(new ValidationError(ERROR_GRAPHIC_UNEXPECTED_VALUE_FOR_KEY,
+ "Unexpected 'PS' value for 'Subtype2' Key"));
+ return;
}
}