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

5 files changed, 24 insertions, 24 deletions

diff --git a/libjava/java/io/CharArrayWriter.h b/libjava/java/io/CharArrayWriter.h
index 35f49d2..d5d2de3 100644
--- a/libjava/java/io/CharArrayWriter.h
+++ b/libjava/java/io/CharArrayWriter.h
@@ -26,18 +26,18 @@ public:
   virtual void write(JArray< jchar > *, jint, jint);
   virtual void write(::java::lang::String *, jint, jint);
   virtual void writeTo(::java::io::Writer *);
-  virtual ::java::io::CharArrayWriter * target$append(jchar);
-  virtual ::java::io::CharArrayWriter * target$append(::java::lang::CharSequence *);
-  virtual ::java::io::CharArrayWriter * target$append(::java::lang::CharSequence *, jint, jint);
+  virtual ::java::io::CharArrayWriter * CharArrayWriter$append(jchar);
+  virtual ::java::io::CharArrayWriter * CharArrayWriter$append(::java::lang::CharSequence *);
+  virtual ::java::io::CharArrayWriter * CharArrayWriter$append(::java::lang::CharSequence *, jint, jint);
 private:
   void resize(jint);
 public:
   virtual ::java::lang::Appendable * append(::java::lang::CharSequence *, jint, jint);
-  virtual ::java::io::Writer * target$append(::java::lang::CharSequence *, jint, jint);
+  virtual ::java::io::Writer * CharArrayWriter$append(::java::lang::CharSequence *, jint, jint);
   virtual ::java::lang::Appendable * append(::java::lang::CharSequence *);
-  virtual ::java::io::Writer * target$append(::java::lang::CharSequence *);
+  virtual ::java::io::Writer * CharArrayWriter$append(::java::lang::CharSequence *);
   virtual ::java::lang::Appendable * append(jchar);
-  virtual ::java::io::Writer * target$append(jchar);
+  virtual ::java::io::Writer * CharArrayWriter$append(jchar);
 private:
   static const jint DEFAULT_INITIAL_BUFFER_SIZE = 32;
 public: // actually protected
diff --git a/libjava/java/io/PrintStream.h b/libjava/java/io/PrintStream.h
index 3740fc7..b76912e 100644
--- a/libjava/java/io/PrintStream.h
+++ b/libjava/java/io/PrintStream.h
@@ -63,9 +63,9 @@ public:
   virtual void println(JArray< jchar > *);
   virtual void write(jint);
   virtual void write(JArray< jbyte > *, jint, jint);
-  virtual ::java::io::PrintStream * target$append(jchar);
-  virtual ::java::io::PrintStream * target$append(::java::lang::CharSequence *);
-  virtual ::java::io::PrintStream * target$append(::java::lang::CharSequence *, jint, jint);
+  virtual ::java::io::PrintStream * PrintStream$append(jchar);
+  virtual ::java::io::PrintStream * PrintStream$append(::java::lang::CharSequence *);
+  virtual ::java::io::PrintStream * PrintStream$append(::java::lang::CharSequence *, jint, jint);
   virtual ::java::io::PrintStream * printf(::java::lang::String *, JArray< ::java::lang::Object * > *);
   virtual ::java::io::PrintStream * printf(::java::util::Locale *, ::java::lang::String *, JArray< ::java::lang::Object * > *);
   virtual ::java::io::PrintStream * format(::java::lang::String *, JArray< ::java::lang::Object * > *);
diff --git a/libjava/java/io/PrintWriter.h b/libjava/java/io/PrintWriter.h
index 2cbbd04..cf1fb32 100644
--- a/libjava/java/io/PrintWriter.h
+++ b/libjava/java/io/PrintWriter.h
@@ -52,19 +52,19 @@ public:
   virtual void write(::java::lang::String *, jint, jint);
   virtual void write(JArray< jchar > *);
   virtual void write(::java::lang::String *);
