From 02a4a4a9b4738271cc22abf494559f39a35278e2 Mon Sep 17 00:00:00 2001 From: Andreas Fitzek Date: Tue, 2 Sep 2014 13:47:39 +0200 Subject: More Java 1.6 fixes --- pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/KeyValueType.java | 4 ++-- .../src/main/java/at/gv/egiz/sl/schema/SignatureMethodType.java | 2 +- pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/TransformType.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/KeyValueType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/KeyValueType.java index 4c5ef896..8d23b6c4 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/KeyValueType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/KeyValueType.java @@ -72,8 +72,8 @@ import org.w3c.dom.Element; public class KeyValueType { @XmlElementRefs({ - @XmlElementRef(name = "DSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "RSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) + @XmlElementRef(name = "DSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class), + @XmlElementRef(name = "RSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class) }) @XmlMixed @XmlAnyElement(lax = true) diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/SignatureMethodType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/SignatureMethodType.java index 53837d6f..abf3db54 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/SignatureMethodType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/SignatureMethodType.java @@ -72,7 +72,7 @@ import javax.xml.bind.annotation.XmlType; }) public class SignatureMethodType { - @XmlElementRef(name = "HMACOutputLength", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) + @XmlElementRef(name = "HMACOutputLength", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class) @XmlMixed @XmlAnyElement(lax = true) protected List content; diff --git a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/TransformType.java b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/TransformType.java index 900dd8cc..dda24b88 100644 --- a/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/TransformType.java +++ b/pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/TransformType.java @@ -72,7 +72,7 @@ import org.w3c.dom.Element; }) public class TransformType { - @XmlElementRef(name = "XPath", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) + @XmlElementRef(name = "XPath", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class) @XmlMixed @XmlAnyElement(lax = true) protected List content; -- cgit v1.2.3