Some trivial fixes
git-svn-id: https://svn.apache.org/repos/asf/santuario/xml-security-java/trunk@1871342 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMDigestMethod.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMDigestMethod.java
index 0551d66..31d734f 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMDigestMethod.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMDigestMethod.java
@@ -222,7 +222,7 @@
* parameters. Subclasses should override it if they have parameters.
*
* @param parent the parent element to append the parameters to
- * @param the namespace prefix to use
+ * @param prefix the namespace prefix to use
* @throws MarshalException if the parameters cannot be marshalled
*/
void marshalParams(Element parent, String prefix)
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSubTreeData.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSubTreeData.java
index 73db51f..f617d9b 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSubTreeData.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMSubTreeData.java
@@ -121,7 +121,7 @@
*
* @param node the node to traverse
* @param nodeSet the set of nodes traversed so far
- * @param the previous sibling node
+ * @param prevSibling the previous sibling node
*/
@SuppressWarnings("fallthrough")
private void nodeSetMinusCommentNodes(Node node, List<Node> nodeSet,
diff --git a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMTransform.java b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMTransform.java
index 0badc13..d757598 100644
--- a/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMTransform.java
+++ b/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMTransform.java
@@ -200,7 +200,7 @@
* the specified <code>DOMSignContext</code> before transforming the data.
*
* @param data the data to be transformed
- * @param sc the <code>XMLCryptoContext</code> containing
+ * @param xc the <code>XMLCryptoContext</code> containing
* additional context (may be <code>null</code> if not applicable)
* @param context the marshalling context
* @return the transformed data
diff --git a/src/main/java/org/apache/xml/security/encryption/XMLCipher.java b/src/main/java/org/apache/xml/security/encryption/XMLCipher.java
index 5881617..3bdeb73 100644
--- a/src/main/java/org/apache/xml/security/encryption/XMLCipher.java
+++ b/src/main/java/org/apache/xml/security/encryption/XMLCipher.java
@@ -1099,7 +1099,7 @@
byte[] serializedOctets = null;
if (serializedData == null) {
- if (type.equals(EncryptionConstants.TYPE_CONTENT)) {
+ if (EncryptionConstants.TYPE_CONTENT.equals(type)) {
NodeList children = element.getChildNodes();
if (null != children) {
serializedOctets = serializer.serializeToByteArray(children);
diff --git a/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java b/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java
index 611e494..fa1f90c 100644
--- a/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java
+++ b/src/main/java/org/apache/xml/security/keys/keyresolver/implementations/RetrievalMethodResolver.java
@@ -199,12 +199,12 @@
private static X509Certificate resolveCertificate(
Element e, String baseURI, StorageResolver storage
) throws KeyResolverException {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Now we have a {" + e.getNamespaceURI() + "}"
- + e.getLocalName() + " Element");
- }
// An element has been provided
if (e != null) {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Now we have a {" + e.getNamespaceURI() + "}"
+ + e.getLocalName() + " Element");
+ }
return KeyResolver.getX509Certificate(e, baseURI, storage);
}
return null;
@@ -221,12 +221,12 @@
private static PublicKey resolveKey(
Element e, String baseURI, StorageResolver storage
) throws KeyResolverException {
- if (LOG.isDebugEnabled()) {
- LOG.debug("Now we have a {" + e.getNamespaceURI() + "}"
- + e.getLocalName() + " Element");
- }
// An element has been provided
if (e != null) {
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Now we have a {" + e.getNamespaceURI() + "}"
+ + e.getLocalName() + " Element");
+ }
return KeyResolver.getPublicKey(e, baseURI, storage);
}
return null;
diff --git a/src/main/java/org/apache/xml/security/signature/Manifest.java b/src/main/java/org/apache/xml/security/signature/Manifest.java
index aaac2d5..2e60de9 100644
--- a/src/main/java/org/apache/xml/security/signature/Manifest.java
+++ b/src/main/java/org/apache/xml/security/signature/Manifest.java
@@ -449,7 +449,7 @@
}
}
- return ((ArrayList<VerifiedReference>)verificationResults).get(index).isValid();
+ return verificationResults.get(index).isValid();
}
/**
diff --git a/src/main/java/org/apache/xml/security/signature/reference/ReferenceSubTreeData.java b/src/main/java/org/apache/xml/security/signature/reference/ReferenceSubTreeData.java
index 05c8445..55be5a6 100644
--- a/src/main/java/org/apache/xml/security/signature/reference/ReferenceSubTreeData.java
+++ b/src/main/java/org/apache/xml/security/signature/reference/ReferenceSubTreeData.java
@@ -120,7 +120,7 @@
*
* @param node the node to traverse
* @param nodeSet the set of nodes traversed so far
- * @param the previous sibling node
+ * @param prevSibling the previous sibling node
*/
@SuppressWarnings("fallthrough")
private void nodeSetMinusCommentNodes(Node node, List<Node> nodeSet,
diff --git a/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolver.java b/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolver.java
index 31204b1..3bbdbbf 100644
--- a/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolver.java
+++ b/src/main/java/org/apache/xml/security/utils/resolver/ResourceResolver.java
@@ -329,8 +329,7 @@
/**
* Method canResolve
*
- * @param uri
- * @param baseURI
+ * @param context
* @return true if it can resolve the uri
*/
private boolean canResolve(ResourceResolverContext context) {
