diff --git a/src/main/java/org/mustangproject/ZUGFeRD/XMPSchemaPDFAExtensions.java b/src/main/java/org/mustangproject/ZUGFeRD/XMPSchemaPDFAExtensions.java
index 8dbaccf6..44234258 100644
--- a/src/main/java/org/mustangproject/ZUGFeRD/XMPSchemaPDFAExtensions.java
+++ b/src/main/java/org/mustangproject/ZUGFeRD/XMPSchemaPDFAExtensions.java
@@ -43,7 +43,7 @@ public class XMPSchemaPDFAExtensions extends PDFAExtensionSchema {
public String prefix = null;
- public void setZUGFeRDVersion(int ver) {
+ protected void setZUGFeRDVersion(int ver) {
namespace=ZUGFeRDExporter.getNamespaceForVersion(ver);
prefix=ZUGFeRDExporter.getPrefixForVersion(ver);
}
@@ -76,15 +76,15 @@ public class XMPSchemaPDFAExtensions extends PDFAExtensionSchema {
return li;
}
- public XMPSchemaPDFAExtensions(XMPMetadata metadata) {
+ public XMPSchemaPDFAExtensions(XMPMetadata metadata, int ZFVersion) {
super(metadata);
- setZUGFeRDVersion(ZUGFeRDExporter.DefaultZUGFeRDVersion);
+ setZUGFeRDVersion(ZFVersion);
attachExtensions(metadata, true);
}
- public XMPSchemaPDFAExtensions(XMPMetadata metadata, boolean withZF) {
+ public XMPSchemaPDFAExtensions(XMPMetadata metadata, int ZFVersion, boolean withZF) {
super(metadata);
- setZUGFeRDVersion(ZUGFeRDExporter.DefaultZUGFeRDVersion);
+ setZUGFeRDVersion(ZFVersion);
attachExtensions(metadata, withZF);
}
diff --git a/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java b/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java
index 86667e1f..95dada29 100644
--- a/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java
+++ b/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporter.java
@@ -116,6 +116,7 @@ public class ZUGFeRDExporter implements Closeable {
}
}
+@Deprecated
public void setZUGFeRDVersion(int ver) {
if (ver == 1) {
ZUGFeRD1PullProvider z1p = new ZUGFeRD1PullProvider();
diff --git a/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporterFromA3Factory.java b/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporterFromA3Factory.java
index b69e1ca1..30d71255 100644
--- a/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporterFromA3Factory.java
+++ b/src/main/java/org/mustangproject/ZUGFeRD/ZUGFeRDExporterFromA3Factory.java
@@ -176,8 +176,8 @@ public class ZUGFeRDExporterFromA3Factory implements IExporterFactory {
metadata.addSchema(zf);
}
- XMPSchemaPDFAExtensions pdfaex = new XMPSchemaPDFAExtensions(metadata, attachZugferdHeaders);
-
+ XMPSchemaPDFAExtensions pdfaex = new XMPSchemaPDFAExtensions(metadata, ZFVersion, attachZugferdHeaders);
+ pdfaex.setZUGFeRDVersion(ZFVersion);
metadata.addSchema(pdfaex);
}
diff --git a/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterTest.java b/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterTest.java
index 5a6c8cd7..bf07283d 100644
--- a/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterTest.java
+++ b/src/test/java/org/mustangproject/ZUGFeRD/MustangReaderWriterTest.java
@@ -379,6 +379,7 @@ public class MustangReaderWriterTest extends TestCase implements IZUGFeRDExporta
assertFalse(pdfContent.indexOf("(via mustangproject.org") == -1);
// check for pdf-a schema extension
assertFalse(pdfContent.indexOf("EXTENDED") == -1);
+ assertFalse(pdfContent.indexOf("fx") == -1);
assertFalse(pdfContent.indexOf("urn:cen.eu:en16931:2017:compliant:factur-x.eu:1p0:extended") == -1);
}