summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectCharBufferTest.java3
-rw-r--r--harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectDoubleBufferTest.java3
-rw-r--r--harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectFloatBufferTest.java3
-rw-r--r--harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectIntBufferTest.java3
-rw-r--r--harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectLongBufferTest.java3
-rw-r--r--harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectShortBufferTest.java3
-rw-r--r--luni/src/main/java/libcore/io/NioBufferIterator.java10
-rw-r--r--luni/src/test/java/libcore/java/nio/BufferTest.java13
-rw-r--r--luni/src/test/java/libcore/libcore/io/MemoryMappedFileTest.java7
-rw-r--r--luni/src/test/java/libcore/libcore/io/MemoryTest.java13
-rw-r--r--ojluni/src/main/java/java/nio/DirectByteBuffer.java49
11 files changed, 50 insertions, 60 deletions
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectCharBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectCharBufferTest.java
index 80a9be4fc9..a276b02110 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectCharBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectCharBufferTest.java
@@ -20,7 +20,6 @@ import java.nio.ByteOrder;
import java.nio.CharBuffer;
import java.nio.DirectByteBuffer;
import java.nio.NIOAccess;
-import libcore.io.SizeOf;
public class DirectCharBufferTest extends CharBufferTest {
@@ -66,7 +65,7 @@ public class DirectCharBufferTest extends CharBufferTest {
// Check if the NIOAccess method adds up the current position value.
charBuffer.put('b');
- assertEquals(charBufferBasePointer + SizeOf.CHAR, NIOAccess.getBasePointer(charBuffer));
+ assertEquals(charBufferBasePointer + Character.BYTES, NIOAccess.getBasePointer(charBuffer));
}
public void testIsDirect() {
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectDoubleBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectDoubleBufferTest.java
index f27c897c35..dff392b8b9 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectDoubleBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectDoubleBufferTest.java
@@ -20,7 +20,6 @@ import java.nio.ByteOrder;
import java.nio.DirectByteBuffer;
import java.nio.DoubleBuffer;
import java.nio.NIOAccess;
-import libcore.io.SizeOf;
public class DirectDoubleBufferTest extends DoubleBufferTest {
public void setUp(){
@@ -65,7 +64,7 @@ public class DirectDoubleBufferTest extends DoubleBufferTest {
// Check if the NIOAccess method adds up the current position value.
doubleBuffer.put(1.0);
- assertEquals(doubleBufferBasePointer + SizeOf.DOUBLE, NIOAccess.getBasePointer(doubleBuffer));
+ assertEquals(doubleBufferBasePointer + Double.BYTES, NIOAccess.getBasePointer(doubleBuffer));
}
public void testIsDirect() {
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectFloatBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectFloatBufferTest.java
index ecbd542e8e..c52065cca0 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectFloatBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectFloatBufferTest.java
@@ -20,7 +20,6 @@ import java.nio.ByteOrder;
import java.nio.DirectByteBuffer;
import java.nio.FloatBuffer;
import java.nio.NIOAccess;
-import libcore.io.SizeOf;
public class DirectFloatBufferTest extends FloatBufferTest {
public void setUp(){
@@ -66,7 +65,7 @@ public class DirectFloatBufferTest extends FloatBufferTest {
// Check if the NIOAccess method adds up the current position value.
floatBuffer.put((float)1);
- assertEquals(floatBufferBasePointer + SizeOf.FLOAT, NIOAccess.getBasePointer(floatBuffer));
+ assertEquals(floatBufferBasePointer + Float.BYTES, NIOAccess.getBasePointer(floatBuffer));
}
public void testIsDirect() {
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectIntBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectIntBufferTest.java
index 4421ba077e..0a66e7261c 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectIntBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectIntBufferTest.java
@@ -20,7 +20,6 @@ import java.nio.ByteOrder;
import java.nio.DirectByteBuffer;
import java.nio.IntBuffer;
import java.nio.NIOAccess;
-import libcore.io.SizeOf;
public class DirectIntBufferTest extends IntBufferTest {
public void setUp(){
@@ -66,7 +65,7 @@ public class DirectIntBufferTest extends IntBufferTest {
// Check if the NIOAccess method adds up the current position value.
intBuffer.put(1);
- assertEquals(intBufferBasePointer + SizeOf.INT, NIOAccess.getBasePointer(intBuffer));
+ assertEquals(intBufferBasePointer + Integer.BYTES, NIOAccess.getBasePointer(intBuffer));
}
public void testIsDirect() {
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectLongBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectLongBufferTest.java
index 4bcd1976b2..bd54ee469d 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectLongBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectLongBufferTest.java
@@ -20,7 +20,6 @@ import java.nio.ByteOrder;
import java.nio.DirectByteBuffer;
import java.nio.LongBuffer;
import java.nio.NIOAccess;
-import libcore.io.SizeOf;
public class DirectLongBufferTest extends LongBufferTest {
public void setUp(){
@@ -66,7 +65,7 @@ public class DirectLongBufferTest extends LongBufferTest {
// Check if the NIOAccess method adds up the current position value.
longBuffer.put(1L);
- assertEquals(longBufferBasePointer + SizeOf.LONG, NIOAccess.getBasePointer(longBuffer));
+ assertEquals(longBufferBasePointer + Long.BYTES, NIOAccess.getBasePointer(longBuffer));
}
public void testIsDirect() {
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectShortBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectShortBufferTest.java
index e1b91a8504..e84eb66659 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectShortBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectShortBufferTest.java
@@ -20,7 +20,6 @@ import java.nio.ByteOrder;
import java.nio.DirectByteBuffer;
import java.nio.NIOAccess;
import java.nio.ShortBuffer;
-import libcore.io.SizeOf;
public class DirectShortBufferTest extends ShortBufferTest {
public void setUp(){
@@ -66,7 +65,7 @@ public class DirectShortBufferTest extends ShortBufferTest {
// Check if the NIOAccess method adds up the current position value.
shortBuffer.put((short)1);
- assertEquals(shortBufferBasePointer + SizeOf.SHORT, NIOAccess.getBasePointer(shortBuffer));
+ assertEquals(shortBufferBasePointer + Short.BYTES, NIOAccess.getBasePointer(shortBuffer));
}
public void testIsDirect() {
diff --git a/luni/src/main/java/libcore/io/NioBufferIterator.java b/luni/src/main/java/libcore/io/NioBufferIterator.java
index 0f3f920cbe..263666d445 100644
--- a/luni/src/main/java/libcore/io/NioBufferIterator.java
+++ b/luni/src/main/java/libcore/io/NioBufferIterator.java
@@ -81,16 +81,16 @@ public final class NioBufferIterator extends BufferIterator {
public int readInt() {
file.checkNotClosed();
- checkReadBounds(position, length, SizeOf.INT);
+ checkReadBounds(position, length, Integer.BYTES);
int result = Memory.peekInt(address + position, swap);
- position += SizeOf.INT;
+ position += Integer.BYTES;
return result;
}
public void readIntArray(int[] dst, int dstOffset, int intCount) {
checkDstBounds(dstOffset, dst.length, intCount);
file.checkNotClosed();
- final int byteCount = SizeOf.INT * intCount;
+ final int byteCount = Integer.BYTES * intCount;
checkReadBounds(position, length, byteCount);
Memory.peekIntArray(address + position, dst, dstOffset, intCount, swap);
position += byteCount;
@@ -98,9 +98,9 @@ public final class NioBufferIterator extends BufferIterator {
public short readShort() {
file.checkNotClosed();
- checkReadBounds(position, length, SizeOf.SHORT);
+ checkReadBounds(position, length, Short.BYTES);
short result = Memory.peekShort(address + position, swap);
- position += SizeOf.SHORT;
+ position += Short.BYTES;
return result;
}
diff --git a/luni/src/test/java/libcore/java/nio/BufferTest.java b/luni/src/test/java/libcore/java/nio/BufferTest.java
index 206f37d95b..f808092f0d 100644
--- a/luni/src/test/java/libcore/java/nio/BufferTest.java
+++ b/luni/src/test/java/libcore/java/nio/BufferTest.java
@@ -40,7 +40,6 @@ import java.nio.ShortBuffer;
import java.nio.channels.FileChannel;
import java.util.Arrays;
import libcore.io.Memory;
-import libcore.io.SizeOf;
import libcore.java.lang.ref.FinalizationTester;
public class BufferTest extends TestCase {
@@ -887,14 +886,14 @@ public class BufferTest extends TestCase {
// of this buffer.
assertEquals(1, 1 << ByteBuffer.allocate(0).getElementSizeShift());
- assertEquals(SizeOf.CHAR, 1 << CharBuffer.allocate(0).getElementSizeShift());
- assertEquals(SizeOf.SHORT, 1 << ShortBuffer.allocate(0).getElementSizeShift());
+ assertEquals(Character.BYTES, 1 << CharBuffer.allocate(0).getElementSizeShift());
+ assertEquals(Short.BYTES, 1 << ShortBuffer.allocate(0).getElementSizeShift());
- assertEquals(SizeOf.INT, 1 << IntBuffer.allocate(0).getElementSizeShift());
- assertEquals(SizeOf.FLOAT, 1 << FloatBuffer.allocate(0).getElementSizeShift());
+ assertEquals(Integer.BYTES, 1 << IntBuffer.allocate(0).getElementSizeShift());
+ assertEquals(Float.BYTES, 1 << FloatBuffer.allocate(0).getElementSizeShift());
- assertEquals(SizeOf.LONG, 1 << LongBuffer.allocate(0).getElementSizeShift());
- assertEquals(SizeOf.DOUBLE, 1 << DoubleBuffer.allocate(0).getElementSizeShift());
+ assertEquals(Long.BYTES, 1 << LongBuffer.allocate(0).getElementSizeShift());
+ assertEquals(Double.BYTES, 1 << DoubleBuffer.allocate(0).getElementSizeShift());
}
public void testFreed() {
diff --git a/luni/src/test/java/libcore/libcore/io/MemoryMappedFileTest.java b/luni/src/test/java/libcore/libcore/io/MemoryMappedFileTest.java
index 93cc543794..1936ea75a6 100644
--- a/luni/src/test/java/libcore/libcore/io/MemoryMappedFileTest.java
+++ b/luni/src/test/java/libcore/libcore/io/MemoryMappedFileTest.java
@@ -30,7 +30,6 @@ import java.util.Arrays;
import java.util.function.Function;
import libcore.io.BufferIterator;
import libcore.io.MemoryMappedFile;
-import libcore.io.SizeOf;
import libcore.testing.io.TestIoUtils;
public class MemoryMappedFileTest extends TestCase {
@@ -594,7 +593,7 @@ public class MemoryMappedFileTest extends TestCase {
iterator.readIntArray(dst, 1, intCount);
assertArrayEquals(expectedInts, dst);
- assertEquals(posBefore + (intCount * SizeOf.INT), iterator.pos());
+ assertEquals(posBefore + (intCount * Integer.BYTES), iterator.pos());
}
private static void assertReadIntFails(BufferIterator iterator) {
@@ -610,7 +609,7 @@ public class MemoryMappedFileTest extends TestCase {
private static void assertReadIntSucceeds(BufferIterator iterator, int expectedValue) {
int posBefore = iterator.pos();
assertEquals(expectedValue, iterator.readInt());
- assertEquals(posBefore + SizeOf.INT, iterator.pos());
+ assertEquals(posBefore + Integer.BYTES, iterator.pos());
}
private static void assertReadShortFails(BufferIterator iterator) {
@@ -626,7 +625,7 @@ public class MemoryMappedFileTest extends TestCase {
private static void assertReadShortSucceeds(BufferIterator iterator, short expectedValue) {
int posBefore = iterator.pos();
assertEquals(expectedValue, iterator.readShort());
- assertEquals(posBefore + SizeOf.SHORT, iterator.pos());
+ assertEquals(posBefore + Short.BYTES, iterator.pos());
}
private static void assertReadByteFails(BufferIterator iterator) {
diff --git a/luni/src/test/java/libcore/libcore/io/MemoryTest.java b/luni/src/test/java/libcore/libcore/io/MemoryTest.java
index c2603b28fd..80ff4ea56a 100644
--- a/luni/src/test/java/libcore/libcore/io/MemoryTest.java
+++ b/luni/src/test/java/libcore/libcore/io/MemoryTest.java
@@ -22,7 +22,6 @@ import java.util.Arrays;
import junit.framework.TestCase;
import libcore.io.Memory;
-import libcore.io.SizeOf;
public class MemoryTest extends TestCase {
public void testSetIntArray() {
@@ -32,7 +31,7 @@ public class MemoryTest extends TestCase {
swappedValues[i] = Integer.reverseBytes(values[i]);
}
- int scale = SizeOf.INT;
+ int scale = Integer.BYTES;
VMRuntime runtime = VMRuntime.getRuntime();
byte[] array = (byte[]) runtime.newNonMovableArray(byte.class, scale * values.length + 1);
long base_ptr = runtime.addressOf(array);
@@ -62,7 +61,7 @@ public class MemoryTest extends TestCase {
private void assertIntsEqual(int[] expectedValues, long ptr, boolean swap) {
for (int i = 0; i < expectedValues.length; ++i) {
- assertEquals(expectedValues[i], Memory.peekInt(ptr + SizeOf.INT * i, swap));
+ assertEquals(expectedValues[i], Memory.peekInt(ptr + Integer.BYTES * i, swap));
}
}
@@ -73,7 +72,7 @@ public class MemoryTest extends TestCase {
swappedValues[i] = Long.reverseBytes(values[i]);
}
- int scale = SizeOf.LONG;
+ int scale = Long.BYTES;
VMRuntime runtime = VMRuntime.getRuntime();
byte[] array = (byte[]) runtime.newNonMovableArray(byte.class, scale * values.length + 1);
long base_ptr = runtime.addressOf(array);
@@ -103,7 +102,7 @@ public class MemoryTest extends TestCase {
private void assertLongsEqual(long[] expectedValues, long ptr, boolean swap) {
for (int i = 0; i < expectedValues.length; ++i) {
- assertEquals(expectedValues[i], Memory.peekLong(ptr + SizeOf.LONG * i, swap));
+ assertEquals(expectedValues[i], Memory.peekLong(ptr + Long.BYTES * i, swap));
}
}
@@ -111,7 +110,7 @@ public class MemoryTest extends TestCase {
short[] values = { 0x0001, 0x0020, 0x0300, 0x4000 };
short[] swappedValues = { 0x0100, 0x2000, 0x0003, 0x0040 };
- int scale = SizeOf.SHORT;
+ int scale = Short.BYTES;
VMRuntime runtime = VMRuntime.getRuntime();
byte[] array = (byte[]) runtime.newNonMovableArray(byte.class, scale * values.length + 1);
long base_ptr = runtime.addressOf(array);
@@ -141,7 +140,7 @@ public class MemoryTest extends TestCase {
private void assertShortsEqual(short[] expectedValues, long ptr, boolean swap) {
for (int i = 0; i < expectedValues.length; ++i) {
- assertEquals(expectedValues[i], Memory.peekShort(ptr + SizeOf.SHORT * i, swap));
+ assertEquals(expectedValues[i], Memory.peekShort(ptr + Short.BYTES * i, swap));
}
}
}
diff --git a/ojluni/src/main/java/java/nio/DirectByteBuffer.java b/ojluni/src/main/java/java/nio/DirectByteBuffer.java
index f12fd7b4d2..3e06011585 100644
--- a/ojluni/src/main/java/java/nio/DirectByteBuffer.java
+++ b/ojluni/src/main/java/java/nio/DirectByteBuffer.java
@@ -30,7 +30,6 @@ import java.io.FileDescriptor;
import dalvik.system.VMRuntime;
import libcore.io.Memory;
-import libcore.io.SizeOf;
import sun.misc.Cleaner;
import sun.nio.ch.DirectBuffer;
@@ -349,7 +348,7 @@ public class DirectByteBuffer extends MappedByteBuffer implements DirectBuffer {
if (!memoryRef.isAccessible) {
throw new IllegalStateException("buffer is inaccessible");
}
- int newPosition = position + SizeOf.CHAR;
+ int newPosition = position + Character.BYTES;
if (newPosition > limit()) {
throw new BufferUnderflowException();
}
@@ -363,7 +362,7 @@ public class DirectByteBuffer extends MappedByteBuffer implements DirectBuffer {
if (!memoryRef.isAccessible) {
throw new IllegalStateException("buffer is inaccessible");
}
- checkIndex(i, SizeOf.CHAR);
+ checkIndex(i, Character.BYTES);
return (char) Memory.peekShort(ix(i), !nativeByteOrder);
}
@@ -397,7 +396,7 @@ public class DirectByteBuffer extends MappedByteBuffer implements DirectBuffer {
if (isReadOnly) {
throw new ReadOnlyBufferException();
}
- putChar(ix(nextPutIndex(SizeOf.CHAR)), x);
+ putChar(ix(nextPutIndex(Character.BYTES)), x);
return this;
}
@@ -409,7 +408,7 @@ public class DirectByteBuffer extends MappedByteBuffer implements DirectBuffer {
if (isReadOnly) {
throw new ReadOnlyBufferException();
}
- putChar(ix(checkIndex(i, SizeOf.CHAR)), x);
+ putChar(ix(checkIndex(i, Character.BYTES)), x);
return this;
}
@@ -458,7 +457,7 @@ public class DirectByteBuffer extends MappedByteBuffer implements DirectBuffer {
if (!memoryRef.isAccessible) {
throw new IllegalStateException("buffer is inaccessible");
}
- return getShort(ix(nextGetIndex(SizeOf.SHORT)));
+ return getShort(ix(nextGetIndex(Short.BYTES)));
}
@Override
@@ -466,7 +465,7 @@ public class DirectByteBuffer extends MappedByteBuffer implements DirectBuffer {
if (!memoryRef.isAccessible) {
throw new IllegalStateException("buffer is inaccessible");
}
- return getShort(ix(checkIndex(i, SizeOf.SHORT)));
+ return getShort(ix(checkIndex(i, Short.BYTES)));
}
@Override
@@ -499,7 +498,7 @@ public class DirectByteBuffer extends MappedByteBuffer implements DirectBuffer {
if (isReadOnly) {
throw new ReadOnlyBufferException();
}
- putShort(ix(nextPutIndex(SizeOf.SHORT)), x);
+ putShort(ix(nextPutIndex(Short.BYTES)), x);
return this;
}
@@ -511,7 +510,7 @@ public class DirectByteBuffer extends MappedByteBuffer implements DirectBuffer {
if (isReadOnly) {
throw new ReadOnlyBufferException();
}
- putShort(ix(checkIndex(i, SizeOf.SHORT)), x);
+ putShort(ix(checkIndex(i, Short.BYTES)), x);
return this;
}
@@ -560,7 +559,7 @@ public class DirectByteBuffer extends MappedByteBuffer implements DirectBuffer {
if (!memoryRef.isAccessible) {
throw new IllegalStateException("buffer is inaccessible");
}
- return getInt(ix(nextGetIndex(SizeOf.INT)));
+ return getInt(ix(nextGetIndex(Integer.BYTES)));
}
@Override
@@ -568,7 +567,7 @@ public class DirectByteBuffer extends MappedByteBuffer implements DirectBuffer {
if (!memoryRef.isAccessible) {
throw new IllegalStateException("buffer is inaccessible");
}
- return getInt(ix(checkIndex(i, (SizeOf.INT))));
+ return getInt(ix(checkIndex(i, (Integer.BYTES))));
}
@Override
@@ -601,7 +600,7 @@ public class DirectByteBuffer extends MappedByteBuffer implements DirectBuffer {
if (isReadOnly) {
throw new ReadOnlyBufferException();
}
- putInt(ix(nextPutIndex(SizeOf.INT)), x);
+ putInt(ix(nextPutIndex(Integer.BYTES)), x);
return this;
}
@@ -613,7 +612,7 @@ public class DirectByteBuffer extends MappedByteBuffer implements DirectBuffer {
if (isReadOnly) {
throw new ReadOnlyBufferException();
}
- putInt(ix(checkIndex(i, SizeOf.INT)), x);
+ putInt(ix(checkIndex(i, Integer.BYTES)), x);
return this;
}
@@ -662,7 +661,7 @@ public class DirectByteBuffer extends MappedByteBuffer implements DirectBuffer {
if (!memoryRef.isAccessible) {
throw new IllegalStateException("buffer is inaccessible");
}
- return getLong(ix(nextGetIndex(SizeOf.LONG)));
+ return getLong(ix(nextGetIndex(Long.BYTES)));
}
@Override
@@ -670,7 +669,7 @@ public class DirectByteBuffer extends MappedByteBuffer implements DirectBuffer {
if (!memoryRef.isAccessible) {
throw new IllegalStateException("buffer is inaccessible");
}
- return getLong(ix(checkIndex(i, SizeOf.LONG)));
+ return getLong(ix(checkIndex(i, Long.BYTES)));
}
@Override
@@ -703,7 +702,7 @@ public class DirectByteBuffer extends MappedByteBuffer implements DirectBuffer {
if (isReadOnly) {
throw new ReadOnlyBufferException();
}
- putLong(ix(nextPutIndex(SizeOf.LONG)), x);
+ putLong(ix(nextPutIndex(Long.BYTES)), x);
return this;
}
@@ -715,7 +714,7 @@ public class DirectByteBuffer extends MappedByteBuffer implements DirectBuffer {
if (isReadOnly) {
throw new ReadOnlyBufferException();
}
- putLong(ix(checkIndex(i, SizeOf.LONG)), x);
+ putLong(ix(checkIndex(i, Long.BYTES)), x);
return this;
}
@@ -765,7 +764,7 @@ public class DirectByteBuffer extends MappedByteBuffer implements DirectBuffer {
if (!memoryRef.isAccessible) {
throw new IllegalStateException("buffer is inaccessible");
}
- return getFloat(ix(nextGetIndex(SizeOf.FLOAT)));
+ return getFloat(ix(nextGetIndex(Float.BYTES)));
}
@Override
@@ -773,7 +772,7 @@ public class DirectByteBuffer extends MappedByteBuffer implements DirectBuffer {
if (!memoryRef.isAccessible) {
throw new IllegalStateException("buffer is inaccessible");
}
- return getFloat(ix(checkIndex(i, SizeOf.FLOAT)));
+ return getFloat(ix(checkIndex(i, Float.BYTES)));
}
@Override
@@ -807,7 +806,7 @@ public class DirectByteBuffer extends MappedByteBuffer implements DirectBuffer {
if (isReadOnly) {
throw new ReadOnlyBufferException();
}
- putFloat(ix(nextPutIndex(SizeOf.FLOAT)), x);
+ putFloat(ix(nextPutIndex(Float.BYTES)), x);
return this;
}
@@ -819,7 +818,7 @@ public class DirectByteBuffer extends MappedByteBuffer implements DirectBuffer {
if (isReadOnly) {
throw new ReadOnlyBufferException();
}
- putFloat(ix(checkIndex(i, SizeOf.FLOAT)), x);
+ putFloat(ix(checkIndex(i, Float.BYTES)), x);
return this;
}
@@ -869,7 +868,7 @@ public class DirectByteBuffer extends MappedByteBuffer implements DirectBuffer {
if (!memoryRef.isAccessible) {
throw new IllegalStateException("buffer is inaccessible");
}
- return getDouble(ix(nextGetIndex(SizeOf.DOUBLE)));
+ return getDouble(ix(nextGetIndex(Double.BYTES)));
}
@Override
@@ -877,7 +876,7 @@ public class DirectByteBuffer extends MappedByteBuffer implements DirectBuffer {
if (!memoryRef.isAccessible) {
throw new IllegalStateException("buffer is inaccessible");
}
- return getDouble(ix(checkIndex(i, SizeOf.DOUBLE)));
+ return getDouble(ix(checkIndex(i, Double.BYTES)));
}
@Override
@@ -911,7 +910,7 @@ public class DirectByteBuffer extends MappedByteBuffer implements DirectBuffer {
if (isReadOnly) {
throw new ReadOnlyBufferException();
}
- putDouble(ix(nextPutIndex(SizeOf.DOUBLE)), x);
+ putDouble(ix(nextPutIndex(Double.BYTES)), x);
return this;
}
@@ -923,7 +922,7 @@ public class DirectByteBuffer extends MappedByteBuffer implements DirectBuffer {
if (isReadOnly) {
throw new ReadOnlyBufferException();
}
- putDouble(ix(checkIndex(i, SizeOf.DOUBLE)), x);
+ putDouble(ix(checkIndex(i, Double.BYTES)), x);
return this;
}