OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

2004-05-30 Michael Koch <konqueror@gmx.de> 

* java/nio/Buffer.java
	(limit): Fixed off by one error.
	* java/nio/CharBuffer.java
	(wrap): Fixed arguments, added javadocs.

From-SVN: r82448
This commit is contained in:
Michael Koch 2004-05-30 13:38:20 +00:00 committed by Michael Koch
parent 74c2dbf7a1
commit 1b2545bcf2
3 changed files with 46 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libjava/ChangeLog
View File

@ -1,3 +1,10 @@
2004-05-30 Michael Koch <konqueror@gmx.de>
* java/nio/Buffer.java
(limit): Fixed off by one error.
* java/nio/CharBuffer.java
(wrap): Fixed arguments, added javadocs.
2004-05-30 Michael Koch <konqueror@gmx.de>
* gnu/java/beans/BeanInfoEmbryo.java,

4
libjava/java/nio/Buffer.java
View File

@ -148,11 +148,11 @@ public abstract class Buffer
if ((newLimit < 0) || (newLimit > cap))
throw new IllegalArgumentException ();
if (newLimit <= mark)
if (newLimit < mark)
mark = -1;
if (pos > newLimit)
pos = newLimit - 1;
pos = newLimit;
limit = newLimit;
return this;

55
libjava/java/nio/CharBuffer.java
View File

@ -65,56 +65,75 @@ public abstract class CharBuffer extends Buffer
* Wraps a <code>char</code> array into a <code>CharBuffer</code>
* object.
*
* @param array the array to wrap
* @param offset the offset of the region in the array to wrap
* @param length the length of the region in the array to wrap
*
* @return a new <code>CharBuffer</code> object
*
* @exception IndexOutOfBoundsException If the preconditions on the offset
* and length parameters do not hold
*/
final public static CharBuffer wrap (char[] array, int offset, int length)
final public static CharBuffer wrap(char[] array, int offset, int length)
{
return new CharBufferImpl (array, 0, array.length, offset + length, offset, -1, false);
return new CharBufferImpl(array, 0, array.length, offset + length, offset, -1, false);
}
/**
* Wraps a character sequence into a <code>CharBuffer</code> object.
*
* @param seq the sequence to wrap
*
* @return a new <code>CharBuffer</code> object
*/
final public static CharBuffer wrap (CharSequence a)
final public static CharBuffer wrap(CharSequence seq)
{
return wrap (a, 0, a.length ());
return wrap(seq, 0, seq.length());
}
/**
* Wraps a character sequence into a <code>CharBuffer</code> object.
*
* @param seq the sequence to wrap
* @param start the index of the first character to wrap
* @param end the index of the first character not to wrap
*
* @return a new <code>CharBuffer</code> object
*
* @exception IndexOutOfBoundsException If the preconditions on the offset
* and length parameters do not hold
*/
final public static CharBuffer wrap (CharSequence a, int offset, int length)
final public static CharBuffer wrap(CharSequence seq, int start, int end)
{
// FIXME: implement better handling of java.lang.String.
// Probably share data with String via reflection.
if ((offset < 0)
|| (offset > a.length ())
|| (length < 0)
|| (length > (a.length () - offset)))
throw new IndexOutOfBoundsException ();
if ((start < 0)
|| (start > seq.length())
|| (end < start)
|| (end > (seq.length() - start)))
throw new IndexOutOfBoundsException();
char [] buffer = new char [a.length ()];
int len = end - start;
char[] buffer = new char[len];
for (int i = offset; i < length; i++)
{
buffer [i] = a.charAt (i);
}
for (int i = 0; i < len; i++)
buffer[i] = seq.charAt(i + start);
return wrap (buffer, offset, length).asReadOnlyBuffer ();
return wrap(buffer, 0, len).asReadOnlyBuffer();
}
/**
* Wraps a <code>char</code> array into a <code>CharBuffer</code>
* object.
*
* @param array the array to wrap
*
* @return a new <code>CharBuffer</code> object
*/
final public static CharBuffer wrap (char[] array)
final public static CharBuffer wrap(char[] array)
{
return wrap (array, 0, array.length);
return wrap(array, 0, array.length);
}
/**