You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@santuario.apache.org by mu...@apache.org on 2011/11/18 19:46:08 UTC
svn commit: r1203789 - in
/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom:
DOMXPathFilter2Transform.java DOMXPathTransform.java
Author: mullan
Date: Fri Nov 18 18:46:07 2011
New Revision: 1203789
URL: http://svn.apache.org/viewvc?rev=1203789&view=rev
Log:
Generify class implementations.
Modified:
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java
santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathTransform.java
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java?rev=1203789&r1=1203788&r2=1203789&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathFilter2Transform.java Fri Nov 18 18:46:07 2011
@@ -38,10 +38,10 @@ import javax.xml.crypto.dsig.spec.XPathT
import javax.xml.crypto.dsig.spec.XPathFilter2ParameterSpec;
import java.security.InvalidAlgorithmParameterException;
import java.util.ArrayList;
-import java.util.Iterator;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.HashMap;
+import java.util.Set;
import org.w3c.dom.Attr;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
@@ -143,13 +143,12 @@ public final class DOMXPathFilter2Transf
// add namespace attributes, if necessary
@SuppressWarnings("unchecked")
- Iterator<Map.Entry> it =
- xpathType.getNamespaceMap().entrySet().iterator();
- while (it.hasNext()) {
- Map.Entry entry = it.next();
+ Set<Map.Entry<String, String>> entries =
+ xpathType.getNamespaceMap().entrySet();
+ for (Map.Entry<String, String> entry : entries) {
elem.setAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns:" +
- (String)entry.getKey(),
- (String)entry.getValue());
+ entry.getKey(),
+ entry.getValue());
}
transformElem.appendChild(elem);
Modified: santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathTransform.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathTransform.java?rev=1203789&r1=1203788&r2=1203789&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathTransform.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/org/apache/jcp/xml/dsig/internal/dom/DOMXPathTransform.java Fri Nov 18 18:46:07 2011
@@ -29,9 +29,9 @@ import javax.xml.crypto.dsig.*;
import javax.xml.crypto.dsig.spec.TransformParameterSpec;
import javax.xml.crypto.dsig.spec.XPathFilterParameterSpec;
import java.security.InvalidAlgorithmParameterException;
-import java.util.Iterator;
-import java.util.Map;
import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
import org.w3c.dom.Attr;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
@@ -96,12 +96,12 @@ public final class DOMXPathTransform ext
// add namespace attributes, if necessary
@SuppressWarnings("unchecked")
- Iterator<Map.Entry> i = xp.getNamespaceMap().entrySet().iterator();
- while (i.hasNext()) {
- Map.Entry entry = i.next();
+ Set<Map.Entry<String, String>> entries =
+ xp.getNamespaceMap().entrySet();
+ for (Map.Entry<String, String> entry : entries) {
xpathElem.setAttributeNS("http://www.w3.org/2000/xmlns/", "xmlns:" +
- (String)entry.getKey(),
- (String)entry.getValue());
+ entry.getKey(),
+ entry.getValue());
}
transformElem.appendChild(xpathElem);