From ddb9733b0fcf76b6d5bab37f36921e736dd110a5 Mon Sep 17 00:00:00 2001 From: mkoch Date: Wed, 24 Nov 2004 09:13:33 +0000 Subject: [PATCH] 2004-11-24 Michael Koch * java/nio/DirectByteBufferImpl.java, java/nio/MappedByteBufferImpl.java: Reformatted. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@91141 138bc75d-0d04-0410-961f-82ee72b054a4 --- libjava/ChangeLog | 6 ++ libjava/java/nio/DirectByteBufferImpl.java | 140 ++++++++++++++--------------- libjava/java/nio/MappedByteBufferImpl.java | 128 +++++++++++++------------- 3 files changed, 140 insertions(+), 134 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 27d54c2839c..444673d6a33 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,9 @@ +2004-11-24 Michael Koch + + * java/nio/DirectByteBufferImpl.java, + java/nio/MappedByteBufferImpl.java: + Reformatted. + 2004-11-23 John David Anglin * testsuite/lib/libjava.exp, diff --git a/libjava/java/nio/DirectByteBufferImpl.java b/libjava/java/nio/DirectByteBufferImpl.java index 89be156d432..6e4fa811ce3 100644 --- a/libjava/java/nio/DirectByteBufferImpl.java +++ b/libjava/java/nio/DirectByteBufferImpl.java @@ -58,16 +58,16 @@ final class DirectByteBufferImpl extends ByteBuffer RawData address; private boolean readOnly; - public DirectByteBufferImpl (RawData address, long len) + public DirectByteBufferImpl(RawData address, long len) { - this (null, address, (int) len, (int) len, 0, false); + this(null, address, (int) len, (int) len, 0, false); } - public DirectByteBufferImpl (Object owner, RawData address, - int capacity, int limit, - int position, boolean readOnly) + public DirectByteBufferImpl(Object owner, RawData address, + int capacity, int limit, + int position, boolean readOnly) { - super (capacity, limit, position, -1); + super(capacity, limit, position, -1); this.address = address; this.readOnly = readOnly; this.owner = owner; @@ -84,7 +84,7 @@ final class DirectByteBufferImpl extends ByteBuffer private static native RawData allocateImpl (int capacity); private static native void freeImpl (RawData address); - protected void finalize () throws Throwable + protected void finalize() throws Throwable { freeImpl (address); } @@ -92,17 +92,17 @@ final class DirectByteBufferImpl extends ByteBuffer static native byte getImpl (RawData address, int index); static native void putImpl (RawData address, int index, byte value); - public byte get () + public byte get() { checkForUnderflow(); int pos = position(); byte result = getImpl (address, pos); - position (pos + 1); + position(pos + 1); return result; } - public byte get (int index) + public byte get(int index) { checkIndex(index); @@ -112,7 +112,7 @@ final class DirectByteBufferImpl extends ByteBuffer static native void getImpl (RawData address, int index, byte[] dst, int offset, int length); - public ByteBuffer get (byte[] dst, int offset, int length) + public ByteBuffer get(byte[] dst, int offset, int length) { checkArraySize(dst.length, offset, length); checkForUnderflow(length); @@ -124,18 +124,18 @@ final class DirectByteBufferImpl extends ByteBuffer return this; } - public ByteBuffer put (byte value) + public ByteBuffer put(byte value) { checkIfReadOnly(); checkForOverflow(); int pos = position(); putImpl (address, pos, value); - position (pos + 1); + position(pos + 1); return this; } - public ByteBuffer put (int index, byte value) + public ByteBuffer put(int index, byte value) { checkIfReadOnly(); checkIndex(index); @@ -151,7 +151,7 @@ final class DirectByteBufferImpl extends ByteBuffer shiftDown(address, dst_offset, src_offset, count); } - public ByteBuffer compact () + public ByteBuffer compact() { int pos = position(); if (pos > 0) @@ -166,7 +166,7 @@ final class DirectByteBufferImpl extends ByteBuffer public static native RawData adjustAddress(RawData address, int offset); - public ByteBuffer slice () + public ByteBuffer slice() { int rem = remaining(); return new DirectByteBufferImpl (owner, @@ -174,15 +174,15 @@ final class DirectByteBufferImpl extends ByteBuffer rem, rem, 0, isReadOnly ()); } - private ByteBuffer duplicate (boolean readOnly) + private ByteBuffer duplicate(boolean readOnly) { int pos = position(); reset(); int mark = position(); position(pos); DirectByteBufferImpl result - = new DirectByteBufferImpl (owner, address, capacity (), limit (), - pos, readOnly); + = new DirectByteBufferImpl(owner, address, capacity(), limit(), + pos, readOnly); if (mark != pos) { result.position(mark); @@ -192,185 +192,185 @@ final class DirectByteBufferImpl extends ByteBuffer return result; } - public ByteBuffer duplicate () + public ByteBuffer duplicate() { return duplicate(isReadOnly()); } - public ByteBuffer asReadOnlyBuffer () + public ByteBuffer asReadOnlyBuffer() { return duplicate(true); } - public boolean isReadOnly () + public boolean isReadOnly() { return readOnly; } - public boolean isDirect () + public boolean isDirect() { return true; } - public CharBuffer asCharBuffer () + public CharBuffer asCharBuffer() { - return new CharViewBufferImpl (this, remaining() >> 1); + return new CharViewBufferImpl(this, remaining() >> 1); } - public ShortBuffer asShortBuffer () + public ShortBuffer asShortBuffer() { - return new ShortViewBufferImpl (this, remaining() >> 1); + return new ShortViewBufferImpl(this, remaining() >> 1); } - public IntBuffer asIntBuffer () + public IntBuffer asIntBuffer() { - return new IntViewBufferImpl (this, remaining() >> 2); + return new IntViewBufferImpl(this, remaining() >> 2); } - public LongBuffer asLongBuffer () + public LongBuffer asLongBuffer() { - return new LongViewBufferImpl (this, remaining() >> 3); + return new LongViewBufferImpl(this, remaining() >> 3); } - public FloatBuffer asFloatBuffer () + public FloatBuffer asFloatBuffer() { - return new FloatViewBufferImpl (this, remaining() >> 2); + return new FloatViewBufferImpl(this, remaining() >> 2); } - public DoubleBuffer asDoubleBuffer () + public DoubleBuffer asDoubleBuffer() { - return new DoubleViewBufferImpl (this, remaining() >> 3); + return new DoubleViewBufferImpl(this, remaining() >> 3); } - public char getChar () + public char getChar() { return ByteBufferHelper.getChar(this, order()); } - public ByteBuffer putChar (char value) + public ByteBuffer putChar(char value) { ByteBufferHelper.putChar(this, value, order()); return this; } - public char getChar (int index) + public char getChar(int index) { return ByteBufferHelper.getChar(this, index, order()); } - public ByteBuffer putChar (int index, char value) + public ByteBuffer putChar(int index, char value) { ByteBufferHelper.putChar(this, index, value, order()); return this; } - public short getShort () + public short getShort() { return ByteBufferHelper.getShort(this, order()); } - public ByteBuffer putShort (short value) + public ByteBuffer putShort(short value) { ByteBufferHelper.putShort(this, value, order()); return this; } - public short getShort (int index) + public short getShort(int index) { return ByteBufferHelper.getShort(this, index, order()); } - public ByteBuffer putShort (int index, short value) + public ByteBuffer putShort(int index, short value) { ByteBufferHelper.putShort(this, index, value, order()); return this; } - public int getInt () + public int getInt() { return ByteBufferHelper.getInt(this, order()); } - public ByteBuffer putInt (int value) + public ByteBuffer putInt(int value) { ByteBufferHelper.putInt(this, value, order()); return this; } - public int getInt (int index) + public int getInt(int index) { return ByteBufferHelper.getInt(this, index, order()); } - public ByteBuffer putInt (int index, int value) + public ByteBuffer putInt(int index, int value) { ByteBufferHelper.putInt(this, index, value, order()); return this; } - public long getLong () + public long getLong() { return ByteBufferHelper.getLong(this, order()); } - public ByteBuffer putLong (long value) + public ByteBuffer putLong(long value) { - ByteBufferHelper.putLong (this, value, order()); + ByteBufferHelper.putLong(this, value, order()); return this; } - public long getLong (int index) + public long getLong(int index) { - return ByteBufferHelper.getLong (this, index, order()); + return ByteBufferHelper.getLong(this, index, order()); } - public ByteBuffer putLong (int index, long value) + public ByteBuffer putLong(int index, long value) { - ByteBufferHelper.putLong (this, index, value, order()); + ByteBufferHelper.putLong(this, index, value, order()); return this; } - public float getFloat () + public float getFloat() { - return ByteBufferHelper.getFloat (this, order()); + return ByteBufferHelper.getFloat(this, order()); } - public ByteBuffer putFloat (float value) + public ByteBuffer putFloat(float value) { - ByteBufferHelper.putFloat (this, value, order()); + ByteBufferHelper.putFloat(this, value, order()); return this; } - public float getFloat (int index) + public float getFloat(int index) { - return ByteBufferHelper.getFloat (this, index, order()); + return ByteBufferHelper.getFloat(this, index, order()); } - public ByteBuffer putFloat (int index, float value) + public ByteBuffer putFloat(int index, float value) { - ByteBufferHelper.putFloat (this, index, value, order()); + ByteBufferHelper.putFloat(this, index, value, order()); return this; } - public double getDouble () + public double getDouble() { - return ByteBufferHelper.getDouble (this, order()); + return ByteBufferHelper.getDouble(this, order()); } - public ByteBuffer putDouble (double value) + public ByteBuffer putDouble(double value) { - ByteBufferHelper.putDouble (this, value, order()); + ByteBufferHelper.putDouble(this, value, order()); return this; } - public double getDouble (int index) + public double getDouble(int index) { - return ByteBufferHelper.getDouble (this, index, order()); + return ByteBufferHelper.getDouble(this, index, order()); } - public ByteBuffer putDouble (int index, double value) + public ByteBuffer putDouble(int index, double value) { - ByteBufferHelper.putDouble (this, index, value, order()); + ByteBufferHelper.putDouble(this, index, value, order()); return this; } } diff --git a/libjava/java/nio/MappedByteBufferImpl.java b/libjava/java/nio/MappedByteBufferImpl.java index 275d0883fad..8f413220a17 100644 --- a/libjava/java/nio/MappedByteBufferImpl.java +++ b/libjava/java/nio/MappedByteBufferImpl.java @@ -54,7 +54,7 @@ final class MappedByteBufferImpl extends MappedByteBuffer * Win32 uses it for the pointer returned by CreateFileMapping. */ public long implLen; - public MappedByteBufferImpl (RawData address, int size, boolean readOnly) + public MappedByteBufferImpl(RawData address, int size, boolean readOnly) throws IOException { super(size, size, 0, -1); @@ -62,12 +62,12 @@ final class MappedByteBufferImpl extends MappedByteBuffer this.readOnly = readOnly; } - public boolean isReadOnly () + public boolean isReadOnly() { return readOnly; } - public byte get () + public byte get() { checkForUnderflow(); @@ -77,7 +77,7 @@ final class MappedByteBufferImpl extends MappedByteBuffer return result; } - public ByteBuffer put (byte value) + public ByteBuffer put(byte value) { checkIfReadOnly(); checkForOverflow(); @@ -88,14 +88,14 @@ final class MappedByteBufferImpl extends MappedByteBuffer return this; } - public byte get (int index) + public byte get(int index) { checkIndex(index); return DirectByteBufferImpl.getImpl(address, index); } - public ByteBuffer get (byte[] dst, int offset, int length) + public ByteBuffer get(byte[] dst, int offset, int length) { checkArraySize(dst.length, offset, length); checkForUnderflow(length); @@ -107,7 +107,7 @@ final class MappedByteBufferImpl extends MappedByteBuffer return this; } - public ByteBuffer put (int index, byte value) + public ByteBuffer put(int index, byte value) { checkIfReadOnly(); checkIndex(index); @@ -116,7 +116,7 @@ final class MappedByteBufferImpl extends MappedByteBuffer return this; } - public ByteBuffer compact () + public ByteBuffer compact() { int pos = position(); if (pos > 0) @@ -130,12 +130,12 @@ final class MappedByteBufferImpl extends MappedByteBuffer return this; } - public boolean isDirect () + public boolean isDirect() { return true; } - public ByteBuffer slice () + public ByteBuffer slice() { int rem = remaining(); return new DirectByteBufferImpl (this, @@ -144,15 +144,15 @@ final class MappedByteBufferImpl extends MappedByteBuffer rem, rem, 0, isReadOnly ()); } - private ByteBuffer duplicate (boolean readOnly) + private ByteBuffer duplicate(boolean readOnly) { int pos = position(); reset(); int mark = position(); position(pos); DirectByteBufferImpl result - = new DirectByteBufferImpl (this, address, capacity (), limit (), - pos, readOnly); + = new DirectByteBufferImpl(this, address, capacity(), limit(), + pos, readOnly); if (mark != pos) { result.position(mark); @@ -162,182 +162,182 @@ final class MappedByteBufferImpl extends MappedByteBuffer return result; } - public ByteBuffer duplicate () + public ByteBuffer duplicate() { return duplicate(isReadOnly()); } - public ByteBuffer asReadOnlyBuffer () + public ByteBuffer asReadOnlyBuffer() { return duplicate(true); } - public CharBuffer asCharBuffer () + public CharBuffer asCharBuffer() { - return new CharViewBufferImpl (this, remaining() >> 1); + return new CharViewBufferImpl(this, remaining() >> 1); } - public ShortBuffer asShortBuffer () + public ShortBuffer asShortBuffer() { - return new ShortViewBufferImpl (this, remaining() >> 1); + return new ShortViewBufferImpl(this, remaining() >> 1); } - public IntBuffer asIntBuffer () + public IntBuffer asIntBuffer() { - return new IntViewBufferImpl (this, remaining() >> 2); + return new IntViewBufferImpl(this, remaining() >> 2); } - public LongBuffer asLongBuffer () + public LongBuffer asLongBuffer() { - return new LongViewBufferImpl (this, remaining() >> 3); + return new LongViewBufferImpl(this, remaining() >> 3); } - public FloatBuffer asFloatBuffer () + public FloatBuffer asFloatBuffer() { - return new FloatViewBufferImpl (this, remaining() >> 2); + return new FloatViewBufferImpl(this, remaining() >> 2); } - public DoubleBuffer asDoubleBuffer () + public DoubleBuffer asDoubleBuffer() { - return new DoubleViewBufferImpl (this, remaining() >> 3); + return new DoubleViewBufferImpl(this, remaining() >> 3); } - public char getChar () + public char getChar() { return ByteBufferHelper.getChar(this, order()); } - public ByteBuffer putChar (char value) + public ByteBuffer putChar(char value) { ByteBufferHelper.putChar(this, value, order()); return this; } - public char getChar (int index) + public char getChar(int index) { return ByteBufferHelper.getChar(this, index, order()); } - public ByteBuffer putChar (int index, char value) + public ByteBuffer putChar(int index, char value) { ByteBufferHelper.putChar(this, index, value, order()); return this; } - public short getShort () + public short getShort() { return ByteBufferHelper.getShort(this, order()); } - public ByteBuffer putShort (short value) + public ByteBuffer putShort(short value) { ByteBufferHelper.putShort(this, value, order()); return this; } - public short getShort (int index) + public short getShort(int index) { return ByteBufferHelper.getShort(this, index, order()); } - public ByteBuffer putShort (int index, short value) + public ByteBuffer putShort(int index, short value) { ByteBufferHelper.putShort(this, index, value, order()); return this; } - public int getInt () + public int getInt() { return ByteBufferHelper.getInt(this, order()); } - public ByteBuffer putInt (int value) + public ByteBuffer putInt(int value) { ByteBufferHelper.putInt(this, value, order()); return this; } - public int getInt (int index) + public int getInt(int index) { return ByteBufferHelper.getInt(this, index, order()); } - public ByteBuffer putInt (int index, int value) + public ByteBuffer putInt(int index, int value) { ByteBufferHelper.putInt(this, index, value, order()); return this; } - public long getLong () + public long getLong() { return ByteBufferHelper.getLong(this, order()); } - public ByteBuffer putLong (long value) + public ByteBuffer putLong(long value) { - ByteBufferHelper.putLong (this, value, order()); + ByteBufferHelper.putLong(this, value, order()); return this; } - public long getLong (int index) + public long getLong(int index) { - return ByteBufferHelper.getLong (this, index, order()); + return ByteBufferHelper.getLong(this, index, order()); } - public ByteBuffer putLong (int index, long value) + public ByteBuffer putLong(int index, long value) { - ByteBufferHelper.putLong (this, index, value, order()); + ByteBufferHelper.putLong(this, index, value, order()); return this; } - public float getFloat () + public float getFloat() { - return ByteBufferHelper.getFloat (this, order()); + return ByteBufferHelper.getFloat(this, order()); } - public ByteBuffer putFloat (float value) + public ByteBuffer putFloat(float value) { - ByteBufferHelper.putFloat (this, value, order()); + ByteBufferHelper.putFloat(this, value, order()); return this; } - public float getFloat (int index) + public float getFloat(int index) { - return ByteBufferHelper.getFloat (this, index, order()); + return ByteBufferHelper.getFloat(this, index, order()); } - public ByteBuffer putFloat (int index, float value) + public ByteBuffer putFloat(int index, float value) { - ByteBufferHelper.putFloat (this, index, value, order()); + ByteBufferHelper.putFloat(this, index, value, order()); return this; } - public double getDouble () + public double getDouble() { - return ByteBufferHelper.getDouble (this, order()); + return ByteBufferHelper.getDouble(this, order()); } - public ByteBuffer putDouble (double value) + public ByteBuffer putDouble(double value) { - ByteBufferHelper.putDouble (this, value, order()); + ByteBufferHelper.putDouble(this, value, order()); return this; } - public double getDouble (int index) + public double getDouble(int index) { - return ByteBufferHelper.getDouble (this, index, order()); + return ByteBufferHelper.getDouble(this, index, order()); } - public ByteBuffer putDouble (int index, double value) + public ByteBuffer putDouble(int index, double value) { - ByteBufferHelper.putDouble (this, index, value, order()); + ByteBufferHelper.putDouble(this, index, value, order()); return this; } // NOTE: In libgcj these methods are implemented in natFileChannelXxx.cc, // because they're small, and to put them next to FileChannelImpl::mapImpl. - native void unmapImpl (); - native boolean isLoadedImpl (); + native void unmapImpl(); + native boolean isLoadedImpl(); // FIXME: Try to load all pages into memory. native void loadImpl(); -- 2.11.0