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/06/11 16:48:51 UTC
svn commit: r1684908 - in
/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font: ./
descriptor/ util/
Author: tilman
Date: Thu Jun 11 14:48:51 2015
New Revision: 1684908
URL: http://svn.apache.org/r1684908
Log:
PDFBOX-2576: move static methods to more appropriate package to reduce package cycles
Modified:
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/FontValidator.java
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/descriptor/CIDType0DescriptorHelper.java
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/descriptor/CIDType2DescriptorHelper.java
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/descriptor/FontDescriptorHelper.java
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/descriptor/Type1DescriptorHelper.java
pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/util/FontMetaDataValidation.java
Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/FontValidator.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/FontValidator.java?rev=1684908&r1=1684907&r2=1684908&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/FontValidator.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/FontValidator.java Thu Jun 11 14:48:51 2015
@@ -33,8 +33,6 @@ public abstract class FontValidator<T ex
protected PreflightContext context;
protected FontDescriptorHelper<T> descriptorHelper;
- private static final String SUB_SET_PATTERN = "^[A-Z]{6}\\+.*";
-
public FontValidator(PreflightContext context, COSDictionary dict, T fContainer)
{
super();
@@ -43,16 +41,6 @@ public abstract class FontValidator<T ex
this.context.addFontContainer(dict, fContainer);
}
- public static boolean isSubSet(String fontName)
- {
- return fontName != null && fontName.matches(SUB_SET_PATTERN);
- }
-
- public static String getSubSetPatternDelimiter()
- {
- return "\\+";
- }
-
public abstract void validate() throws ValidationException;
protected void checkEncoding()
Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/descriptor/CIDType0DescriptorHelper.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/descriptor/CIDType0DescriptorHelper.java?rev=1684908&r1=1684907&r2=1684908&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/descriptor/CIDType0DescriptorHelper.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/descriptor/CIDType0DescriptorHelper.java Thu Jun 11 14:48:51 2015
@@ -38,7 +38,6 @@ import org.apache.pdfbox.pdmodel.font.PD
import org.apache.pdfbox.preflight.PreflightContext;
import org.apache.pdfbox.preflight.ValidationResult;
import org.apache.pdfbox.preflight.ValidationResult.ValidationError;
-import org.apache.pdfbox.preflight.font.FontValidator;
import org.apache.pdfbox.preflight.font.container.CIDType0Container;
import org.apache.pdfbox.preflight.utils.COSUtils;
@@ -89,7 +88,7 @@ public class CIDType0DescriptorHelper ex
*/
protected void checkCIDSet(PDFontDescriptor pfDescriptor)
{
- if (FontValidator.isSubSet(pfDescriptor.getFontName()))
+ if (isSubSet(pfDescriptor.getFontName()))
{
COSDocument cosDocument = context.getDocument().getDocument();
COSBase cidset = pfDescriptor.getCOSObject().getItem(COSName.getPDFName(FONT_DICTIONARY_KEY_CIDSET));
Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/descriptor/CIDType2DescriptorHelper.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/descriptor/CIDType2DescriptorHelper.java?rev=1684908&r1=1684907&r2=1684908&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/descriptor/CIDType2DescriptorHelper.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/descriptor/CIDType2DescriptorHelper.java Thu Jun 11 14:48:51 2015
@@ -36,7 +36,6 @@ import org.apache.pdfbox.pdmodel.font.PD
import org.apache.pdfbox.preflight.PreflightContext;
import org.apache.pdfbox.preflight.ValidationResult;
import org.apache.pdfbox.preflight.ValidationResult.ValidationError;
-import org.apache.pdfbox.preflight.font.FontValidator;
import org.apache.pdfbox.preflight.font.container.CIDType2Container;
import org.apache.pdfbox.preflight.utils.COSUtils;
@@ -56,7 +55,7 @@ public class CIDType2DescriptorHelper ex
*/
protected void checkCIDSet(PDFontDescriptor pfDescriptor)
{
- if (FontValidator.isSubSet(pfDescriptor.getFontName()))
+ if (isSubSet(pfDescriptor.getFontName()))
{
COSDocument cosDocument = context.getDocument().getDocument();
COSBase cidset = pfDescriptor.getCOSObject().getItem(COSName.getPDFName(FONT_DICTIONARY_KEY_CIDSET));
Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/descriptor/FontDescriptorHelper.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/descriptor/FontDescriptorHelper.java?rev=1684908&r1=1684907&r2=1684908&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/descriptor/FontDescriptorHelper.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/descriptor/FontDescriptorHelper.java Thu Jun 11 14:48:51 2015
@@ -297,4 +297,10 @@ public abstract class FontDescriptorHelp
}
return result;
}
+
+ public static boolean isSubSet(String fontName)
+ {
+ return fontName != null && fontName.matches("^[A-Z]{6}\\+.*");
+ }
+
}
Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/descriptor/Type1DescriptorHelper.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/descriptor/Type1DescriptorHelper.java?rev=1684908&r1=1684907&r2=1684908&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/descriptor/Type1DescriptorHelper.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/descriptor/Type1DescriptorHelper.java Thu Jun 11 14:48:51 2015
@@ -26,7 +26,6 @@ import static org.apache.pdfbox.prefligh
import static org.apache.pdfbox.preflight.PreflightConstants.ERROR_FONTS_TYPE1_DAMAGED;
import static org.apache.pdfbox.preflight.PreflightConstants.FONT_DICTIONARY_KEY_LENGTH2;
import static org.apache.pdfbox.preflight.PreflightConstants.FONT_DICTIONARY_KEY_LENGTH3;
-import static org.apache.pdfbox.preflight.font.FontValidator.isSubSet;
import org.apache.pdfbox.cos.COSDictionary;
import org.apache.pdfbox.cos.COSName;
Modified: pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/util/FontMetaDataValidation.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/util/FontMetaDataValidation.java?rev=1684908&r1=1684907&r2=1684908&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/util/FontMetaDataValidation.java (original)
+++ pdfbox/trunk/preflight/src/main/java/org/apache/pdfbox/preflight/font/util/FontMetaDataValidation.java Thu Jun 11 14:48:51 2015
@@ -29,7 +29,7 @@ import org.apache.pdfbox.pdmodel.font.PD
import org.apache.pdfbox.preflight.PreflightConstants;
import org.apache.pdfbox.preflight.ValidationResult.ValidationError;
import org.apache.pdfbox.preflight.exception.ValidationException;
-import org.apache.pdfbox.preflight.font.FontValidator;
+import org.apache.pdfbox.preflight.font.descriptor.FontDescriptorHelper;
import org.apache.xmpbox.XMPMetadata;
import org.apache.xmpbox.schema.DublinCoreSchema;
import org.apache.xmpbox.schema.XMPRightsManagementSchema;
@@ -69,9 +69,9 @@ public class FontMetaDataValidation
{
String fontName = fontDesc.getFontName();
String noSubSetName = fontName;
- if (FontValidator.isSubSet(fontName))
+ if (FontDescriptorHelper.isSubSet(fontName))
{
- noSubSetName = fontName.split(FontValidator.getSubSetPatternDelimiter())[1];
+ noSubSetName = fontName.split("\\+")[1];
}
DublinCoreSchema dc = metadata.getDublinCoreSchema();
@@ -145,6 +145,7 @@ public class FontMetaDataValidation
* The FontDescriptor dictionary
* @param ve
* the list of validation error to update if the validation fails
+ * @return true if the analysis found no problems, false if it did.
*/
public boolean analyseRights(XMPMetadata metadata, PDFontDescriptor fontDesc, List<ValidationError> ve)
{