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

14 files changed, 20 insertions, 20 deletions

diff --git a/libjava/java/lang/Boolean.h b/libjava/java/lang/Boolean.h
index a8476f7..0ead5b5 100644
--- a/libjava/java/lang/Boolean.h
+++ b/libjava/java/lang/Boolean.h
@@ -22,7 +22,7 @@ public:
   jint hashCode();
   jboolean equals(::java::lang::Object *);
   static jboolean getBoolean(::java::lang::String *);
-  jint target$compareTo(::java::lang::Boolean *);
+  jint Boolean$compareTo(::java::lang::Boolean *);
   static jboolean parseBoolean(::java::lang::String *);
   jint compareTo(::java::lang::Object *);
 private:
diff --git a/libjava/java/lang/Byte.h b/libjava/java/lang/Byte.h
index 2caccd7..fc9e3b3 100644
--- a/libjava/java/lang/Byte.h
+++ b/libjava/java/lang/Byte.h
@@ -32,7 +32,7 @@ public:
   ::java::lang::String * toString();
   jint hashCode();
   jboolean equals(::java::lang::Object *);
-  jint target$compareTo(::java::lang::Byte *);
+  jint Byte$compareTo(::java::lang::Byte *);
   jint compareTo(::java::lang::Object *);
 private:
   static const jlong serialVersionUID = -7183698231559129828LL;
diff --git a/libjava/java/lang/Character.h b/libjava/java/lang/Character.h
index 7c3a4b9..a214470 100644
--- a/libjava/java/lang/Character.h
+++ b/libjava/java/lang/Character.h
@@ -76,7 +76,7 @@ public:
   static jbyte getDirectionality(jint);
   static jboolean isMirrored(jchar);
   static jboolean isMirrored(jint);
-  jint target$compareTo(::java::lang::Character *);
+  jint Character$compareTo(::java::lang::Character *);
   static ::java::lang::Character * valueOf(jchar);
   static jchar reverseBytes(jchar);
   static JArray< jchar > * toChars(jint);
diff --git a/libjava/java/lang/Double.h b/libjava/java/lang/Double.h
index 5fb99da..7808acc 100644
--- a/libjava/java/lang/Double.h
+++ b/libjava/java/lang/Double.h
@@ -35,7 +35,7 @@ public:
   static jlong doubleToLongBits(jdouble);
   static jlong doubleToRawLongBits(jdouble);
   static jdouble longBitsToDouble(jlong);
-  jint target$compareTo(::java::lang::Double *);
+  jint Double$compareTo(::java::lang::Double *);
   static jint compare(jdouble, jdouble);
   jint compareTo(::java::lang::Object *);
 private:
diff --git a/libjava/java/lang/Enum.h b/libjava/java/lang/Enum.h
index cb3aabc..a75f276 100644
--- a/libjava/java/lang/Enum.h
+++ b/libjava/java/lang/Enum.h
@@ -18,7 +18,7 @@ public:
   virtual jboolean equals(::java::lang::Object *);
   virtual jint hashCode();
   virtual ::java::lang::String * toString();
-  virtual jint target$compareTo(::java::lang::Enum *);
+  virtual jint Enum$compareTo(::java::lang::Enum *);
 public: // actually protected
   virtual ::java::lang::Object * clone();
 public:
diff --git a/libjava/java/lang/Float.h b/libjava/java/lang/Float.h
index 87859cb..0069df4 100644
--- a/libjava/java/lang/Float.h
+++ b/libjava/java/lang/Float.h
@@ -36,7 +36,7 @@ public:
   static jint floatToIntBits(jfloat);
   static jint floatToRawIntBits(jfloat);
   static jfloat intBitsToFloat(jint);
-  jint target$compareTo(::java::lang::Float *);
+  jint Float$compareTo(::java::lang::Float *);
   static jint compare(jfloat, jfloat);
   jint compareTo(::java::lang::Object *);
 private:
diff --git a/libjava/java/lang/Integer.h b/libjava/java/lang/Integer.h
index e33c78f..aebcd0a 100644
--- a/libjava/java/lang/Integer.h
+++ b/libjava/java/lang/Integer.h
@@ -39,7 +39,7 @@ public:
   static ::java::lang::Integer * getInteger(::java::lang::String *, jint);
   static ::java::lang::Integer * getInteger(::java::lang::String *, ::java::lang::Integer *);
   static ::java::lang::Integer * decode(::java::lang::String *);
-  jint target$compareTo(::java::lang::Integer *);
+  jint Integer$compareTo(::java::lang::Integer *);
   static jint bitCount(jint);
   static jint rotateLeft(jint, jint);
   static jint rotateRight(jint, jint);
diff --git a/libjava/java/lang/Long.h b/libjava/java/lang/Long.h
index da04281..b0358e6 100644
--- a/libjava/java/lang/Long.h
+++ b/libjava/java/lang/Long.h
@@ -37,7 +37,7 @@ public:
   static ::java::lang::Long * getLong(::java::lang::String *);
   static ::java::lang::Long * getLong(::java::lang::String *, jlong);
   static ::java::lang::Long * getLong(::java::lang::String *, ::java::lang::Long *);
-  jint target$compareTo(::java::lang::Long *);
+  jint Long$compareTo(::java::lang::Long *);
   static jint bitCount(jlong);
   static jlong rotateLeft(jlong, jint);
   static jlong rotateRight(jlong, jint);
