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 index ef7a09c7e..d662ab5ce 100644 --- 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 @@ -28,7 +28,9 @@ import org.verapdf.gf.model.tools.FileSpecificationKeysHelper; import org.verapdf.model.baselayer.Object; import org.verapdf.model.coslayer.*; +import org.verapdf.pd.PDCatalog; import org.verapdf.pd.PDNameTreeNode; +import org.verapdf.pd.PDNamesDictionary; import org.verapdf.pdfa.flavours.PDFAFlavour; import org.verapdf.pdfa.flavours.PDFFlavours; import org.verapdf.tools.StaticResources; @@ -394,12 +396,13 @@ public List getLinkedObjects(String link) { */ private List getEmbeddedFiles() { if (this.catalog != null) { - COSObject buffer = this.catalog.getKey(ASAtom.NAMES); - if (!buffer.empty()) { - COSObject base = buffer.getKey(ASAtom.EMBEDDED_FILES); - if (base != null && base.getType() == COSObjType.COS_DICT) { + PDCatalog catalog = StaticResources.getDocument().getCatalog(); + PDNamesDictionary namesDictionary = catalog.getNamesDictionary(); + if (namesDictionary != null) { + PDNameTreeNode embeddedFiles = namesDictionary.getEmbeddedFiles(); + if (embeddedFiles != null) { List files = new ArrayList<>(); - this.getNamesEmbeddedFiles(files, PDNameTreeNode.create(base)); + this.getNamesEmbeddedFiles(files, embeddedFiles); return Collections.unmodifiableList(files); } }