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

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

*** 446,458 ****
       * session. Can be used for sharing intermediate results between reports for
       * optimization.
       *
       * @return Map for data exchange
       */
!     public Map getExchangeData() {
          if (exchangeData == null) {
!             exchangeData = new HashMap();
          }
          return exchangeData;
      }
  
      void setupSortedResults() {
--- 446,458 ----
       * session. Can be used for sharing intermediate results between reports for
       * optimization.
       *
       * @return Map for data exchange
       */
!     public Map<?, ?> getExchangeData() {
          if (exchangeData == null) {
!             exchangeData = new HashMap<>();
          }
          return exchangeData;
      }
  
      void setupSortedResults() {
*** 463,473 ****
          File[] initFiles = getInitialFiles();
          sortedResults = new TreeSet[Status.NUM_STATES];
          for (int i = 0; i < sortedResults.length; i++) {
              sortedResults[i] = new TreeSet<>(new TestResultsByNameComparator());
          }
!         Iterator iter;
          try {
              TestFilter[] fs = null;
              // Note: settings.filter should not really be null, modernized clients
              //   of this class should set the filter before asking for a report.
              if (filter == null) {
--- 463,473 ----
          File[] initFiles = getInitialFiles();
          sortedResults = new TreeSet[Status.NUM_STATES];
          for (int i = 0; i < sortedResults.length; i++) {
              sortedResults[i] = new TreeSet<>(new TestResultsByNameComparator());
          }
!         Iterator<TestResult> iter;
          try {
              TestFilter[] fs = null;
              // Note: settings.filter should not really be null, modernized clients
              //   of this class should set the filter before asking for a report.
              if (filter == null) {
*** 478,488 ****
              iter = ((initFiles == null) ? resultTable.getIterator(fs) : resultTable.getIterator(initFiles, fs));
          } catch (TestResultTable.Fault f) {
              throw new JavaTestError(ReportSettings.i18n.getString("result.testResult.err"));
          }
          for (; iter.hasNext();) {
!             TestResult tr = (TestResult) (iter.next());
              Status s = tr.getStatus();
              TreeSet<TestResult> list = sortedResults[s == null ? Status.NOT_RUN : s.getType()];
              list.add(tr);
          }
      }
--- 478,488 ----
              iter = ((initFiles == null) ? resultTable.getIterator(fs) : resultTable.getIterator(initFiles, fs));
          } catch (TestResultTable.Fault f) {
              throw new JavaTestError(ReportSettings.i18n.getString("result.testResult.err"));
          }
          for (; iter.hasNext();) {
!             TestResult tr = (iter.next());
              Status s = tr.getStatus();
              TreeSet<TestResult> list = sortedResults[s == null ? Status.NOT_RUN : s.getType()];
              list.add(tr);
          }
      }
*** 528,538 ****
      private TreeSet<TestResult>[] sortedResults;
      private KflSorter kflSorter;
      File xmlReportFile = null;
      File tmpXmlReportFile = null;
      private File[] mif = new File[0];
!     private HashMap exchangeData;
      private InterviewParameters ip;
  
      private List<CustomReport> customReports = Collections.emptyList();
  
      TestFilter filter;
--- 528,538 ----
      private TreeSet<TestResult>[] sortedResults;
      private KflSorter kflSorter;
      File xmlReportFile = null;
      File tmpXmlReportFile = null;
      private File[] mif = new File[0];
!     private HashMap<?, ?> exchangeData;
      private InterviewParameters ip;
  
      private List<CustomReport> customReports = Collections.emptyList();
  
      TestFilter filter;