Merge pull request #625 from veraPDF/embedded_file_specification

Add getpresentInEmbeddedFiles to GFCosFileSpecification
veraPDF · Dec 20, 2023 · efd2438 · efd2438
2 parents ec791e2 + 6a415aa
commit efd2438
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/validation-model/src/main/java/org/verapdf/gf/model/impl/cos/GFCosDocument.java b/validation-model/src/main/java/org/verapdf/gf/model/impl/cos/GFCosDocument.java
@@ -420,7 +420,7 @@ private void getNamesEmbeddedFiles(List<CosFileSpecification> files, PDNameTreeN
 		Map<String, COSObject> names = node.getNames();
 		for (COSObject value : names.values()) {
 			if (value != null && value.getType().isDictionaryBased()) {
-				files.add(new GFCosFileSpecification((COSDictionary) value.getDirectBase()));
+				files.add(new GFCosFileSpecification((COSDictionary) value.getDirectBase(), true));
 			}
 		}
 		for (PDNameTreeNode kid : node.getKids()) {

diff --git a/validation-model/src/main/java/org/verapdf/gf/model/impl/cos/GFCosFileSpecification.java b/validation-model/src/main/java/org/verapdf/gf/model/impl/cos/GFCosFileSpecification.java
@@ -48,18 +48,21 @@ public class GFCosFileSpecification extends GFCosDict implements CosFileSpecific
 	private final String f;
 	private final String uf;
 	private final String afrelationship;
+
+	private final boolean presentInEmbeddedFiles;
 
 	/**
 	 * Default constructor
 	 * 
 	 * @param dictionary
 	 *            greenfield COSDictionary
 	 */
-	public GFCosFileSpecification(COSDictionary dictionary) {
+	public GFCosFileSpecification(COSDictionary dictionary, boolean presentInEmbeddedFiles) {
 		super(dictionary, COS_FILE_SPECIFICATION_TYPE);
 		this.f = this.baseObject.getStringKey(ASAtom.F);
 		this.uf = this.baseObject.getStringKey(ASAtom.UF);
 		this.afrelationship = dictionary.getNameKeyStringValue(ASAtom.AF_RELATIONSHIP);
+		this.presentInEmbeddedFiles = presentInEmbeddedFiles;
 	}
 
 	@Override
@@ -83,6 +86,11 @@ public Boolean getisAssociatedFile() {
 				&& StaticContainers.getFileSpecificationKeys().contains(this.baseObject.getObjectKey());
 	}
 
+	@Override
+	public Boolean getpresentInEmbeddedFiles() {
+		return this.presentInEmbeddedFiles;
+	}
+
 	@Override
 	public Boolean getcontainsEF() {
 		return baseObject != null && this.baseObject.knownKey(ASAtom.EF);

diff --git a/validation-model/src/main/java/org/verapdf/gf/model/visitor/cos/gf/GFCosVisitor.java b/validation-model/src/main/java/org/verapdf/gf/model/visitor/cos/gf/GFCosVisitor.java
@@ -66,7 +66,7 @@ public Object visitFromBoolean(COSBoolean obj) {
     public Object visitFromDictionary(COSDictionary obj) {
         ASAtom type = obj.getNameKey(ASAtom.TYPE);
         boolean isFileSpec = ASAtom.FILESPEC.equals(type);
-        return isFileSpec ? new GFCosFileSpecification(obj) : new GFCosDict(obj);
+        return isFileSpec ? new GFCosFileSpecification(obj, false) : new GFCosDict(obj);
     }
 
     /** {@inheritDoc} Create a GFCosDocument for corresponding COSDocument.