libjava

	* Regenerated headers with new gjavah.
libjava/classpath
	* tools/gnu/classpath/tools/javah/MethodHelper.java (print):
	Changed arguments.  Directly print method name.
	* tools/gnu/classpath/tools/javah/ClassWrapper.java
	(methodNameMap): New field.
	(makeVtable): Initialize it.
	(printMethods): Compute name for bridge targets.

From-SVN: r123965

8 files changed, 11 insertions, 11 deletions

diff --git a/libjava/java/nio/ByteBuffer.h b/libjava/java/nio/ByteBuffer.h
index 08f821b..7836894 100644
--- a/libjava/java/nio/ByteBuffer.h
+++ b/libjava/java/nio/ByteBuffer.h
@@ -47,7 +47,7 @@ public:
   virtual jint arrayOffset();
   virtual jint hashCode();
   virtual jboolean equals(::java::lang::Object *);
-  virtual jint target$compareTo(::java::nio::ByteBuffer *);
+  virtual jint ByteBuffer$compareTo(::java::nio::ByteBuffer *);
   virtual ::java::nio::ByteOrder * order();
   virtual ::java::nio::ByteBuffer * order(::java::nio::ByteOrder *);
   virtual jbyte get() = 0;
diff --git a/libjava/java/nio/CharBuffer.h b/libjava/java/nio/CharBuffer.h
index 9ab6d7e..3d33560 100644
--- a/libjava/java/nio/CharBuffer.h
+++ b/libjava/java/nio/CharBuffer.h
@@ -43,7 +43,7 @@ public:
   virtual jint arrayOffset();
   virtual jint hashCode();
   virtual jboolean equals(::java::lang::Object *);
-  virtual jint target$compareTo(::java::nio::CharBuffer *);
+  virtual jint CharBuffer$compareTo(::java::nio::CharBuffer *);
   virtual ::java::nio::ByteOrder * order() = 0;
   virtual jchar get() = 0;
   virtual ::java::nio::CharBuffer * put(jchar) = 0;
@@ -60,9 +60,9 @@ public:
   virtual ::java::nio::CharBuffer * put(::java::lang::String *, jint, jint);
   virtual ::java::nio::CharBuffer * put(::java::lang::String *);
   virtual jchar charAt(jint);
-  virtual ::java::nio::CharBuffer * target$append(jchar);
-  virtual ::java::nio::CharBuffer * target$append(::java::lang::CharSequence *);
-  virtual ::java::nio::CharBuffer * target$append(::java::lang::CharSequence *, jint, jint);
+  virtual ::java::nio::CharBuffer * CharBuffer$append(jchar);
+  virtual ::java::nio::CharBuffer * CharBuffer$append(::java::lang::CharSequence *);
+  virtual ::java::nio::CharBuffer * CharBuffer$append(::java::lang::CharSequence *, jint, jint);
   virtual ::java::lang::Appendable * append(::java::lang::CharSequence *, jint, jint);
   virtual ::java::lang::Appendable * append(::java::lang::CharSequence *);
   virtual ::java::lang::Appendable * append(jchar);
diff --git a/libjava/java/nio/DoubleBuffer.h b/libjava/java/nio/DoubleBuffer.h
index 4fb0ef0..e201a4f 100644
--- a/libjava/java/nio/DoubleBuffer.h
+++ b/libjava/java/nio/DoubleBuffer.h
@@ -40,7 +40,7 @@ public:
   virtual jint arrayOffset();
   virtual jint hashCode();
   virtual jboolean equals(::java::lang::Object *);
-  virtual jint target$compareTo(::java::nio::DoubleBuffer *);
+  virtual jint DoubleBuffer$compareTo(::java::nio::DoubleBuffer *);
   virtual ::java::nio::ByteOrder * order() = 0;
   virtual jdouble get() = 0;
   virtual ::java::nio::DoubleBuffer * put(jdouble) = 0;
