This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Re: [patch] Import GNU Classpath (libgcj-import-20081021)
Andrew John Hughes writes:
> 2008/10/22 Matthias Klose <doko@cs.tu-berlin.de>:
> > This is a merge from the libgcj-import-20081022 tag into trunk,
> > to resolve some whitespace differences in nio, resort
> > tools/Makefile.am and update to classpath head. It would be nice if
> > somebody could review these changes. Bootstrap with and without java
> > maintainer mode on x86_64-linux-gnu succeeded, no regressions in the
> > libjava and mauve testsuites.
> >
> > Matthias
> >
> > libjava/
> >
> > 2008-10-22 Matthias Klose <doko@ubuntu.com>
> >
> > Import GNU Classpath (libgcj-import-20081022).
> >
> > * Regenerate class and header files.
> > * Regenerate auto* files.
> >
> > libjava/classpath/
> >
> > 2008-10-17 Robert Lougher <rob.lougher@gmail.com>
> >
> > * native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c
> > (Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoDrawGlyphVector):
> > Release 'fonts'.
> >
> > 2008-10-16 Tom Tromey <tromey@redhat.com>
> >
> > * tools/gnu/classpath/tools/jar/WorkSet.java (initSet): Use
> > foreach. Change argument type.
> > (WorkSet): Change argument type.
> > * tools/gnu/classpath/tools/jar/Indexer.java (indexJarFile): Use
> > foreach.
> > * tools/gnu/classpath/tools/jar/Creator.java
> > (writeCommandLineEntries): Use foreach.
> > (getAllEntries): Likewise.
> >
> > 2008-09-16 Andrew John Hughes <gnu_andrew@member.fsf.org>
> >
> > * java/lang/System.java (getenv): Reinstate
> > use of EnvironmentMap as opposed to raw
> > HashMap.
> >
> > 2008-09-16 Mario Torre <neugens@aicas.com>
> >
> > * java/lang/System.java (getenv): Fix env entries of the form
> > key=value=value=value not parsed correctly.
> >
>
> Mostly looks good. I'm concerned as to why this chunk is being
> removed:
>
> if test "x${REGENERATE_GJDOC_PARSER}" = xyes; then
> -dnl GCJ LOCAL
> - if test "x${enable_java_maintainer_mode}" = xyes; then
> - AC_PROG_JAVA
> AC_PROG_ANTLR(2,7,1)
> - fi
> -dnl END GCJ LOCAL
thanks. fixed.
> Other than that, the Classpath ChangeLog updates seem to be missing
> the ThreadLocal and NIO changes (one entry I think).
after the merge the ChangeLog in Classpath and in libjava/classpath
is the same.
Ok to check in?
Matthias
2008-10-22 Matthias Klose <doko@ubuntu.com>
Import GNU Classpath (libgcj-import-20081021).
* Regenerate class and header files.
* Regenerate auto* files.
classpath/
2008-10-17 Robert Lougher <rob.lougher@gmail.com>
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c
(Java_gnu_java_awt_peer_gtk_CairoGraphics2D_cairoDrawGlyphVector):
Release 'fonts'.
2008-10-16 Tom Tromey <tromey@redhat.com>
* tools/gnu/classpath/tools/jar/WorkSet.java (initSet): Use
foreach. Change argument type.
(WorkSet): Change argument type.
* tools/gnu/classpath/tools/jar/Indexer.java (indexJarFile): Use
foreach.
* tools/gnu/classpath/tools/jar/Creator.java
(writeCommandLineEntries): Use foreach.
(getAllEntries): Likewise.
2008-09-29 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_antlr.m4:
Check for antlr binary as well.
2008-09-28 Andrew John Hughes <gnu_andrew@member.fsf.org>
* configure.ac:
Always check for JAVA prior to ANTLR check.
* java/lang/ThreadLocal.java,
* java/lang/ThreadLocalMap.java:
Rename notFound back to sentinel to avoid
potential issues with use of the old name.
Cleanup formatting.
* java/nio/Buffer.java,
* java/nio/ByteBuffer.java,
* java/nio/ByteBufferImpl.java,
* java/nio/CharBuffer.java,
* java/nio/CharViewBufferImpl.java,
* java/nio/DirectByteBufferImpl.java,
* java/nio/DoubleBuffer.java,
* java/nio/DoubleBufferImpl.java,
* java/nio/FloatBuffer.java,
* java/nio/FloatBufferImpl.java,
* java/nio/IntBuffer.java,
* java/nio/LongBuffer.java,
* java/nio/LongBufferImpl.java,
* java/nio/MappedByteBuffer.java,
* java/nio/ShortBuffer.java,
* java/nio/ShortBufferImpl.java,
* java/nio/ShortViewBufferImpl.java:
Cleanup formatting.
2008-09-16 Andrew John Hughes <gnu_andrew@member.fsf.org>
* java/lang/System.java (getenv): Reinstate
use of EnvironmentMap as opposed to raw
HashMap.
2008-09-16 Mario Torre <neugens@aicas.com>
* java/lang/System.java (getenv): Fix env entries of the form
key=value=value=value not parsed correctly.
2008-09-15 Andrew John Hughes <gnu_andrew@member.fsf.org>
Reported by: Matthias Klose
* tools/Makefile.am:
Simplify the addition of the ANTLR
JAR file to the classpath.
2008-09-14 Matthias Klose <doko@ubuntu.com>
* m4/ac_prog_antlr.m4:
Allow use of runantlr on systems
which have it (Debian/Ubuntu).
Index: classpath/tools/gnu/classpath/tools/jar/Creator.java
===================================================================
--- classpath/tools/gnu/classpath/tools/jar/Creator.java (revision 141289)
+++ classpath/tools/gnu/classpath/tools/jar/Creator.java (working copy)
@@ -1,5 +1,5 @@
/* Creator.java - create a new jar file
- Copyright (C) 2006 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2008 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -49,7 +49,6 @@
import java.text.MessageFormat;
import java.util.ArrayList;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.jar.Attributes;
import java.util.jar.JarFile;
import java.util.jar.JarOutputStream;
@@ -179,13 +178,9 @@
private ArrayList<Entry> getAllEntries(Main parameters)
{
- Iterator it = parameters.entries.iterator();
ArrayList<Entry> allEntries = new ArrayList<Entry>();
- while (it.hasNext())
- {
- Entry entry = (Entry) it.next();
- addEntries(allEntries, entry);
- }
+ for (Entry entry : parameters.entries)
+ addEntries(allEntries, entry);
return allEntries;
}
@@ -196,13 +191,9 @@
writtenItems.add("META-INF/"); //$NON-NLS-1$
writtenItems.add(JarFile.MANIFEST_NAME);
- ArrayList allEntries = getAllEntries(parameters);
- Iterator it = allEntries.iterator();
- while (it.hasNext())
- {
- Entry entry = (Entry) it.next();
- writeFile(entry.file, entry.name, parameters.verbose);
- }
+ ArrayList<Entry> allEntries = getAllEntries(parameters);
+ for (Entry entry : allEntries)
+ writeFile(entry.file, entry.name, parameters.verbose);
}
protected Manifest createManifest(Main parameters)
Index: classpath/tools/gnu/classpath/tools/jar/Indexer.java
===================================================================
--- classpath/tools/gnu/classpath/tools/jar/Indexer.java (revision 141289)
+++ classpath/tools/gnu/classpath/tools/jar/Indexer.java (working copy)
@@ -1,5 +1,5 @@
/* Indexer.java -- add index.list file to jar
- Copyright (C) 2006 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2008 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -46,7 +46,6 @@
import java.io.OutputStream;
import java.text.MessageFormat;
import java.util.Enumeration;
-import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.StringTokenizer;
import java.util.jar.Attributes;
@@ -90,10 +89,9 @@
result.append(fileName);
// Any line ending will do.
result.append('\n');
- Iterator i = entries.iterator();
- while (i.hasNext())
+ for (String s : entries)
{
- result.append(i.next());
+ result.append(s);
result.append('\n');
}
// Paragraph break.
Index: classpath/tools/gnu/classpath/tools/jar/WorkSet.java
===================================================================
--- classpath/tools/gnu/classpath/tools/jar/WorkSet.java (revision 141289)
+++ classpath/tools/gnu/classpath/tools/jar/WorkSet.java (working copy)
@@ -1,5 +1,5 @@
/* WorkSet.java -- Helper to track what files to work on
- Copyright (C) 2006 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2008 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -40,21 +40,18 @@
import java.util.ArrayList;
import java.util.HashSet;
-import java.util.Iterator;
public class WorkSet
{
private HashSet<String> allItems;
- private void initSet(ArrayList entries)
+ private void initSet(ArrayList<Entry> entries)
{
if (entries == null || entries.isEmpty())
return;
allItems = new HashSet<String>();
- Iterator it = entries.iterator();
- while (it.hasNext())
+ for (Entry entry : entries)
{
- Entry entry = (Entry) it.next();
int len = entry.name.length();
while (len > 0 && entry.name.charAt(len - 1) == '/')
--len;
@@ -63,7 +60,7 @@
}
}
- public WorkSet(ArrayList entries)
+ public WorkSet(ArrayList<Entry> entries)
{
initSet(entries);
}
Index: classpath/tools/Makefile.am
===================================================================
--- classpath/tools/Makefile.am (revision 141289)
+++ classpath/tools/Makefile.am (working copy)
@@ -1,5 +1,16 @@
## Input file for automake to generate the Makefile.in used by configure
+if CREATE_GJDOC
+## GCJ LOCAL: always put source files in srcdir
+## if CREATE_GJDOC_PARSER
+## gjdoc_gendir = ${top_builddir}/tools/generated
+## else
+gjdoc_gendir = ${top_srcdir}/tools/generated
+## endif
+## END GCJ LOCAL
+ANTLR_CLASSPATH = $(ANTLR_JAR):$(gjdoc_gendir)
+endif
+
## GCJ LOCAL: use srcdir to find core classes.
GLIBJ_BOOTCLASSPATH='$(top_srcdir)/lib'
GLIBJ_CLASSPATH=.:$(srcdir)/asm:$(ANTLR_CLASSPATH)
@@ -12,17 +23,6 @@
JCOMPILER = $(JAVAC) $(JAVACFLAGS) -source 1.5 -target 1.5 -encoding UTF-8 -bootclasspath $(GLIBJ_BOOTCLASSPATH) -classpath $(GLIBJ_CLASSPATH)
endif
-if CREATE_GJDOC
-## GCJ LOCAL: always put source files in srcdir
-## if CREATE_GJDOC_PARSER
-## gjdoc_gendir = ${top_builddir}/tools/generated
-## else
-gjdoc_gendir = ${top_srcdir}/tools/generated
-## endif
-## END GCJ LOCAL
-ANTLR_CLASSPATH = $(ANTLR_JAR):$(gjdoc_gendir)
-endif
-
if CREATE_WRAPPERS
bin_SCRIPTS =
bin_PROGRAMS = gappletviewer gjarsigner gkeytool \
@@ -320,8 +320,19 @@
## GCJ LOCAL: put classes in srcdir
## @rm -rf classes asm
## @mkdir_p@ classes asm
+if JAVA_MAINTAINER_MODE
+if CREATE_GJDOC
+if CREATE_GJDOC_PARSER
+## Generate antlr sources.
+ @mkdir_p@ $(gjdoc_gendir)/gnu/classpath/tools/gjdoc/expr
+ $(ANTLR) -o $(gjdoc_gendir)/gnu/classpath/tools/gjdoc/expr/ \
+ $(srcdir)/gnu/classpath/tools/gjdoc/expr/java-expression.g
+endif
+endif
## Compile ASM separately as it is latin-1 encoded.
find $(srcdir)/external/asm -name '*.java' -print > asm.lst
+ AC=`echo $(JCOMPILER) | sed -e 's/UTF-8/ISO-8859-1/g'`; \
+ $$AC -g -w -d $(srcdir)/asm @asm.lst
find $(srcdir)/gnu/classpath/tools \
$(srcdir)/com/sun/javadoc \
$(srcdir)/com/sun/tools/doclets \
@@ -339,21 +350,9 @@
else \
echo -n > vm-tools.lst; \
fi
+ $(JCOMPILER) $(USE_JAVAC_FLAGS) -g -d $(srcdir)/classes @classes.lst @vm-tools.lst
cat classes.lst asm.lst vm-tools.lst > all-classes.lst
-if JAVA_MAINTAINER_MODE
-if CREATE_GJDOC
-if CREATE_GJDOC_PARSER
-## Generate antlr sources.
- @mkdir_p@ $(gjdoc_gendir)/gnu/classpath/tools/gjdoc/expr
- $(ANTLR) -o $(gjdoc_gendir)/gnu/classpath/tools/gjdoc/expr \
- $(srcdir)/gnu/classpath/tools/gjdoc/expr/java-expression.g
endif
-endif
-## Compile ASM separately as it is latin-1 encoded.
- AC=`echo $(JCOMPILER) | sed -e 's/UTF-8/ISO-8859-1/g'`; \
- $$AC -g -w -d $(srcdir)/asm @asm.lst
- $(JCOMPILER) $(USE_JAVAC_FLAGS) -g -d $(srcdir)/classes @classes.lst @vm-tools.lst
-endif
## END GCJ LOCAL
## Copy over tools resource files.
@list=`cd $(srcdir)/resource && find gnu/classpath/tools com/sun/tools/javac \
@@ -364,8 +363,10 @@
echo " cp $(srcdir)/resource/$$p classes/$$p"; \
cp $(srcdir)/resource/$$p classes/$$p; \
done
+## BEGIN GCJ LOCAL
cp -pR $(srcdir)/asm .
cp -pR $(srcdir)/classes .
+## END GCJ LOCAL
if CREATE_GJDOC
## Copy over gjdoc resource files.
for res in $(gjdoc_resources); do \
Index: classpath/configure.ac
===================================================================
--- classpath/configure.ac (revision 141289)
+++ classpath/configure.ac (working copy)
@@ -1015,18 +1015,17 @@
AC_SUBST(PATH_TO_GLIBJ_ZIP)
if test "x${TOOLSDIR}" != x; then
+ dnl GCJ LOCAL
if test "x${COMPILE_WRAPPERS}" = xno && test "x${enable_java_maintainer_mode}" = xyes; then
AC_PROG_JAVA
fi
+ dnl END GCJ LOCAL
if test "x${COMPILE_GJDOC}" = xyes; then
AC_LIB_ANTLR
- if test "x${REGENERATE_GJDOC_PARSER}" = xyes; then
-dnl GCJ LOCAL
- if test "x${enable_java_maintainer_mode}" = xyes; then
- AC_PROG_JAVA
+ dnl GCJ LOCAL
+ if test "x${REGENERATE_GJDOC_PARSER}" = xyes && test "x${enable_java_maintainer_mode}" = xyes; then
+ dnl END GCJ LOCAL
AC_PROG_ANTLR(2,7,1)
- fi
-dnl END GCJ LOCAL
fi
fi
fi
Index: classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c
===================================================================
--- classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c (revision 141289)
+++ classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_CairoGraphics2D.c (working copy)
@@ -1,5 +1,5 @@
/* gnu_java_awt_peer_gtk_CairoGraphics2d.c
- Copyright (C) 2006 Free Software Foundation, Inc.
+ Copyright (C) 2006, 2008 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -371,8 +371,9 @@
cairo_font_face_destroy (ft);
pango_fc_font_unlock_face(font);
}
- gdk_threads_leave();
+ gdk_threads_leave();
+ (*env)->ReleaseLongArrayElements (env, java_fontset, fonts, 0);
g_free(glyphs);
}
Index: classpath/java/lang/ThreadLocal.java
===================================================================
--- classpath/java/lang/ThreadLocal.java (revision 141289)
+++ classpath/java/lang/ThreadLocal.java (working copy)
@@ -90,7 +90,7 @@
* user. Do not expose this to the public. Package visible for use by
* InheritableThreadLocal
*/
- static final Object notFound = new Object();
+ static final Object sentinel = new Object();
/**
* The base for the computation of the next hash for a thread local.
@@ -100,7 +100,8 @@
/**
* Allocate a new hash.
*/
- private synchronized int computeNextHash() {
+ private synchronized int computeNextHash()
+ {
return nextHashBase++ * 6709;
}
@@ -144,7 +145,7 @@
// Note that we don't have to synchronize, as only this thread will
// ever modify the map.
T value = (T) map.get(this);
- if (value == notFound)
+ if (value == sentinel)
{
value = initialValue();
map.set(this, value);
Index: classpath/java/lang/System.java
===================================================================
--- classpath/java/lang/System.java (revision 141289)
+++ classpath/java/lang/System.java (working copy)
@@ -546,20 +546,28 @@
SecurityManager sm = SecurityManager.current; // Be thread-safe.
if (sm != null)
sm.checkPermission(new RuntimePermission("getenv.*"));
+
if (environmentMap == null)
{
- List<String> environ = (List<String>)VMSystem.environ();
Map<String,String> variables = new EnvironmentMap();
- for (String pair : environ)
- {
- String[] parts = pair.split("=");
- if (parts.length == 2)
- variables.put(parts[0], parts[1]);
- else
- variables.put(parts[0], "");
- }
- environmentMap = Collections.unmodifiableMap(variables);
+ List<String> environ = (List<String>)VMSystem.environ();
+ for (String envEntry : environ)
+ {
+ // avoid broken and null entries
+ if (envEntry != null && !envEntry.endsWith("="))
+ {
+ // it's perfectly legal that some entries may be in the form
+ // key=value=value=value
+ int equalSignIndex = envEntry.indexOf('=');
+ String key = envEntry.substring(0, equalSignIndex);
+ String value = envEntry.substring(equalSignIndex + 1);
+ variables.put(key, value);
+ }
+ }
+
+ environmentMap = Collections.unmodifiableMap(variables);
}
+
return environmentMap;
}
Index: classpath/java/nio/Buffer.java
===================================================================
--- classpath/java/nio/Buffer.java (revision 141289)
+++ classpath/java/nio/Buffer.java (working copy)
@@ -56,7 +56,8 @@
*
* Should be package private.
*/
- Buffer (int capacity, int limit, int position, int mark, Pointer address)
+ Buffer (int capacity, int limit, int position, int mark,
+ Pointer address)
{
this.address = address;
Index: classpath/java/nio/IntBuffer.java
===================================================================
--- classpath/java/nio/IntBuffer.java (revision 141289)
+++ classpath/java/nio/IntBuffer.java (working copy)
@@ -50,8 +50,8 @@
final int array_offset;
final int[] backing_buffer;
- IntBuffer (int capacity, int limit, int position, int mark, RawData address,
- int[] backing_buffer, int array_offset)
+ IntBuffer (int capacity, int limit, int position, int mark,
+ RawData address, int[] backing_buffer, int array_offset)
{
super (capacity, limit, position, mark, address);
this.backing_buffer = backing_buffer;
Index: classpath/java/nio/ShortViewBufferImpl.java
===================================================================
--- classpath/java/nio/ShortViewBufferImpl.java (revision 141289)
+++ classpath/java/nio/ShortViewBufferImpl.java (working copy)
@@ -49,7 +49,8 @@
ShortViewBufferImpl (ByteBuffer bb, int capacity)
{
super (capacity, capacity, 0, -1, bb.isDirect() ?
- VMDirectByteBuffer.adjustAddress(bb.address, bb.position()):null, null, 0);
+ VMDirectByteBuffer.adjustAddress(bb.address, bb.position()):null,
+ null, 0);
this.bb = bb;
this.offset = bb.position();
this.readOnly = bb.isReadOnly();
@@ -61,7 +62,8 @@
boolean readOnly, ByteOrder endian)
{
super (capacity, limit, position, mark, bb.isDirect() ?
- VMDirectByteBuffer.adjustAddress(bb.address, offset):null, null, 0);
+ VMDirectByteBuffer.adjustAddress(bb.address, offset):null,
+ null, 0);
this.bb = bb;
this.offset = offset;
this.readOnly = readOnly;
Index: classpath/java/nio/DirectByteBufferImpl.java
===================================================================
--- classpath/java/nio/DirectByteBufferImpl.java (revision 141289)
+++ classpath/java/nio/DirectByteBufferImpl.java (working copy)
@@ -1,4 +1,4 @@
-/* DirectByteBufferImpl.java --
+/* DirectByteBufferImpl.java --
Copyright (C) 2003, 2004 Free Software Foundation, Inc.
This file is part of GNU Classpath.
@@ -60,8 +60,8 @@
static final class ReadOnly extends DirectByteBufferImpl
{
ReadOnly(Object owner, Pointer address,
- int capacity, int limit,
- int position)
+ int capacity, int limit,
+ int position)
{
super(owner, address, capacity, limit, position);
}
@@ -89,9 +89,14 @@
super(capacity);
}
+ ReadWrite(Pointer address, int capacity)
+ {
+ super(address, capacity);
+ }
+
ReadWrite(Object owner, Pointer address,
- int capacity, int limit,
- int position)
+ int capacity, int limit,
+ int position)
{
super(owner, address, capacity, limit, position);
}
@@ -104,13 +109,20 @@
DirectByteBufferImpl(int capacity)
{
- super(capacity, capacity, 0, -1, VMDirectByteBuffer.allocate(capacity), null, 0);
+ super(capacity, capacity, 0, -1,
+ VMDirectByteBuffer.allocate(capacity), null, 0);
this.owner = this;
}
+ DirectByteBufferImpl(Pointer address, int capacity)
+ {
+ super(capacity, capacity, 0, -1, address, null, 0);
+ this.owner = null;
+ }
+
DirectByteBufferImpl(Object owner, Pointer address,
- int capacity, int limit,
- int position)
+ int capacity, int limit,
+ int position)
{
super(capacity, limit, position, -1, address, null, 0);
this.owner = owner;
@@ -118,7 +130,7 @@
/**
* Allocates a new direct byte buffer.
- */
+ */
public static ByteBuffer allocate(int capacity)
{
return new DirectByteBufferImpl.ReadWrite(capacity);
@@ -129,7 +141,7 @@
if (owner == this)
VMDirectByteBuffer.free(address);
}
-
+
public byte get()
{
checkForUnderflow();
@@ -168,7 +180,7 @@
position(pos + 1);
return this;
}
-
+
public ByteBuffer put(int index, byte value)
{
checkIndex(index);
@@ -176,24 +188,23 @@
VMDirectByteBuffer.put(address, index, value);
return this;
}
-
+
public ByteBuffer put (byte[] src, int offset, int length)
{
checkArraySize (src.length, offset, length);
checkForUnderflow (length);
-
int index = position ();
VMDirectByteBuffer.put (address, index, src, offset, length);
position (index + length);
-
+
return this;
}
-
+
void shiftDown(int dst_offset, int src_offset, int count)
{
VMDirectByteBuffer.shiftDown(address, dst_offset, src_offset, count);
}
-
+
public ByteBuffer compact()
{
checkIfReadOnly();
@@ -201,15 +212,15 @@
int pos = position();
if (pos > 0)
{
- int count = remaining();
- VMDirectByteBuffer.shiftDown(address, 0, pos, count);
- position(count);
- limit(capacity());
+ int count = remaining();
+ VMDirectByteBuffer.shiftDown(address, 0, pos, count);
+ position(count);
+ limit(capacity());
}
else
{
- position(limit());
- limit(capacity());
+ position(limit());
+ limit(capacity());
}
return this;
}
@@ -244,9 +255,9 @@
if (mark != pos)
{
- result.position(mark);
- result.mark();
- result.position(pos);
+ result.position(mark);
+ result.mark();
+ result.position(pos);
}
return result;
}
@@ -300,18 +311,18 @@
{
return ByteBufferHelper.getChar(this, order());
}
-
+
public ByteBuffer putChar(char value)
{
ByteBufferHelper.putChar(this, value, order());
return this;
}
-
+
public char getChar(int index)
{
return ByteBufferHelper.getChar(this, index, order());
}
-
+
public ByteBuffer putChar(int index, char value)
{
ByteBufferHelper.putChar(this, index, value, order());
@@ -322,18 +333,18 @@
{
return ByteBufferHelper.getShort(this, order());
}
-
+
public ByteBuffer putShort(short value)
{
ByteBufferHelper.putShort(this, value, order());
return this;
}
-
+
public short getShort(int index)
{
return ByteBufferHelper.getShort(this, index, order());
}
-
+
public ByteBuffer putShort(int index, short value)
{
ByteBufferHelper.putShort(this, index, value, order());
@@ -344,18 +355,18 @@
{
return ByteBufferHelper.getInt(this, order());
}
-
+
public ByteBuffer putInt(int value)
{
ByteBufferHelper.putInt(this, value, order());
return this;
}
-
+
public int getInt(int index)
{
return ByteBufferHelper.getInt(this, index, order());
}
-
+
public ByteBuffer putInt(int index, int value)
{
ByteBufferHelper.putInt(this, index, value, order());
@@ -366,18 +377,18 @@
{
return ByteBufferHelper.getLong(this, order());
}
-
+
public ByteBuffer putLong(long value)
{
ByteBufferHelper.putLong(this, value, order());
return this;
}
-
+
public long getLong(int index)
{
return ByteBufferHelper.getLong(this, index, order());
}
-
+
public ByteBuffer putLong(int index, long value)
{
ByteBufferHelper.putLong(this, index, value, order());
@@ -388,13 +399,13 @@
{
return ByteBufferHelper.getFloat(this, order());
}
-
+
public ByteBuffer putFloat(float value)
{
ByteBufferHelper.putFloat(this, value, order());
return this;
}
-
+
public float getFloat(int index)
{
return ByteBufferHelper.getFloat(this, index, order());
@@ -416,12 +427,12 @@
ByteBufferHelper.putDouble(this, value, order());
return this;
}
-
+
public double getDouble(int index)
{
return ByteBufferHelper.getDouble(this, index, order());
}
-
+
public ByteBuffer putDouble(int index, double value)
{
ByteBufferHelper.putDouble(this, index, value, order());