svn commit: r1652495 - /commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/util/ValidatorUtils.java

[sebb]

Author: sebb
Date: Fri Jan 16 19:18:09 2015
New Revision: 1652495

URL: http://svn.apache.org/r1652495
Log:
Generics

Modified:
    
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/util/ValidatorUtils.java

Modified: 
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/util/ValidatorUtils.java
URL: 
http://svn.apache.org/viewvc/commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/util/ValidatorUtils.java?rev=1652495&r1=1652494&r2=1652495&view=diff
==============================================================================
--- 
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/util/ValidatorUtils.java
 (original)
+++ 
commons/proper/validator/trunk/src/main/java/org/apache/commons/validator/util/ValidatorUtils.java
 Fri Jan 16 19:18:09 2015
@@ -143,6 +143,7 @@ public class ValidatorUtils {
     public static FastHashMap copyFastHashMap(FastHashMap map) {
         FastHashMap results = new FastHashMap();
 
+        @SuppressWarnings("unchecked") // FastHashMap is not generic
         Iterator<Entry<String, ?>> i = map.entrySet().iterator();
         while (i.hasNext()) {
             Entry<String, ?> entry = i.next();
@@ -173,12 +174,12 @@ public class ValidatorUtils {
      *
      * @return A copy of the <code>Map</code> that was passed in.
      */
-    public static Map copyMap(Map map) {
-        Map<String, ? super Object> results = new HashMap<String, Object>();
+    public static Map<String, Object> copyMap(Map<String, Object> map) {
+        Map<String, Object> results = new HashMap<String, Object>();
 
-        Iterator<Entry<String, ?>> i = map.entrySet().iterator();
+        Iterator<Entry<String, Object>> i = map.entrySet().iterator();
         while (i.hasNext()) {
-            Entry<String, ?> entry = i.next();
+            Entry<String, Object> entry = i.next();
             String key = entry.getKey();
             Object value = entry.getValue();