SANTUARIO-521 - Remove unused method
git-svn-id: https://svn.apache.org/repos/asf/santuario/xml-security-java/trunk@1873093 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/xml/security/c14n/CanonicalizerSpi.java b/src/main/java/org/apache/xml/security/c14n/CanonicalizerSpi.java
index 9e785a7..97559d7 100644
--- a/src/main/java/org/apache/xml/security/c14n/CanonicalizerSpi.java
+++ b/src/main/java/org/apache/xml/security/c14n/CanonicalizerSpi.java
@@ -62,12 +62,6 @@
public abstract String engineGetURI();
/**
- * Returns true if comments are included
- * @return true if comments are included
- */
- public abstract boolean engineGetIncludeComments();
-
- /**
* C14n a nodeset
*
* @param xpathNodeSet
diff --git a/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11_OmitComments.java b/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11_OmitComments.java
index 7ebb093..14fcf98 100644
--- a/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11_OmitComments.java
+++ b/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11_OmitComments.java
@@ -32,7 +32,4 @@
return Canonicalizer.ALGO_ID_C14N11_OMIT_COMMENTS;
}
- public final boolean engineGetIncludeComments() {
- return false;
- }
}
diff --git a/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11_WithComments.java b/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11_WithComments.java
index b7e6f8d..7420fc5 100644
--- a/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11_WithComments.java
+++ b/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer11_WithComments.java
@@ -32,7 +32,4 @@
return Canonicalizer.ALGO_ID_C14N11_WITH_COMMENTS;
}
- public final boolean engineGetIncludeComments() {
- return true;
- }
}
diff --git a/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315ExclOmitComments.java b/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315ExclOmitComments.java
index fd2bbb9..c95b835 100644
--- a/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315ExclOmitComments.java
+++ b/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315ExclOmitComments.java
@@ -34,8 +34,4 @@
return Canonicalizer.ALGO_ID_C14N_EXCL_OMIT_COMMENTS;
}
- /** {@inheritDoc} */
- public final boolean engineGetIncludeComments() {
- return false;
- }
}
diff --git a/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315ExclWithComments.java b/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315ExclWithComments.java
index 968d93c..ccb25f8 100644
--- a/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315ExclWithComments.java
+++ b/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315ExclWithComments.java
@@ -38,8 +38,4 @@
return Canonicalizer.ALGO_ID_C14N_EXCL_WITH_COMMENTS;
}
- /** {@inheritDoc} */
- public final boolean engineGetIncludeComments() {
- return true;
- }
}
diff --git a/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315OmitComments.java b/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315OmitComments.java
index e7cd5a3..1398c43 100644
--- a/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315OmitComments.java
+++ b/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315OmitComments.java
@@ -37,8 +37,4 @@
return Canonicalizer.ALGO_ID_C14N_OMIT_COMMENTS;
}
- /** {@inheritDoc} */
- public final boolean engineGetIncludeComments() {
- return false;
- }
}
diff --git a/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315WithComments.java b/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315WithComments.java
index 8502289..1a1e89e 100644
--- a/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315WithComments.java
+++ b/src/main/java/org/apache/xml/security/c14n/implementations/Canonicalizer20010315WithComments.java
@@ -36,8 +36,4 @@
return Canonicalizer.ALGO_ID_C14N_WITH_COMMENTS;
}
- /** {@inheritDoc} */
- public final boolean engineGetIncludeComments() {
- return true;
- }
}
diff --git a/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java b/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java
index 2f44345..9bd6b63 100644
--- a/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java
+++ b/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerBase.java
@@ -80,9 +80,9 @@
private static final byte[] AMP = {'&','a','m','p',';'};
private static final byte[] EQUALS_STR = {'=','\"'};
+ private boolean includeComments;
private List<NodeFilter> nodeFilter;
- private boolean includeComments;
private Set<Node> xpathNodeSet;
/**
@@ -95,7 +95,7 @@
*
* @param includeComments
*/
- public CanonicalizerBase(boolean includeComments) {
+ protected CanonicalizerBase(boolean includeComments) {
this.includeComments = includeComments;
}
diff --git a/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerPhysical.java b/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerPhysical.java
index 5a1eb06..a2432f2 100644
--- a/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerPhysical.java
+++ b/src/main/java/org/apache/xml/security/c14n/implementations/CanonicalizerPhysical.java
@@ -166,11 +166,6 @@
return Canonicalizer.ALGO_ID_C14N_PHYSICAL;
}
- /** {@inheritDoc} */
- public final boolean engineGetIncludeComments() {
- return true;
- }
-
@Override
protected void outputPItoWriter(ProcessingInstruction currentPI,
OutputStream writer, int position) throws IOException {
diff --git a/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/MockCanonicalizationMethod.java b/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/MockCanonicalizationMethod.java
index 074e4e2..290c2b8 100644
--- a/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/MockCanonicalizationMethod.java
+++ b/src/test/java/org/apache/xml/security/test/dom/c14n/implementations/MockCanonicalizationMethod.java
@@ -62,10 +62,6 @@
_impl.engineCanonicalizeXPathNodeSet(xpathNodeSet, inclusiveNamespaces, writer);
}
- public boolean engineGetIncludeComments() {
- return _impl.engineGetIncludeComments();
- }
-
public String engineGetURI() {
return MOCK_CANONICALIZATION_METHOD;
}
