From: Andreas Beeker Date: Sun, 28 Sep 2014 00:35:00 +0000 (+0000) Subject: forgot to rename get/setter X-Git-Tag: REL_3_11_BETA3~73^2~4 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=f96c8e0f9414acc39af830167e14b6f64ea688e0;p=poi.git forgot to rename get/setter git-svn-id: https://svn.apache.org/repos/asf/poi/branches/xml_signature@1628031 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java index 880efa10ed..d60753e479 100644 --- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java +++ b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureConfig.java @@ -131,7 +131,7 @@ public class SignatureConfig { * with certain namespaces, so this EventListener is used to interfere * with the marshalling process. */ - EventListener signCreationListener = null; + EventListener signatureMarshalListener = null; /** * Map of namespace uris to prefix @@ -160,12 +160,12 @@ public class SignatureConfig { if (onlyValidation) return; - if (signCreationListener == null) { - signCreationListener = new SignatureMarshalListener(); + if (signatureMarshalListener == null) { + signatureMarshalListener = new SignatureMarshalListener(); } - if (signCreationListener instanceof SignatureConfigurable) { - ((SignatureConfigurable)signCreationListener).setSignatureConfig(this); + if (signatureMarshalListener instanceof SignatureConfigurable) { + ((SignatureConfigurable)signatureMarshalListener).setSignatureConfig(this); } if (tspService != null) { @@ -408,11 +408,11 @@ public class SignatureConfig { public void setXadesIssuerNameNoReverseOrder(boolean xadesIssuerNameNoReverseOrder) { this.xadesIssuerNameNoReverseOrder = xadesIssuerNameNoReverseOrder; } - public EventListener getSignCreationListener() { - return signCreationListener; + public EventListener getSignatureMarshalListener() { + return signatureMarshalListener; } - public void setSignCreationListener(EventListener signCreationListener) { - this.signCreationListener = signCreationListener; + public void setSignatureMarshalListener(EventListener signatureMarshalListener) { + this.signatureMarshalListener = signatureMarshalListener; } public Map getNamespacePrefixes() { return namespacePrefixes; diff --git a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java index f846187ee6..a4006af3ac 100644 --- a/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java +++ b/src/ooxml/java/org/apache/poi/poifs/crypt/dsig/SignatureInfo.java @@ -378,7 +378,7 @@ public class SignatureInfo implements SignatureConfigurable { // it's necessary to explicitly set the mdssi namespace, but the sign() method has no // normal way to interfere with, so we need to add the namespace under the hand ... EventTarget target = (EventTarget)document; - EventListener creationListener = signatureConfig.getSignCreationListener(); + EventListener creationListener = signatureConfig.getSignatureMarshalListener(); if (creationListener != null) { if (creationListener instanceof SignatureMarshalListener) { ((SignatureMarshalListener)creationListener).setEventTarget(target);