--- jsr166/src/test/extra166y/SetOpsDemo.java 2009/11/01 22:00:35 1.1 +++ jsr166/src/test/extra166y/SetOpsDemo.java 2009/11/16 04:16:43 1.2 @@ -47,7 +47,7 @@ class SetOpsDemo { } static class Evens implements Ops.IntToObject { - public Long op(int i) { + public Long op(int i) { return Long.valueOf((long)(i << 1)); } } @@ -252,7 +252,7 @@ class SetOpsDemo { // ............ - static void seqRemoveAll(ParallelArray pa, + static void seqRemoveAll(ParallelArray pa, Ops.Predicate selector) { Long[] a = pa.getArray(); int n = pa.size(); @@ -267,7 +267,7 @@ class SetOpsDemo { pa.setLimit(k); } - static ArrayList seqSelectAll(ParallelArray pa, + static ArrayList seqSelectAll(ParallelArray pa, Ops.Predicate selector) { ArrayList al = new ArrayList(); Long[] a = pa.getArray(); @@ -283,7 +283,7 @@ class SetOpsDemo { static Long[] seqUnique(Long[] a) { int n = a.length; HashSet m = new HashSet(n); - for (int i = 0; i < n; ++i) + for (int i = 0; i < n; ++i) m.add(a[i]); int ul = m.size(); Long[] u = new Long[ul]; @@ -292,7 +292,7 @@ class SetOpsDemo { u[k++] = e; return u; } - + static void checkSorted (ParallelArray pa) { int n = pa.size(); for (int i = 0; i < n - 1; i++) { @@ -301,7 +301,7 @@ class SetOpsDemo { } } } - + static final class RandomLongGenerator implements Ops.Generator { public Long op() { return new Long(ThreadLocalRandom.current().nextLong(maxValue));