-  virtual ::java::io::PrintWriter * target$append(jchar);
-  virtual ::java::io::PrintWriter * target$append(::java::lang::CharSequence *);
-  virtual ::java::io::PrintWriter * target$append(::java::lang::CharSequence *, jint, jint);
+  virtual ::java::io::PrintWriter * PrintWriter$append(jchar);
+  virtual ::java::io::PrintWriter * PrintWriter$append(::java::lang::CharSequence *);
+  virtual ::java::io::PrintWriter * PrintWriter$append(::java::lang::CharSequence *, jint, jint);
   virtual ::java::io::PrintWriter * printf(::java::lang::String *, JArray< ::java::lang::Object * > *);
   virtual ::java::io::PrintWriter * printf(::java::util::Locale *, ::java::lang::String *, JArray< ::java::lang::Object * > *);
   virtual ::java::io::PrintWriter * format(::java::lang::String *, JArray< ::java::lang::Object * > *);
   virtual ::java::io::PrintWriter * format(::java::util::Locale *, ::java::lang::String *, JArray< ::java::lang::Object * > *);
   virtual ::java::lang::Appendable * append(::java::lang::CharSequence *, jint, jint);
-  virtual ::java::io::Writer * target$append(::java::lang::CharSequence *, jint, jint);
+  virtual ::java::io::Writer * Writer$append(::java::lang::CharSequence *, jint, jint);
   virtual ::java::lang::Appendable * append(::java::lang::CharSequence *);
-  virtual ::java::io::Writer * target$append(::java::lang::CharSequence *);
+  virtual ::java::io::Writer * Writer$append(::java::lang::CharSequence *);
   virtual ::java::lang::Appendable * append(jchar);
-  virtual ::java::io::Writer * target$append(jchar);
+  virtual ::java::io::Writer * Writer$append(jchar);
 private:
   jboolean __attribute__((aligned(__alignof__( ::java::io::Writer)))) autoflush;
   jboolean error;
diff --git a/libjava/java/io/StringWriter.h b/libjava/java/io/StringWriter.h
index 16e6de5..c2933e7 100644
--- a/libjava/java/io/StringWriter.h
+++ b/libjava/java/io/StringWriter.h
@@ -24,15 +24,15 @@ public:
   virtual void write(JArray< jchar > *, jint, jint);
   virtual void write(::java::lang::String *);
   virtual void write(::java::lang::String *, jint, jint);
-  virtual ::java::io::StringWriter * target$append(jchar);
-  virtual ::java::io::StringWriter * target$append(::java::lang::CharSequence *);
-  virtual ::java::io::StringWriter * target$append(::java::lang::CharSequence *, jint, jint);
+  virtual ::java::io::StringWriter * StringWriter$append(jchar);
+  virtual ::java::io::StringWriter * StringWriter$append(::java::lang::CharSequence *);
+  virtual ::java::io::StringWriter * StringWriter$append(::java::lang::CharSequence *, jint, jint);
   virtual ::java::lang::Appendable * append(::java::lang::CharSequence *, jint, jint);
-  virtual ::java::io::Writer * target$append(::java::lang::CharSequence *, jint, jint);
+  virtual ::java::io::Writer * Writer$append(::java::lang::CharSequence *, jint, jint);
   virtual ::java::lang::Appendable * append(::java::lang::CharSequence *);
-  virtual ::java::io::Writer * target$append(::java::lang::CharSequence *);
+  virtual ::java::io::Writer * Writer$append(::java::lang::CharSequence *);
   virtual ::java::lang::Appendable * append(jchar);
-  virtual ::java::io::Writer * target$append(jchar);
+  virtual ::java::io::Writer * Writer$append(jchar);
 private:
   static const jint DEFAULT_BUFFER_SIZE = 16;
   ::java::lang::StringBuffer * __attribute__((aligned(__alignof__( ::java::io::Writer)))) buffer;
diff --git a/libjava/java/io/Writer.h b/libjava/java/io/Writer.h
index 61156647..148501a 100644
--- a/libjava/java/io/Writer.h
+++ b/libjava/java/io/Writer.h
@@ -24,9 +24,9 @@ public:
   virtual void write(JArray< jchar > *, jint, jint) = 0;
   virtual void write(::java::lang::String *);
   virtual void write(::java::lang::String *, jint, jint);
-  virtual ::java::io::Writer * target$append(jchar);
-  virtual ::java::io::Writer * target$append(::java::lang::CharSequence *);
-  virtual ::java::io::Writer * target$append(::java::lang::CharSequence *, jint, jint);
+  virtual ::java::io::Writer * Writer$append(jchar);
+  virtual ::java::io::Writer * Writer$append(::java::lang::CharSequence *);
+  virtual ::java::io::Writer * Writer$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);