< prev index next >
src/com/sun/javatest/HarnessHttpHandler.java
Print this page
rev 145 : 7902237: Fixing raw use of parameterized class
Reviewed-by: jjg
@@ -219,12 +219,12 @@
out.println(env.getName());
*/
String[] pa = new String[0];
- for (Iterator i = env.elements().iterator(); i.hasNext(); ) {
- TestEnvironment.Element elem = (TestEnvironment.Element) (i.next());
+ for (Iterator<TestEnvironment.Element> i = env.elements().iterator(); i.hasNext(); ) {
+ TestEnvironment.Element elem = i.next();
// this is stunningly inefficient and should be fixed
pa = PropertyArray.put(pa, elem.getKey(), elem.getValue());
}
try {
@@ -308,18 +308,18 @@
// test dump
TestResultTable trt = harness.getResultTable();
TestFilter[] filters = params.getFilters();
String[] tests = params.getTests();
- Iterator it = null;
+ Iterator<TestResult> it = null;
if (tests == null || tests.length == 0)
it = trt.getIterator(filters);
else
it = trt.getIterator(params.getTests(), filters);
while (it.hasNext()) {
- TestResult tr = (TestResult)(it.next());
+ TestResult tr = it.next();
out.println(tr.getTestName());
out.println(tr.getStatus().toString());
} // while
}
else {
@@ -542,12 +542,12 @@
buf.append("<th>");
buf.append(filterTags(valHeader));
buf.append("</tr>");
out.println(buf.toString());
- for (Iterator keys = env.keys().iterator(); keys.hasNext(); ) {
- String key = (String) (keys.next());
+ for (Iterator<String> keys = env.keys().iterator(); keys.hasNext(); ) {
+ String key = keys.next();
out.println("<tr>");
buf.setLength(0);
buf.append("<td>");
buf.append(key.toString());
buf.append("<td>");
< prev index next >