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 17:23:54 UTC
svn commit: r1203720 - in
/santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dsig/spec:
ExcC14NParameterSpec.java XPathFilter2ParameterSpec.java
XPathFilterParameterSpec.java XPathType.java
Author: mullan
Date: Fri Nov 18 16:23:54 2011
New Revision: 1203720
URL: http://svn.apache.org/viewvc?rev=1203720&view=rev
Log:
Suppress unchecked warnings due to generics.
Modified:
santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dsig/spec/ExcC14NParameterSpec.java
santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dsig/spec/XPathFilter2ParameterSpec.java
santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dsig/spec/XPathFilterParameterSpec.java
santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dsig/spec/XPathType.java
Modified: santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dsig/spec/ExcC14NParameterSpec.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dsig/spec/ExcC14NParameterSpec.java?rev=1203720&r1=1203719&r2=1203720&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dsig/spec/ExcC14NParameterSpec.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dsig/spec/ExcC14NParameterSpec.java Fri Nov 18 16:23:54 2011
@@ -86,13 +86,17 @@ public final class ExcC14NParameterSpec
if (prefixList == null) {
throw new NullPointerException("prefixList cannot be null");
}
- this.preList = new ArrayList(prefixList);
+ this.preList = unmodifiableCopyOfList(prefixList);
for (int i = 0, size = preList.size(); i < size; i++) {
if (!(preList.get(i) instanceof String)) {
throw new ClassCastException("not a String");
}
}
- preList = Collections.unmodifiableList(preList);
+ }
+
+ @SuppressWarnings("unchecked")
+ private static List unmodifiableCopyOfList(List list) {
+ return Collections.unmodifiableList(new ArrayList(list));
}
/**
Modified: santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dsig/spec/XPathFilter2ParameterSpec.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dsig/spec/XPathFilter2ParameterSpec.java?rev=1203720&r1=1203719&r2=1203720&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dsig/spec/XPathFilter2ParameterSpec.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dsig/spec/XPathFilter2ParameterSpec.java Fri Nov 18 16:23:54 2011
@@ -59,18 +59,22 @@ public final class XPathFilter2Parameter
if (xPathList == null) {
throw new NullPointerException("xPathList cannot be null");
}
- List xPathListCopy = new ArrayList(xPathList);
- if (xPathListCopy.isEmpty()) {
+ this.xPathList = unmodifiableCopyOfList(xPathList);
+ if (this.xPathList.isEmpty()) {
throw new IllegalArgumentException("xPathList cannot be empty");
}
- int size = xPathListCopy.size();
+ int size = this.xPathList.size();
for (int i = 0; i < size; i++) {
- if (!(xPathListCopy.get(i) instanceof XPathType)) {
+ if (!(this.xPathList.get(i) instanceof XPathType)) {
throw new ClassCastException
("xPathList["+i+"] is not a valid type");
}
}
- this.xPathList = Collections.unmodifiableList(xPathListCopy);
+ }
+
+ @SuppressWarnings("unchecked")
+ private static List unmodifiableCopyOfList(List list) {
+ return Collections.unmodifiableList(new ArrayList(list));
}
/**
Modified: santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dsig/spec/XPathFilterParameterSpec.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dsig/spec/XPathFilterParameterSpec.java?rev=1203720&r1=1203719&r2=1203720&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dsig/spec/XPathFilterParameterSpec.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dsig/spec/XPathFilterParameterSpec.java Fri Nov 18 16:23:54 2011
@@ -83,7 +83,7 @@ public final class XPathFilterParameterS
throw new NullPointerException();
}
this.xPath = xPath;
- nsMap = new HashMap(namespaceMap);
+ nsMap = unmodifiableCopyOfMap(namespaceMap);
Iterator entries = nsMap.entrySet().iterator();
while (entries.hasNext()) {
Map.Entry me = (Map.Entry) entries.next();
@@ -92,7 +92,11 @@ public final class XPathFilterParameterS
throw new ClassCastException("not a String");
}
}
- nsMap = Collections.unmodifiableMap(nsMap);
+ }
+
+ @SuppressWarnings("unchecked")
+ private static Map unmodifiableCopyOfMap(Map map) {
+ return Collections.unmodifiableMap(new HashMap(map));
}
/**
Modified: santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dsig/spec/XPathType.java
URL: http://svn.apache.org/viewvc/santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dsig/spec/XPathType.java?rev=1203720&r1=1203719&r2=1203720&view=diff
==============================================================================
--- santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dsig/spec/XPathType.java (original)
+++ santuario/xml-security-java/trunk/src/main/java/javax/xml/crypto/dsig/spec/XPathType.java Fri Nov 18 16:23:54 2011
@@ -25,8 +25,8 @@
package javax.xml.crypto.dsig.spec;
import java.util.Collections;
-import java.util.Iterator;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.Map;
/**
@@ -148,7 +148,7 @@ public class XPathType {
if (namespaceMap == null) {
throw new NullPointerException("namespaceMap cannot be null");
}
- nsMap = new HashMap(namespaceMap);
+ nsMap = unmodifiableCopyOfMap(namespaceMap);
Iterator entries = nsMap.entrySet().iterator();
while (entries.hasNext()) {
Map.Entry me = (Map.Entry) entries.next();
@@ -157,7 +157,11 @@ public class XPathType {
throw new ClassCastException("not a String");
}
}
- nsMap = Collections.unmodifiableMap(nsMap);
+ }
+
+ @SuppressWarnings("unchecked")
+ private static Map unmodifiableCopyOfMap(Map map) {
+ return Collections.unmodifiableMap(new HashMap(map));
}
/**