diff --git a/libjava/java/nio/FloatBuffer.h b/libjava/java/nio/FloatBuffer.h
index 61c0214..18348f2 100644
--- a/libjava/java/nio/FloatBuffer.h
+++ b/libjava/java/nio/FloatBuffer.h
@@ -40,7 +40,7 @@ public:
   virtual jint arrayOffset();
   virtual jint hashCode();
   virtual jboolean equals(::java::lang::Object *);
-  virtual jint target$compareTo(::java::nio::FloatBuffer *);
+  virtual jint FloatBuffer$compareTo(::java::nio::FloatBuffer *);
   virtual ::java::nio::ByteOrder * order() = 0;
   virtual jfloat get() = 0;
   virtual ::java::nio::FloatBuffer * put(jfloat) = 0;
diff --git a/libjava/java/nio/IntBuffer.h b/libjava/java/nio/IntBuffer.h
index 0922342..e099d4a 100644
--- a/libjava/java/nio/IntBuffer.h
+++ b/libjava/java/nio/IntBuffer.h
@@ -40,7 +40,7 @@ public:
   virtual jint arrayOffset();
   virtual jint hashCode();
   virtual jboolean equals(::java::lang::Object *);
-  virtual jint target$compareTo(::java::nio::IntBuffer *);
+  virtual jint IntBuffer$compareTo(::java::nio::IntBuffer *);
   virtual ::java::nio::ByteOrder * order() = 0;
   virtual jint get() = 0;
   virtual ::java::nio::IntBuffer * put(jint) = 0;
diff --git a/libjava/java/nio/LongBuffer.h b/libjava/java/nio/LongBuffer.h
index f100e05..0e6ad30 100644
--- a/libjava/java/nio/LongBuffer.h
+++ b/libjava/java/nio/LongBuffer.h
@@ -40,7 +40,7 @@ public:
   virtual jint arrayOffset();
   virtual jint hashCode();
   virtual jboolean equals(::java::lang::Object *);
-  virtual jint target$compareTo(::java::nio::LongBuffer *);
+  virtual jint LongBuffer$compareTo(::java::nio::LongBuffer *);
   virtual ::java::nio::ByteOrder * order() = 0;
   virtual jlong get() = 0;
   virtual ::java::nio::LongBuffer * put(jlong) = 0;
diff --git a/libjava/java/nio/ShortBuffer.h b/libjava/java/nio/ShortBuffer.h
index 27b9814..ddcfc09 100644
--- a/libjava/java/nio/ShortBuffer.h
+++ b/libjava/java/nio/ShortBuffer.h
@@ -40,7 +40,7 @@ public:
   virtual jint arrayOffset();
   virtual jint hashCode();
   virtual jboolean equals(::java::lang::Object *);
-  virtual jint target$compareTo(::java::nio::ShortBuffer *);
+  virtual jint ShortBuffer$compareTo(::java::nio::ShortBuffer *);
   virtual ::java::nio::ByteOrder * order() = 0;
   virtual jshort get() = 0;
   virtual ::java::nio::ShortBuffer * put(jshort) = 0;
diff --git a/libjava/java/nio/charset/Charset.h b/libjava/java/nio/charset/Charset.h
index a2f3b3e..dabf467 100644
--- a/libjava/java/nio/charset/Charset.h
+++ b/libjava/java/nio/charset/Charset.h
@@ -62,7 +62,7 @@ public:
   virtual ::java::nio::ByteBuffer * encode(::java::nio::CharBuffer *);
   virtual ::java::nio::ByteBuffer * encode(::java::lang::String *);
   virtual ::java::nio::CharBuffer * decode(::java::nio::ByteBuffer *);
-  virtual jint target$compareTo(::java::nio::charset::Charset *);
+  virtual jint Charset$compareTo(::java::nio::charset::Charset *);
   virtual jint hashCode();
   virtual jboolean equals(::java::lang::Object *);
   virtual ::java::lang::String * toString();