Author: lehmi
Date: Sat Jul 11 15:15:15 2020
New Revision: 1879791
URL: http://svn.apache.org/viewvc?rev=1879791&view=rev
Log:
PDFBOX-4892: use constants. simplify
Modified:
pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/ExtGStateValidationProcess.java
(contents, props changed)
Modified:
pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/ExtGStateValidationProcess.java
URL:
http://svn.apache.org/viewvc/pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/ExtGStateValidationProcess.java?rev=1879791&r1=1879790&r2=1879791&view=diff
==============================================================================
---
pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/ExtGStateValidationProcess.java
(original)
+++
pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/ExtGStateValidationProcess.java
Sat Jul 11 15:15:15 2020
@@ -31,12 +31,6 @@ import static org.apache.pdfbox.prefligh
import static
org.apache.pdfbox.preflight.PreflightConstants.ERROR_TRANSPARENCY_EXT_GS_BLEND_MODE;
import static
org.apache.pdfbox.preflight.PreflightConstants.ERROR_TRANSPARENCY_EXT_GS_CA;
import static
org.apache.pdfbox.preflight.PreflightConstants.ERROR_TRANSPARENCY_EXT_GS_SOFT_MASK;
-import static
org.apache.pdfbox.preflight.PreflightConstants.TRANSPARENCY_DICTIONARY_KEY_BLEND_MODE;
-import static
org.apache.pdfbox.preflight.PreflightConstants.TRANSPARENCY_DICTIONARY_KEY_LOWER_CA;
-import static
org.apache.pdfbox.preflight.PreflightConstants.TRANSPARENCY_DICTIONARY_KEY_UPPER_CA;
-import static
org.apache.pdfbox.preflight.PreflightConstants.TRANSPARENCY_DICTIONARY_VALUE_BM_COMPATIBLE;
-import static
org.apache.pdfbox.preflight.PreflightConstants.TRANSPARENCY_DICTIONARY_VALUE_BM_NORMAL;
-import static
org.apache.pdfbox.preflight.PreflightConstants.TRANSPARENCY_DICTIONARY_VALUE_SOFT_MASK_NONE;
import static
org.apache.pdfbox.preflight.PreflightConstants.ERROR_SYNTAX_COMMON;
import static
org.apache.pdfbox.preflight.PreflightConstants.ERROR_SYNTAX_NUMERIC_RANGE;
import static
org.apache.pdfbox.preflight.PreflightConstants.MAX_NEGATIVE_FLOAT;
@@ -109,9 +103,8 @@ public class ExtGStateValidationProcess
if (extGStates != null)
{
- for (Object object : extGStates.keySet())
+ for (COSName key : extGStates.keySet())
{
- COSName key = (COSName) object;
COSBase gsBase = extGStates.getItem(key);
COSDictionary gsDict = COSUtils.getAsDictionary(gsBase,
cosDocument);
if (gsDict == null)
@@ -227,9 +220,7 @@ public class ExtGStateValidationProcess
*/
private void checkSoftMask(PreflightContext context, COSDictionary egs)
{
- COSBase smVal = egs.getItem(COSName.SMASK);
- if (smVal != null &&
- !(smVal instanceof COSName &&
TRANSPARENCY_DICTIONARY_VALUE_SOFT_MASK_NONE.equals(((COSName)
smVal).getName())))
+ if (egs.containsKey(COSName.SMASK) &&
!COSName.NONE.equals(egs.getCOSName(COSName.SMASK)))
{
// ---- Soft Mask is valid only if it is a COSName equals to None
context.addValidationError(new
ValidationError(ERROR_TRANSPARENCY_EXT_GS_SOFT_MASK,
@@ -245,16 +236,12 @@ public class ExtGStateValidationProcess
*/
private void checkBlendMode(PreflightContext context, COSDictionary egs)
{
- COSBase bmVal = egs.getItem(TRANSPARENCY_DICTIONARY_KEY_BLEND_MODE);
- if (bmVal != null)
+ COSName bmVal = egs.getCOSName(COSName.BM);
+ // ---- Blend Mode is valid only if it is equals to Normal or
Compatible
+ if (bmVal != null && !(COSName.NORMAL.equals(bmVal) ||
COSName.COMPATIBLE.equals(bmVal)))
{
- // ---- Blend Mode is valid only if it is equals to Normal or
Compatible
- if (!(bmVal instanceof COSName &&
(TRANSPARENCY_DICTIONARY_VALUE_BM_NORMAL.equals(((COSName) bmVal)
- .getName()) ||
TRANSPARENCY_DICTIONARY_VALUE_BM_COMPATIBLE.equals(((COSName)
bmVal).getName()))))
- {
- context.addValidationError(new
ValidationError(ERROR_TRANSPARENCY_EXT_GS_BLEND_MODE,
- "BlendMode value isn't valid (only Normal and
Compatible are authorized)"));
- }
+ context.addValidationError(new
ValidationError(ERROR_TRANSPARENCY_EXT_GS_BLEND_MODE,
+ "BlendMode value isn't valid (only Normal and Compatible
are authorized)"));
}
}
@@ -267,7 +254,7 @@ public class ExtGStateValidationProcess
*/
private void checkUpperCA(PreflightContext context, COSDictionary egs)
{
- COSBase uCA = egs.getItem(TRANSPARENCY_DICTIONARY_KEY_UPPER_CA);
+ COSBase uCA = egs.getDictionaryObject(COSName.CA);
if (uCA != null)
{
// ---- If CA is present only the value 1.0 is authorized
@@ -291,7 +278,7 @@ public class ExtGStateValidationProcess
*/
private void checkLowerCA(PreflightContext context, COSDictionary egs)
{
- COSBase lCA = egs.getItem(TRANSPARENCY_DICTIONARY_KEY_LOWER_CA);
+ COSBase lCA = egs.getDictionaryObject(COSName.CA_NS);
if (lCA != null)
{
// ---- If ca is present only the value 1.0 is authorized
@@ -314,7 +301,7 @@ public class ExtGStateValidationProcess
*/
protected void checkTRKey(PreflightContext context, COSDictionary egs)
{
- if (egs.getItem(COSName.TR) != null)
+ if (egs.containsKey(COSName.TR))
{
context.addValidationError(new
ValidationError(ERROR_GRAPHIC_UNEXPECTED_KEY,
"No TR key expected in Extended graphics state"));
@@ -329,13 +316,14 @@ public class ExtGStateValidationProcess
*/
protected void checkTR2Key(PreflightContext context, COSDictionary egs)
{
- if (egs.getItem("TR2") != null)
+ if (egs.containsKey(COSName.TR2))
{
- String s = egs.getNameAsString("TR2");
+ String s = egs.getNameAsString(COSName.TR2);
if (!"Default".equals(s))
{
- context.addValidationError(new
ValidationError(ERROR_GRAPHIC_UNEXPECTED_VALUE_FOR_KEY,
- "TR2 key only expect 'Default' value, not '" + s +
"'"));
+ context.addValidationError(
+ new
ValidationError(ERROR_GRAPHIC_UNEXPECTED_VALUE_FOR_KEY,
+ "TR2 key only expect 'Default' value, not '" +
s + "'"));
}
}
}
Propchange:
pdfbox/branches/2.0/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/ExtGStateValidationProcess.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat Jul 11 15:15:15 2020
@@ -0,0 +1,4 @@
+/pdfbox/branches/issue4569/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/ExtGStateValidationProcess.java:1861285,1861586,1872016,1872020,1872024,1872074
+/pdfbox/branches/no-awt/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/ExtGStateValidationProcess.java:1618517-1621410
+/pdfbox/no-awt/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/ExtGStateValidationProcess.java:1618514-1618516
+/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/ExtGStateValidationProcess.java:1736223,1736227,1736615,1737043,1737130,1737599-1737600,1738755,1740160,1742437,1742442,1743248,1745595,1745606,1745772,1745774,1745776,1745779,1746032,1746151,1749162,1749165,1749432,1766088,1766213,1767585,1768061,1770985,1770988,1772528,1778172,1782679,1786586,1786603,1787546,1789414,1790745,1794073,1794090,1794620,1794753,1794859,1794891,1800566,1812426,1814226,1826836,1857800,1857803,1857914,1861927,1861933,1872981,1877805,1877808,1877811,1878049,1879281,1879769,1879787
