aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Fitzek <andreas.fitzek@iaik.tugraz.at>2014-09-02 13:47:39 +0200
committerAndreas Fitzek <andreas.fitzek@iaik.tugraz.at>2014-09-02 13:47:39 +0200
commit02a4a4a9b4738271cc22abf494559f39a35278e2 (patch)
tree72efd3c1f6573763fe73c0e0cc9b465a45eddd06
parent43b92909c37011663763617f14c5c29793916f35 (diff)
downloadpdf-as-4-02a4a4a9b4738271cc22abf494559f39a35278e2.tar.gz
pdf-as-4-02a4a4a9b4738271cc22abf494559f39a35278e2.tar.bz2
pdf-as-4-02a4a4a9b4738271cc22abf494559f39a35278e2.zip
More Java 1.6 fixes
-rw-r--r--pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/KeyValueType.java4
-rw-r--r--pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/SignatureMethodType.java2
-rw-r--r--pdf-as-lib/src/main/java/at/gv/egiz/sl/schema/TransformType.java2
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<Object> 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<Object> content;