< prev index next >

src/com/sun/javatest/report/ConfigSection.java

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

@@ -380,20 +380,20 @@
             out.endTag(HTMLWriterEx.H2);
         }
 
         Set<String[]> envTable = new TreeSet<>(new StringArrayComparator());
 
-        for (Iterator i = env.elements().iterator(); i.hasNext(); ) {
-            TestEnvironment.Element envElem = (TestEnvironment.Element) (i.next());
+        for (Iterator<TestEnvironment.Element> i = env.elements().iterator(); i.hasNext(); ) {
+            TestEnvironment.Element envElem = (i.next());
             String[] envTableRow = {envElem.getKey(), envElem.getValue()};
             envTable.add(envTableRow);
         }
 
         out.startTag(HTMLWriterEx.TABLE);
         out.writeAttr(HTMLWriterEx.BORDER, 1);
-        for (Iterator i = envTable.iterator(); i.hasNext(); ) {
-            String[] envEntry = (String[]) (i.next());
+        for (Iterator<String[]> i = envTable.iterator(); i.hasNext(); ) {
+            String[] envEntry = (i.next());
             out.startTag(HTMLWriterEx.TR);
 
             for (int j = 0; j < envEntry.length; j++ ) {
                 out.startTag(HTMLWriterEx.TD);
                 out.write(envEntry[j]);

@@ -415,11 +415,11 @@
         if (excludeList == null || excludeList.size() == 0){
             out.writeI18N("config.excl.none");
         }
         else {
             SortedSet<ExcludeList.Entry> sortedEntries = new TreeSet<>(new ExcludeListEntryComparator());
-            for (Iterator iter = excludeList.getIterator(false); iter.hasNext(); )
+            for (Iterator<?> iter = excludeList.getIterator(false); iter.hasNext(); )
                 sortedEntries.add((ExcludeList.Entry)iter.next());
 
             out.startTag(HTMLWriterEx.TABLE);
             out.writeAttr(HTMLWriterEx.BORDER, 1);
             out.startTag(HTMLWriterEx.TR);

@@ -438,12 +438,12 @@
             out.startTag(HTMLWriterEx.TH);
             out.writeI18N("config.excl.synopsis");
             out.endTag(HTMLWriterEx.TH);
             out.endTag(HTMLWriterEx.TR);
 
-            for (Iterator iter = sortedEntries.iterator(); iter.hasNext(); ) {
-                ExcludeList.Entry e = (ExcludeList.Entry) (iter.next());
+            for (Iterator<ExcludeList.Entry> iter = sortedEntries.iterator(); iter.hasNext(); ) {
+                ExcludeList.Entry e = (iter.next());
                 out.startTag(HTMLWriterEx.TR);
                 writeTD(out, e.getRelativeURL());
                 writeTD(out, e.getTestCases());
 
                 out.startTag(HTMLWriterEx.TD);
< prev index next >