diff options
author | martin <none@none> | 2008-09-09 15:20:07 -0700 |
---|---|---|
committer | martin <none@none> | 2008-09-09 15:20:07 -0700 |
commit | 2244265d33ba3a74a5958fbd3d44b1636bf0651e (patch) | |
tree | ff4af6cf54fd3090fa74eb7be645d34d875c4e15 | |
parent | 2e6e2a657c63a7da4735136b407b1d291b2f1057 (diff) |
6733145: (bf) CharBuffer.subSequence can be updated to take advantage of covariant returns
Summary: Change return type to CharBuffer
Reviewed-by: alanb
-rw-r--r-- | src/share/classes/java/nio/ByteBufferAs-X-Buffer.java | 2 | ||||
-rw-r--r-- | src/share/classes/java/nio/Direct-X-Buffer.java | 2 | ||||
-rw-r--r-- | src/share/classes/java/nio/Heap-X-Buffer.java | 2 | ||||
-rw-r--r-- | src/share/classes/java/nio/StringCharBuffer.java | 2 | ||||
-rw-r--r-- | src/share/classes/java/nio/X-Buffer.java | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/src/share/classes/java/nio/ByteBufferAs-X-Buffer.java b/src/share/classes/java/nio/ByteBufferAs-X-Buffer.java index 5761fd867..1b959ab6e 100644 --- a/src/share/classes/java/nio/ByteBufferAs-X-Buffer.java +++ b/src/share/classes/java/nio/ByteBufferAs-X-Buffer.java @@ -186,7 +186,7 @@ class ByteBufferAs$Type$Buffer$RW$$BO$ // package-private // --- Methods to support CharSequence --- - public CharSequence subSequence(int start, int end) { + public CharBuffer subSequence(int start, int end) { int pos = position(); int lim = limit(); assert (pos <= lim); diff --git a/src/share/classes/java/nio/Direct-X-Buffer.java b/src/share/classes/java/nio/Direct-X-Buffer.java index d1cfb6b5c..44915f207 100644 --- a/src/share/classes/java/nio/Direct-X-Buffer.java +++ b/src/share/classes/java/nio/Direct-X-Buffer.java @@ -402,7 +402,7 @@ class Direct$Type$Buffer$RW$$BO$ // --- Methods to support CharSequence --- - public CharSequence subSequence(int start, int end) { + public CharBuffer subSequence(int start, int end) { int pos = position(); int lim = limit(); assert (pos <= lim); diff --git a/src/share/classes/java/nio/Heap-X-Buffer.java b/src/share/classes/java/nio/Heap-X-Buffer.java index 0c19ca554..ed59c73a8 100644 --- a/src/share/classes/java/nio/Heap-X-Buffer.java +++ b/src/share/classes/java/nio/Heap-X-Buffer.java @@ -566,7 +566,7 @@ class Heap$Type$Buffer$RW$ // --- Methods to support CharSequence --- - public CharSequence subSequence(int start, int end) { + public CharBuffer subSequence(int start, int end) { if ((start < 0) || (end > length()) || (start > end)) diff --git a/src/share/classes/java/nio/StringCharBuffer.java b/src/share/classes/java/nio/StringCharBuffer.java index 3f49ae1eb..648b1986f 100644 --- a/src/share/classes/java/nio/StringCharBuffer.java +++ b/src/share/classes/java/nio/StringCharBuffer.java @@ -99,7 +99,7 @@ class StringCharBuffer // package-private return str.toString().substring(start + offset, end + offset); } - public final CharSequence subSequence(int start, int end) { + public final CharBuffer subSequence(int start, int end) { try { int pos = position(); return new StringCharBuffer(str, -1, diff --git a/src/share/classes/java/nio/X-Buffer.java b/src/share/classes/java/nio/X-Buffer.java index 99a7468ff..67cf6db3d 100644 --- a/src/share/classes/java/nio/X-Buffer.java +++ b/src/share/classes/java/nio/X-Buffer.java @@ -1239,13 +1239,13 @@ public abstract class $Type$Buffer * smaller than <tt>start</tt> and no larger than * <tt>remaining()</tt> * - * @return The new character sequence + * @return The new character buffer * * @throws IndexOutOfBoundsException * If the preconditions on <tt>start</tt> and <tt>end</tt> * do not hold */ - public abstract CharSequence subSequence(int start, int end); + public abstract CharBuffer subSequence(int start, int end); // --- Methods to support Appendable --- |