src/demo/share/java2d/J2DBench/src/j2dbench/report/XMLHTMLReporter.java

*** 1,7 ****
  /*
!  * Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
--- 1,7 ----
  /*
!  * Copyright (c) 2004, 2018, Oracle and/or its affiliates. All rights reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
*** 100,110 ****
      /**
       * Add Test Group to the list
       */
      private static void addGroup(String testName) {
  
!         String testNameSplit[] = testName.replace('.', '_').split("_");
          String group = testNameSplit[0];
          for(int i=1; i<LEVEL; i++) {
              group = group + "." + testNameSplit[i];
          }
  
--- 100,110 ----
      /**
       * Add Test Group to the list
       */
      private static void addGroup(String testName) {
  
!         String[] testNameSplit = testName.replace('.', '_').split("_");
          String group = testNameSplit[0];
          for(int i=1; i<LEVEL; i++) {
              group = group + "." + testNameSplit[i];
          }
  
*** 117,127 ****
      /**
       * Generate a Display Name for this group
       */
      private static String getDisplayGroupName(String group) {
  
!         String groupSplit[] = group.replace('.', '_').split("_");
  
          StringBuffer groupName = new StringBuffer();
          String tempName = null;
  
          for(int i=0; i<groupSplit.length; i++) {
--- 117,127 ----
      /**
       * Generate a Display Name for this group
       */
      private static String getDisplayGroupName(String group) {
  
!         String[] groupSplit = group.replace('.', '_').split("_");
  
          StringBuffer groupName = new StringBuffer();
          String tempName = null;
  
          for(int i=0; i<groupSplit.length; i++) {
*** 140,150 ****
      /**
       * Get the group to which this testcase belongs
       */
      private static String getGroup(String testName) {
  
!         String testNameSplit[] = testName.replace('.', '_').split("_");
          String group = testNameSplit[0];
          for(int i=1; i<LEVEL; i++) {
              group = group + "." + testNameSplit[i];
          }
  
--- 140,150 ----
      /**
       * Get the group to which this testcase belongs
       */
      private static String getGroup(String testName) {
  
!         String[] testNameSplit = testName.replace('.', '_').split("_");
          String group = testNameSplit[0];
          for(int i=1; i<LEVEL; i++) {
              group = group + "." + testNameSplit[i];
          }
  
*** 198,208 ****
              Enumeration enum_ = srsh.getKeyEnumeration();
              Vector keyvector = new Vector();
              while (enum_.hasMoreElements()) {
                  keyvector.add(enum_.nextElement());
              }
!             String keys[] = new String[keyvector.size()];
              keyvector.copyInto(keys);
              J2DAnalyzer.sort(keys);
  
              File reportFile = new File(resultsDir, "J2DBench_Results.html");
              PrintWriter writer =
--- 198,208 ----
              Enumeration enum_ = srsh.getKeyEnumeration();
              Vector keyvector = new Vector();
              while (enum_.hasMoreElements()) {
                  keyvector.add(enum_.nextElement());
              }
!             String[] keys = new String[keyvector.size()];
              keyvector.copyInto(keys);
              J2DAnalyzer.sort(keys);
  
              File reportFile = new File(resultsDir, "J2DBench_Results.html");
              PrintWriter writer =
*** 321,331 ****
          Enumeration baseEnum_ = baseSRSH.getKeyEnumeration();
          Vector baseKeyvector = new Vector();
          while (baseEnum_.hasMoreElements()) {
              baseKeyvector.add(baseEnum_.nextElement());
          }
!         String baseKeys[] = new String[baseKeyvector.size()];
          baseKeyvector.copyInto(baseKeys);
          J2DAnalyzer.sort(baseKeys);
  
          //Get Target XML File ResultSetHolder
          J2DAnalyzer.readResults(targetXMLFileName);
--- 321,331 ----
          Enumeration baseEnum_ = baseSRSH.getKeyEnumeration();
          Vector baseKeyvector = new Vector();
          while (baseEnum_.hasMoreElements()) {
              baseKeyvector.add(baseEnum_.nextElement());
          }
!         String[] baseKeys = new String[baseKeyvector.size()];
          baseKeyvector.copyInto(baseKeys);
          J2DAnalyzer.sort(baseKeys);
  
          //Get Target XML File ResultSetHolder
          J2DAnalyzer.readResults(targetXMLFileName);
*** 335,345 ****
          Enumeration targetEnum_ = baseSRSH.getKeyEnumeration();
          Vector targetKeyvector = new Vector();
          while (targetEnum_.hasMoreElements()) {
              targetKeyvector.add(targetEnum_.nextElement());
          }
!         String targetKeys[] = new String[targetKeyvector.size()];
          targetKeyvector.copyInto(targetKeys);
          J2DAnalyzer.sort(targetKeys);
  
          baseBuild = (String)baseSRSH.getProperties().get("java.vm.version");
          targetBuild = (String)targetSRSH.getProperties().get("java.vm.version");
--- 335,345 ----
          Enumeration targetEnum_ = baseSRSH.getKeyEnumeration();
          Vector targetKeyvector = new Vector();
          while (targetEnum_.hasMoreElements()) {
              targetKeyvector.add(targetEnum_.nextElement());
          }
!         String[] targetKeys = new String[targetKeyvector.size()];
          targetKeyvector.copyInto(targetKeys);
          J2DAnalyzer.sort(targetKeys);
  
          baseBuild = (String)baseSRSH.getProperties().get("java.vm.version");
          targetBuild = (String)targetSRSH.getProperties().get("java.vm.version");
*** 795,805 ****
                                            "Test Results - " +
                                            groupNames.get(curGroupName) +
                                            "</font></td></tr>");
              testResultsScoreBuffer.append(testResultsStartBuffer);
  
!             String tableTags[] = null;
  
              for(int i=0; i<testCaseList.length; i++) {
  
                  curTestName = testCaseList[i].toString();
  
--- 795,805 ----
                                            "Test Results - " +
                                            groupNames.get(curGroupName) +
                                            "</font></td></tr>");
              testResultsScoreBuffer.append(testResultsStartBuffer);
  
!             String[] tableTags = null;
  
              for(int i=0; i<testCaseList.length; i++) {
  
                  curTestName = testCaseList[i].toString();
  
*** 1348,1358 ****
      }
  
      /**
       * main
       */
!     public static void main(String args[]) {
  
          String resDir = ".";
          String baseXML = null;
          String targetXML = null;
          String resultXML = null;
--- 1348,1358 ----
      }
  
      /**
       * main
       */
!     public static void main(String[] args) {
  
          String resDir = ".";
          String baseXML = null;
          String targetXML = null;
          String resultXML = null;