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/12/21 06:30:19 UTC
svn commit: r1647084 -
/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/FontValidationProcess.java
Author: tilman
Date: Sun Dec 21 05:30:19 2014
New Revision: 1647084
URL: http://svn.apache.org/r1647084
Log:
PDFBOX-2576: simplify flow
Modified:
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/FontValidationProcess.java
Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/FontValidationProcess.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/FontValidationProcess.java?rev=1647084&r1=1647083&r2=1647084&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/FontValidationProcess.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/process/reflect/FontValidationProcess.java Sun Dec 21 05:30:19 2014
@@ -62,16 +62,21 @@ public class FontValidationProcess exten
}
if (!vPath.isExpectedType(PDFont.class))
{
- context.addValidationError(new ValidationError(PreflightConstants.ERROR_FONTS_INVALID_DATA, "Font validation process needs at least one PDFont object"));
+ context.addValidationError(new ValidationError(PreflightConstants.ERROR_FONTS_INVALID_DATA,
+ "Font validation process needs at least one PDFont object"));
}
else
{
PDFont font = (PDFont) vPath.peek();
FontContainer fontContainer = context.getFontContainer(font.getCOSObject());
if (fontContainer == null)
- { // if fontContainer isn't null the font is already checked
+ {
+ // if fontContainer isn't null the font is already checked
FontValidator<? extends FontContainer> validator = getFontValidator(context, font);
- if (validator != null) validator.validate();
+ if (validator != null)
+ {
+ validator.validate();
+ }
}
}
}
@@ -88,32 +93,29 @@ public class FontValidationProcess exten
String subtype = font.getSubType();
if (FONT_DICTIONARY_VALUE_TRUETYPE.equals(subtype))
{
- return new TrueTypeFontValidator(context, (PDTrueTypeFont)font);
+ return new TrueTypeFontValidator(context, (PDTrueTypeFont) font);
}
- else if (FONT_DICTIONARY_VALUE_MMTYPE.equals(subtype) || FONT_DICTIONARY_VALUE_TYPE1.equals(subtype))
+ if (FONT_DICTIONARY_VALUE_MMTYPE.equals(subtype) || FONT_DICTIONARY_VALUE_TYPE1.equals(subtype))
{
- return new Type1FontValidator(context, (PDSimpleFont)font);
+ return new Type1FontValidator(context, (PDSimpleFont) font);
}
- else if (FONT_DICTIONARY_VALUE_TYPE3.equals(subtype))
+ if (FONT_DICTIONARY_VALUE_TYPE3.equals(subtype))
{
- return new Type3FontValidator(context, (PDType3Font)font);
+ return new Type3FontValidator(context, (PDType3Font) font);
}
- else if (FONT_DICTIONARY_VALUE_COMPOSITE.equals(subtype))
+ if (FONT_DICTIONARY_VALUE_COMPOSITE.equals(subtype))
{
return new Type0FontValidator(context, font);
}
- else if (FONT_DICTIONARY_VALUE_TYPE2.equals(subtype) || FONT_DICTIONARY_VALUE_TYPE1C.equals(subtype)
+ if (FONT_DICTIONARY_VALUE_TYPE2.equals(subtype) || FONT_DICTIONARY_VALUE_TYPE1C.equals(subtype)
|| FONT_DICTIONARY_VALUE_TYPE0C.equals(subtype) || FONT_DICTIONARY_VALUE_TYPE0.equals(subtype))
{
// ---- Font managed by a Composite font.
// this dictionary will be checked by a CompositeFontValidator
return null;
}
- else
- {
- context.addValidationError(new ValidationError(PreflightConstants.ERROR_FONTS_UNKNOWN_FONT_TYPE, "Unknown font type : " + subtype));
- return null;
- }
+ context.addValidationError(new ValidationError(PreflightConstants.ERROR_FONTS_UNKNOWN_FONT_TYPE, "Unknown font type: " + subtype));
+ return null;
}
}