< prev index next >

src/com/sun/javatest/exec/InterviewEditor.java

Print this page
rev 145 : 7902237: Fixing raw use of parameterized class
Reviewed-by: jjg

@@ -756,12 +756,12 @@
 
         Set<String> keys = new TreeSet<>();
         keys.addAll(aQuestions.keySet());
         keys.addAll(bQuestions.keySet());
 
-        for (Iterator iter = keys.iterator(); iter.hasNext(); ) {
-            String key = (String) (iter.next());
+        for (Iterator<String> iter = keys.iterator(); iter.hasNext(); ) {
+            String key = (iter.next());
             Question aq = aQuestions.get(key);
             Question bq = bQuestions.get(key);
             if (aq == null || bq == null) {
                 return false;
             }

@@ -787,23 +787,23 @@
                     return false;
                 }
             }
         }
         // Checking external values
-        Set aKeys = a.getPropertyKeys();
-        Set bKeys = b.getPropertyKeys();
+        Set<String> aKeys = a.getPropertyKeys();
+        Set<String> bKeys = b.getPropertyKeys();
 
         if (aKeys == null || bKeys == null) {
             return aKeys == bKeys;
         }
 
         if (aKeys.size() != bKeys.size()) {
             return false;
         }
 
-        for (Iterator iter = aKeys.iterator(); iter.hasNext(); ) {
-            String key = (String)iter.next();
+        for (Iterator<String> iter = aKeys.iterator(); iter.hasNext(); ) {
+            String key = iter.next();
             if (!bKeys.contains(key)) {
                 return false;
             }
 
             String aProp = a.retrieveProperty(key);
< prev index next >