src/com/sun/javatest/tool/VerboseCommand.java

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

@@ -120,14 +120,13 @@
             optionValues.put(item, new Boolean(on));
         }
     }
 
     public void run(CommandContext ctx) throws Fault {
-        for (Iterator iter = optionValues.entrySet().iterator(); iter.hasNext(); ) {
-            Map.Entry e = (Map.Entry) (iter.next());
-            String name = (String) (e.getKey());
-            boolean value = ((Boolean) (e.getValue())).booleanValue();
+        for (Map.Entry<String, Boolean> e : optionValues.entrySet()) {
+            String name = (e.getKey());
+            boolean value = e.getValue().booleanValue();
             if (name.equalsIgnoreCase(MAX))
                 ctx.setVerboseMax(value);
             else if (name.equalsIgnoreCase(QUIET))
                 ctx.setVerboseQuiet(value);
             else if (name.equalsIgnoreCase(DATE))

@@ -140,12 +139,12 @@
     static HelpTree.Node getHelp() {
         ensureAllOptionsInitialized();
 
         HelpTree.Node[] nodes = new HelpTree.Node[allOptions.size()];
         int i = 0;
-        for (Iterator iter = allOptions.values().iterator(); iter.hasNext(); )
-            nodes[i++] = (HelpTree.Node) (iter.next());
+        for (Iterator<HelpTree.Node> iter = allOptions.values().iterator(); iter.hasNext(); )
+            nodes[i++] = iter.next();
 
         return new HelpTree.Node(i18n, "verb", nodes);
     }
 
     static String getName() {