< prev index next >

src/com/sun/javatest/services/ServiceManager.java

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

*** 288,298 **** public void startingTestRun(Parameters params) { if (mode == StartMode.UP_FRONT) { Set<String> active = new TreeSet<>(); try { ! Iterator iter = harness.getTestsIterator(null); active = selectActiveServices(iter); } catch (Harness.Fault f) { commonLog.log(Level.SEVERE, f.getMessage()); return; } --- 288,298 ---- public void startingTestRun(Parameters params) { if (mode == StartMode.UP_FRONT) { Set<String> active = new TreeSet<>(); try { ! Iterator<TestResult> iter = harness.getTestsIterator(null); active = selectActiveServices(iter); } catch (Harness.Fault f) { commonLog.log(Level.SEVERE, f.getMessage()); return; }
*** 365,381 **** */ public void setStartMode(StartMode mode) { this.mode = mode; } ! private Set<String> selectActiveServices(Iterator iter) { Set<String> active = new TreeSet<>(); Set<TestPath> copy = new HashSet<>(testServiceMap); TestResult tr; TestDescription td; while (!copy.isEmpty() && active.size() < services.size() && ! (tr = (TestResult)iter.next()) != null ) { try { td = tr.getDescription(); HashSet<TestPath> toRemove = new HashSet<>(); for (TestPath p : copy) { if (p.matches(td)) { --- 365,381 ---- */ public void setStartMode(StartMode mode) { this.mode = mode; } ! private Set<String> selectActiveServices(Iterator<TestResult> iter) { Set<String> active = new TreeSet<>(); Set<TestPath> copy = new HashSet<>(testServiceMap); TestResult tr; TestDescription td; while (!copy.isEmpty() && active.size() < services.size() && ! (tr = iter.next()) != null ) { try { td = tr.getDescription(); HashSet<TestPath> toRemove = new HashSet<>(); for (TestPath p : copy) { if (p.matches(td)) {
< prev index next >