diff --git a/libjava/java/lang/Short.h b/libjava/java/lang/Short.h
index 4267117..4858db5 100644
--- a/libjava/java/lang/Short.h
+++ b/libjava/java/lang/Short.h
@@ -32,7 +32,7 @@ public:
   ::java::lang::String * toString();
   jint hashCode();
   jboolean equals(::java::lang::Object *);
-  jint target$compareTo(::java::lang::Short *);
+  jint Short$compareTo(::java::lang::Short *);
   static jshort reverseBytes(jshort);
   jint compareTo(::java::lang::Object *);
 private:
diff --git a/libjava/java/lang/String$CaseInsensitiveComparator.h b/libjava/java/lang/String$CaseInsensitiveComparator.h
index b0c3d62..8a1b121 100644
--- a/libjava/java/lang/String$CaseInsensitiveComparator.h
+++ b/libjava/java/lang/String$CaseInsensitiveComparator.h
@@ -14,7 +14,7 @@ class java::lang::String$CaseInsensitiveComparator : public ::java::lang::Object
 public: // actually package-private
   String$CaseInsensitiveComparator();
 public:
-  jint target$compare(::java::lang::String *, ::java::lang::String *);
+  jint String$CaseInsensitiveComparator$compare(::java::lang::String *, ::java::lang::String *);
   jint compare(::java::lang::Object *, ::java::lang::Object *);
 private:
   static const jlong serialVersionUID = 8575799808933029326LL;
diff --git a/libjava/java/lang/String.h b/libjava/java/lang/String.h
index eea80fb..5fa06de 100644
--- a/libjava/java/lang/String.h
+++ b/libjava/java/lang/String.h
@@ -62,7 +62,7 @@ public:
   jboolean contentEquals(::java::lang::StringBuffer *);
   jboolean contentEquals(::java::lang::CharSequence *);
   jboolean equalsIgnoreCase(::java::lang::String *);
-  jint target$compareTo(::java::lang::String *);
+  jint String$compareTo(::java::lang::String *);
 private:
   jint nativeCompareTo(::java::lang::String *);
 public:
diff --git a/libjava/java/lang/StringBuffer.h b/libjava/java/lang/StringBuffer.h
index 07400f7..983ef98 100644
--- a/libjava/java/lang/StringBuffer.h
+++ b/libjava/java/lang/StringBuffer.h
@@ -34,9 +34,9 @@ public:
   ::java::lang::StringBuffer * append(JArray< jchar > *, jint, jint);
   ::java::lang::StringBuffer * appendCodePoint(jint);
   ::java::lang::StringBuffer * append(jboolean);
-  ::java::lang::StringBuffer * target$append(jchar);
-  ::java::lang::StringBuffer * target$append(::java::lang::CharSequence *);
-  ::java::lang::StringBuffer * target$append(::java::lang::CharSequence *, jint, jint);
+  ::java::lang::StringBuffer * StringBuffer$append(jchar);
+  ::java::lang::StringBuffer * StringBuffer$append(::java::lang::CharSequence *);
+  ::java::lang::StringBuffer * StringBuffer$append(::java::lang::CharSequence *, jint, jint);
   ::java::lang::StringBuffer * append(jint);
   ::java::lang::StringBuffer * append(jlong);
   ::java::lang::StringBuffer * append(jfloat);
diff --git a/libjava/java/lang/StringBuilder.h b/libjava/java/lang/StringBuilder.h
index d34cd86..b8b504a 100644
--- a/libjava/java/lang/StringBuilder.h
+++ b/libjava/java/lang/StringBuilder.h
@@ -31,9 +31,9 @@ public:
   ::java::lang::StringBuilder * append(JArray< jchar > *);
   ::java::lang::StringBuilder * append(JArray< jchar > *, jint, jint);
   ::java::lang::StringBuilder * append(jboolean);
-  ::java::lang::StringBuilder * target$append(jchar);
-  ::java::lang::StringBuilder * target$append(::java::lang::CharSequence *);
-  ::java::lang::StringBuilder * target$append(::java::lang::CharSequence *, jint, jint);
+  ::java::lang::StringBuilder * StringBuilder$append(jchar);
+  ::java::lang::StringBuilder * StringBuilder$append(::java::lang::CharSequence *);
+  ::java::lang::StringBuilder * StringBuilder$append(::java::lang::CharSequence *, jint, jint);
   ::java::lang::StringBuilder * appendCodePoint(jint);
   ::java::lang::StringBuilder * append(jint);
   ::java::lang::StringBuilder * append(jlong);
diff --git a/libjava/java/lang/System$EnvironmentMap.h b/libjava/java/lang/System$EnvironmentMap.h
index 1220f57..c8ef8aa 100644
--- a/libjava/java/lang/System$EnvironmentMap.h
+++ b/libjava/java/lang/System$EnvironmentMap.h
@@ -18,10 +18,10 @@ public:
   virtual jboolean containsKey(::java::lang::Object *);
   virtual jboolean containsValue(::java::lang::Object *);
   virtual ::java::util::Set * entrySet();
-  virtual ::java::lang::String * target$get(::java::lang::Object *);
+  virtual ::java::lang::String * System$EnvironmentMap$get(::java::lang::Object *);
   virtual ::java::util::Set * keySet();
-  virtual ::java::lang::String * target$put(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * target$remove(::java::lang::Object *);
+  virtual ::java::lang::String * System$EnvironmentMap$put(::java::lang::String *, ::java::lang::String *);
+  virtual ::java::lang::String * System$EnvironmentMap$remove(::java::lang::Object *);
   virtual ::java::util::Collection * values();
   virtual ::java::lang::Object * get(::java::lang::Object *);
   virtual ::java::lang::Object * remove(::java::lang::Object *);