src/share/classes/java/util/stream/IntPipeline.java

Print this page
rev 8376 : 8025910: rename substream(long) -> skip and remove substream(long,long)
Reviewed-by: duke

*** 366,401 **** }; } // Stateful intermediate ops from IntStream - private IntStream slice(long skip, long limit) { - return SliceOps.makeInt(this, skip, limit); - } - @Override public final IntStream limit(long maxSize) { if (maxSize < 0) throw new IllegalArgumentException(Long.toString(maxSize)); ! return slice(0, maxSize); } @Override ! public final IntStream substream(long startingOffset) { ! if (startingOffset < 0) ! throw new IllegalArgumentException(Long.toString(startingOffset)); ! if (startingOffset == 0) return this; else ! return slice(startingOffset, -1); ! } ! ! @Override ! public final IntStream substream(long startingOffset, long endingOffset) { ! if (startingOffset < 0 || endingOffset < startingOffset) ! throw new IllegalArgumentException(String.format("substream(%d, %d)", startingOffset, endingOffset)); ! return slice(startingOffset, endingOffset - startingOffset); } @Override public final IntStream sorted() { return SortedOps.makeInt(this); --- 366,390 ---- }; } // Stateful intermediate ops from IntStream @Override public final IntStream limit(long maxSize) { if (maxSize < 0) throw new IllegalArgumentException(Long.toString(maxSize)); ! return SliceOps.makeInt(this, 0, maxSize); } @Override ! public final IntStream skip(long n) { ! if (n < 0) ! throw new IllegalArgumentException(Long.toString(n)); ! if (n == 0) return this; else ! return SliceOps.makeInt(this, n, -1); } @Override public final IntStream sorted() { return SortedOps.makeInt(this);