Mercurial > people > rkennke > jdk9-shenandoah-final > nashorn
changeset 1266:26c3094182d6
8066751: Remove casts redundant with Java 9 buffer APIs
Reviewed-by: hannesw, sundar
line wrap: on
line diff
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeArrayBuffer.java Wed May 06 20:04:42 2015 +0530 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeArrayBuffer.java Wed May 06 16:48:31 2015 +0200 @@ -28,7 +28,6 @@ import static jdk.nashorn.internal.runtime.ECMAErrors.typeError; import java.nio.ByteBuffer; - import jdk.nashorn.internal.objects.annotations.Attribute; import jdk.nashorn.internal.objects.annotations.Constructor; import jdk.nashorn.internal.objects.annotations.Function; @@ -227,10 +226,10 @@ } ByteBuffer getBuffer(final int offset) { - return (ByteBuffer)nb.duplicate().position(offset); + return nb.duplicate().position(offset); } ByteBuffer getBuffer(final int offset, final int length) { - return (ByteBuffer)getBuffer(offset).limit(length); + return getBuffer(offset).limit(length); } }
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeFloat32Array.java Wed May 06 20:04:42 2015 +0530 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeFloat32Array.java Wed May 06 16:48:31 2015 +0200 @@ -81,7 +81,7 @@ private static final MethodHandle SET_ELEM = specialCall(MethodHandles.lookup(), Float32ArrayData.class, "setElem", void.class, int.class, double.class).methodHandle(); private Float32ArrayData(final FloatBuffer nb, final int start, final int end) { - super(((FloatBuffer)nb.position(start).limit(end)).slice(), end - start); + super(nb.position(start).limit(end).slice(), end - start); } @Override
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeFloat64Array.java Wed May 06 20:04:42 2015 +0530 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeFloat64Array.java Wed May 06 16:48:31 2015 +0200 @@ -81,7 +81,7 @@ private static final MethodHandle SET_ELEM = specialCall(MethodHandles.lookup(), Float64ArrayData.class, "setElem", void.class, int.class, double.class).methodHandle(); private Float64ArrayData(final DoubleBuffer nb, final int start, final int end) { - super(((DoubleBuffer)nb.position(start).limit(end)).slice(), end - start); + super(nb.position(start).limit(end).slice(), end - start); } @Override
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeInt16Array.java Wed May 06 20:04:42 2015 +0530 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeInt16Array.java Wed May 06 16:48:31 2015 +0200 @@ -82,7 +82,7 @@ private static final MethodHandle SET_ELEM = specialCall(MethodHandles.lookup(), Int16ArrayData.class, "setElem", void.class, int.class, int.class).methodHandle(); private Int16ArrayData(final ShortBuffer nb, final int start, final int end) { - super(((ShortBuffer)nb.position(start).limit(end)).slice(), end - start); + super(nb.position(start).limit(end).slice(), end - start); } @Override
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeInt32Array.java Wed May 06 20:04:42 2015 +0530 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeInt32Array.java Wed May 06 16:48:31 2015 +0200 @@ -81,7 +81,7 @@ private static final MethodHandle SET_ELEM = specialCall(MethodHandles.lookup(), Int32ArrayData.class, "setElem", void.class, int.class, int.class).methodHandle(); private Int32ArrayData(final IntBuffer nb, final int start, final int end) { - super(((IntBuffer)nb.position(start).limit(end)).slice(), end - start); + super(nb.position(start).limit(end).slice(), end - start); } @Override
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeInt8Array.java Wed May 06 20:04:42 2015 +0530 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeInt8Array.java Wed May 06 16:48:31 2015 +0200 @@ -80,7 +80,7 @@ private static final MethodHandle SET_ELEM = specialCall(MethodHandles.lookup(), Int8ArrayData.class, "setElem", void.class, int.class, int.class).methodHandle(); private Int8ArrayData(final ByteBuffer nb, final int start, final int end) { - super(((ByteBuffer)nb.position(start).limit(end)).slice(), end - start); + super(nb.position(start).limit(end).slice(), end - start); } @Override
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint16Array.java Wed May 06 20:04:42 2015 +0530 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint16Array.java Wed May 06 16:48:31 2015 +0200 @@ -81,7 +81,7 @@ private static final MethodHandle SET_ELEM = specialCall(MethodHandles.lookup(), Uint16ArrayData.class, "setElem", void.class, int.class, int.class).methodHandle(); private Uint16ArrayData(final CharBuffer nb, final int start, final int end) { - super(((CharBuffer)nb.position(start).limit(end)).slice(), end - start); + super(nb.position(start).limit(end).slice(), end - start); } @Override
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint32Array.java Wed May 06 20:04:42 2015 +0530 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint32Array.java Wed May 06 16:48:31 2015 +0200 @@ -82,7 +82,7 @@ private static final MethodHandle SET_ELEM = specialCall(MethodHandles.lookup(), Uint32ArrayData.class, "setElem", void.class, int.class, int.class).methodHandle(); private Uint32ArrayData(final IntBuffer nb, final int start, final int end) { - super(((IntBuffer)nb.position(start).limit(end)).slice(), end - start); + super(nb.position(start).limit(end).slice(), end - start); } @Override
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint8Array.java Wed May 06 20:04:42 2015 +0530 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint8Array.java Wed May 06 16:48:31 2015 +0200 @@ -81,7 +81,7 @@ private static final MethodHandle SET_ELEM = specialCall(MethodHandles.lookup(), Uint8ArrayData.class, "setElem", void.class, int.class, int.class).methodHandle(); private Uint8ArrayData(final ByteBuffer nb, final int start, final int end) { - super(((ByteBuffer)nb.position(start).limit(end)).slice(), end - start); + super(nb.position(start).limit(end).slice(), end - start); } @Override
--- a/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint8ClampedArray.java Wed May 06 20:04:42 2015 +0530 +++ b/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeUint8ClampedArray.java Wed May 06 16:48:31 2015 +0200 @@ -85,7 +85,7 @@ private static final MethodHandle CLAMP_LONG = staticCall(MethodHandles.lookup(), Uint8ClampedArrayData.class, "clampLong", long.class, long.class).methodHandle(); private Uint8ClampedArrayData(final ByteBuffer nb, final int start, final int end) { - super(((ByteBuffer)nb.position(start).limit(end)).slice(), end - start); + super(nb.position(start).limit(end).slice(), end - start); } @Override