From cf68bacaadccff4197ad92016c58c07c7c37f9c0 Mon Sep 17 00:00:00 2001 From: Per Bothner Date: Mon, 16 Feb 2004 11:53:27 -0800 Subject: [PATCH] CharBufferImpl.java: Inline super constructor. * java/nio/CharBufferImpl.java: Inline super constructor. * java/nio/DoubleBufferImpl.java: Likewise. * java/nio/FloatBufferImpl.java: Likewise. * java/nio/IntBufferImpl.java: Likewise. * java/nio/LongBufferImpl.java: Likewise. * java/nio/ShortBufferImpl.java: Likewise. * java/nio/CharBuffer.java: Remove unused constructor. * java/nio/DoubleBuffer.java: Likewise. * java/nio/FloatBuffer.java: Likewise. * java/nio/IntBuffer.java: Likewise. * java/nio/LongBuffer.java: Likewise. * java/nio/ShortBuffer.java: Likewise. From-SVN: r77916 --- libjava/ChangeLog | 15 +++++++++++++++ libjava/java/nio/CharBuffer.java | 7 ------- libjava/java/nio/CharBufferImpl.java | 4 +++- libjava/java/nio/DoubleBuffer.java | 7 ------- libjava/java/nio/DoubleBufferImpl.java | 4 +++- libjava/java/nio/FloatBuffer.java | 7 ------- libjava/java/nio/FloatBufferImpl.java | 4 +++- libjava/java/nio/IntBuffer.java | 7 ------- libjava/java/nio/IntBufferImpl.java | 4 +++- libjava/java/nio/LongBuffer.java | 7 ------- libjava/java/nio/LongBufferImpl.java | 4 +++- libjava/java/nio/ShortBuffer.java | 7 ------- libjava/java/nio/ShortBufferImpl.java | 4 +++- 13 files changed, 33 insertions(+), 48 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index e3239f837ad..42af2973e42 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,18 @@ +2004-02-16 Per Bothner + + * java/nio/CharBufferImpl.java: Inline super constructor. + * java/nio/DoubleBufferImpl.java: Likewise. + * java/nio/FloatBufferImpl.java: Likewise. + * java/nio/IntBufferImpl.java: Likewise. + * java/nio/LongBufferImpl.java: Likewise. + * java/nio/ShortBufferImpl.java: Likewise. + * java/nio/CharBuffer.java: Remove unused constructor. + * java/nio/DoubleBuffer.java: Likewise. + * java/nio/FloatBuffer.java: Likewise. + * java/nio/IntBuffer.java: Likewise. + * java/nio/LongBuffer.java: Likewise. + * java/nio/ShortBuffer.java: Likewise. + 2004-02-15 Ito Kazumitsu * java/io/ObjectInputStream.java (readClassDescriptor): Avoid the diff --git a/libjava/java/nio/CharBuffer.java b/libjava/java/nio/CharBuffer.java index 15a53570979..3d488bad345 100644 --- a/libjava/java/nio/CharBuffer.java +++ b/libjava/java/nio/CharBuffer.java @@ -53,13 +53,6 @@ public abstract class CharBuffer extends Buffer array_offset = 0; } - CharBuffer (char[] buffer, int offset, int capacity, int limit, int position, int mark) - { - super (capacity, limit, position, mark); - this.backing_buffer = buffer; - this.array_offset = offset; - } - /** * Allocates a new CharBuffer object with a given capacity. */ diff --git a/libjava/java/nio/CharBufferImpl.java b/libjava/java/nio/CharBufferImpl.java index d22b4d1b2bb..aacc2cb2658 100644 --- a/libjava/java/nio/CharBufferImpl.java +++ b/libjava/java/nio/CharBufferImpl.java @@ -52,7 +52,9 @@ final class CharBufferImpl extends CharBuffer CharBufferImpl (char[] buffer, int offset, int capacity, int limit, int position, int mark, boolean readOnly) { - super (buffer, offset, capacity, limit, position, mark); + super (capacity, limit, position, mark); + this.backing_buffer = buffer; + this.array_offset = offset; this.readOnly = readOnly; } diff --git a/libjava/java/nio/DoubleBuffer.java b/libjava/java/nio/DoubleBuffer.java index 644f33ba6d5..d669c2138c4 100644 --- a/libjava/java/nio/DoubleBuffer.java +++ b/libjava/java/nio/DoubleBuffer.java @@ -53,13 +53,6 @@ public abstract class DoubleBuffer extends Buffer array_offset = 0; } - DoubleBuffer (double[] buffer, int offset, int capacity, int limit, int position, int mark) - { - super (capacity, limit, position, mark); - this.backing_buffer = buffer; - this.array_offset = offset; - } - /** * Allocates a new DoubleBuffer object with a given capacity. */ diff --git a/libjava/java/nio/DoubleBufferImpl.java b/libjava/java/nio/DoubleBufferImpl.java index 8dacec9be34..2c425dceb30 100644 --- a/libjava/java/nio/DoubleBufferImpl.java +++ b/libjava/java/nio/DoubleBufferImpl.java @@ -52,7 +52,9 @@ final class DoubleBufferImpl extends DoubleBuffer DoubleBufferImpl (double[] buffer, int offset, int capacity, int limit, int position, int mark, boolean readOnly) { - super (buffer, offset, capacity, limit, position, mark); + super (capacity, limit, position, mark); + this.backing_buffer = buffer; + this.array_offset = offset; this.readOnly = readOnly; } diff --git a/libjava/java/nio/FloatBuffer.java b/libjava/java/nio/FloatBuffer.java index 5fcfc8e6ec5..0c7b04dd0f5 100644 --- a/libjava/java/nio/FloatBuffer.java +++ b/libjava/java/nio/FloatBuffer.java @@ -53,13 +53,6 @@ public abstract class FloatBuffer extends Buffer array_offset = 0; } - FloatBuffer (float[] buffer, int offset, int capacity, int limit, int position, int mark) - { - super (capacity, limit, position, mark); - this.backing_buffer = buffer; - this.array_offset = offset; - } - /** * Allocates a new FloatBuffer object with a given capacity. */ diff --git a/libjava/java/nio/FloatBufferImpl.java b/libjava/java/nio/FloatBufferImpl.java index db0f52bb412..06584132499 100644 --- a/libjava/java/nio/FloatBufferImpl.java +++ b/libjava/java/nio/FloatBufferImpl.java @@ -52,7 +52,9 @@ final class FloatBufferImpl extends FloatBuffer FloatBufferImpl (float[] buffer, int offset, int capacity, int limit, int position, int mark, boolean readOnly) { - super (buffer, offset, capacity, limit, position, mark); + super (capacity, limit, position, mark); + this.backing_buffer = buffer; + this.array_offset = offset; this.readOnly = readOnly; } diff --git a/libjava/java/nio/IntBuffer.java b/libjava/java/nio/IntBuffer.java index 79167859541..469a344ea71 100644 --- a/libjava/java/nio/IntBuffer.java +++ b/libjava/java/nio/IntBuffer.java @@ -53,13 +53,6 @@ public abstract class IntBuffer extends Buffer array_offset = 0; } - IntBuffer (int[] buffer, int offset, int capacity, int limit, int position, int mark) - { - super (capacity, limit, position, mark); - this.backing_buffer = buffer; - this.array_offset = offset; - } - /** * Allocates a new IntBuffer object with a given capacity. */ diff --git a/libjava/java/nio/IntBufferImpl.java b/libjava/java/nio/IntBufferImpl.java index ec444c014c3..f142827104a 100644 --- a/libjava/java/nio/IntBufferImpl.java +++ b/libjava/java/nio/IntBufferImpl.java @@ -52,7 +52,9 @@ final class IntBufferImpl extends IntBuffer IntBufferImpl (int[] buffer, int offset, int capacity, int limit, int position, int mark, boolean readOnly) { - super (buffer, offset, capacity, limit, position, mark); + super (capacity, limit, position, mark); + this.backing_buffer = buffer; + this.array_offset = offset; this.readOnly = readOnly; } diff --git a/libjava/java/nio/LongBuffer.java b/libjava/java/nio/LongBuffer.java index a39a83d94e8..712e0b3b59a 100644 --- a/libjava/java/nio/LongBuffer.java +++ b/libjava/java/nio/LongBuffer.java @@ -53,13 +53,6 @@ public abstract class LongBuffer extends Buffer array_offset = 0; } - LongBuffer (long[] buffer, int offset, int capacity, int limit, int position, int mark) - { - super (capacity, limit, position, mark); - this.backing_buffer = buffer; - this.array_offset = offset; - } - /** * Allocates a new LongBuffer object with a given capacity. */ diff --git a/libjava/java/nio/LongBufferImpl.java b/libjava/java/nio/LongBufferImpl.java index b4fb3de5f8a..7f99f336686 100644 --- a/libjava/java/nio/LongBufferImpl.java +++ b/libjava/java/nio/LongBufferImpl.java @@ -52,7 +52,9 @@ final class LongBufferImpl extends LongBuffer LongBufferImpl (long[] buffer, int offset, int capacity, int limit, int position, int mark, boolean readOnly) { - super (buffer, offset, capacity, limit, position, mark); + super (capacity, limit, position, mark); + this.backing_buffer = buffer; + this.array_offset = offset; this.readOnly = readOnly; } diff --git a/libjava/java/nio/ShortBuffer.java b/libjava/java/nio/ShortBuffer.java index 6bd3de9c755..61097d04dd9 100644 --- a/libjava/java/nio/ShortBuffer.java +++ b/libjava/java/nio/ShortBuffer.java @@ -53,13 +53,6 @@ public abstract class ShortBuffer extends Buffer array_offset = 0; } - ShortBuffer (short[] buffer, int offset, int capacity, int limit, int position, int mark) - { - super (capacity, limit, position, mark); - this.backing_buffer = buffer; - this.array_offset = offset; - } - /** * Allocates a new ShortBuffer object with a given capacity. */ diff --git a/libjava/java/nio/ShortBufferImpl.java b/libjava/java/nio/ShortBufferImpl.java index 5f6c60137a1..938d5ce89d3 100644 --- a/libjava/java/nio/ShortBufferImpl.java +++ b/libjava/java/nio/ShortBufferImpl.java @@ -52,7 +52,9 @@ final class ShortBufferImpl extends ShortBuffer ShortBufferImpl (short[] buffer, int offset, int capacity, int limit, int position, int mark, boolean readOnly) { - super (buffer, offset, capacity, limit, position, mark); + super (capacity, limit, position, mark); + this.backing_buffer = buffer; + this.array_offset = offset; this.readOnly = readOnly; } -- 2.30.2