src/com/sun/javatest/servlets/ResultBrowser.java

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

*** 115,126 ****
          // test description properties
          out.println("<h2><a name=td>Test Description properties</a></h2>");
          try {
              TestDescription td = tr.getDescription();
              out.println("<table>");
!             for (Iterator iter = td.getParameterKeys(); iter.hasNext(); ) {
!                 String key = (String) (iter.next());
                  String value = td.getParameter(key);
                  if (key.equals("$root") || key.equals("$file") || key.equals("testsuite") || key.equals("file"))
                      out.println("<tr><td align=top>" + key + "<td><a href=\"" + value + "\">" + filter(value, false) + "</a>");
                  else if (key.equals("source")) {
                      out.println("<tr><td align=top>" + key + "<td>");
--- 115,126 ----
          // test description properties
          out.println("<h2><a name=td>Test Description properties</a></h2>");
          try {
              TestDescription td = tr.getDescription();
              out.println("<table>");
!             for (Iterator<String> iter = td.getParameterKeys(); iter.hasNext(); ) {
!                 String key = (iter.next());
                  String value = td.getParameter(key);
                  if (key.equals("$root") || key.equals("$file") || key.equals("testsuite") || key.equals("file"))
                      out.println("<tr><td align=top>" + key + "<td><a href=\"" + value + "\">" + filter(value, false) + "</a>");
                  else if (key.equals("source")) {
                      out.println("<tr><td align=top>" + key + "<td>");
*** 149,160 ****
  
          // test result properties
          out.println("<h2><a name=tr>Test Result properties</a></h2>");
          try {
              out.println("<table>");
!             for (Enumeration e = tr.getPropertyNames(); e.hasMoreElements(); ) {
!                 String key = (String)(e.nextElement());
                  out.println("<tr><td>" + key + "<td>" + filter(tr.getProperty(key), true));
              }
          }
          catch (TestResult.Fault e) {
              out.println("The following exception occurred while trying to determine the test result properties: " + e.getLocalizedMessage());
--- 149,160 ----
  
          // test result properties
          out.println("<h2><a name=tr>Test Result properties</a></h2>");
          try {
              out.println("<table>");
!             for (Enumeration<String> e = tr.getPropertyNames(); e.hasMoreElements(); ) {
!                 String key = (e.nextElement());
                  out.println("<tr><td>" + key + "<td>" + filter(tr.getProperty(key), true));
              }
          }
          catch (TestResult.Fault e) {
              out.println("The following exception occurred while trying to determine the test result properties: " + e.getLocalizedMessage());
*** 165,184 ****
          out.println("<p><hr>");
  
          // test environment
          out.println("<h2><a name=env>Test Environment</a></h2>");
          try {
!             Map env = tr.getEnvironment();
              if (env.size() == 0) {
                  out.println("<tr><td>No environment details found");
              }
              else {
                  out.println("<table>");
!                 for (Iterator i = env.entrySet().iterator(); i.hasNext(); ) {
!                     Map.Entry e = (Map.Entry) (i.next());
!                     String key = (String) (e.getKey());
!                     String value = (String) (e.getValue());
                      out.println("<tr><td>" + key + "<td>" + filter(value, true));
                  }
                  out.println("</table>");
              }
          }
--- 165,184 ----
          out.println("<p><hr>");
  
          // test environment
          out.println("<h2><a name=env>Test Environment</a></h2>");
          try {
!             Map<String, String> env = tr.getEnvironment();
              if (env.size() == 0) {
                  out.println("<tr><td>No environment details found");
              }
              else {
                  out.println("<table>");
!                 for (Iterator<Map.Entry<String, String>> i = env.entrySet().iterator(); i.hasNext(); ) {
!                     Map.Entry<String, String> e = (i.next());
!                     String key = (e.getKey());
!                     String value = (e.getValue());
                      out.println("<tr><td>" + key + "<td>" + filter(value, true));
                  }
                  out.println("</table>");
              }
          }