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

16 files changed, 36 insertions, 36 deletions

diff --git a/libjava/gnu/java/security/action/GetPropertyAction.h b/libjava/gnu/java/security/action/GetPropertyAction.h
index ce401be..e3ab183 100644
--- a/libjava/gnu/java/security/action/GetPropertyAction.h
+++ b/libjava/gnu/java/security/action/GetPropertyAction.h
@@ -31,7 +31,7 @@ public:
   GetPropertyAction();
   GetPropertyAction(::java::lang::String *);
   GetPropertyAction(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * target$run();
+  virtual ::java::lang::String * GetPropertyAction$run();
   virtual ::gnu::java::security::action::GetPropertyAction * setParameters(::java::lang::String *);
   virtual ::gnu::java::security::action::GetPropertyAction * setParameters(::java::lang::String *, ::java::lang::String *);
   virtual ::java::lang::Object * run();
diff --git a/libjava/gnu/java/security/action/GetSecurityPropertyAction.h b/libjava/gnu/java/security/action/GetSecurityPropertyAction.h
index 7308876..b10ee5d 100644
--- a/libjava/gnu/java/security/action/GetSecurityPropertyAction.h
+++ b/libjava/gnu/java/security/action/GetSecurityPropertyAction.h
@@ -33,7 +33,7 @@ public:
   GetSecurityPropertyAction(::java::lang::String *, ::java::lang::String *);
   virtual ::gnu::java::security::action::GetSecurityPropertyAction * setParameters(::java::lang::String *);
   virtual ::gnu::java::security::action::GetSecurityPropertyAction * setParameters(::java::lang::String *, ::java::lang::String *);
-  virtual ::java::lang::String * target$run();
+  virtual ::java::lang::String * GetSecurityPropertyAction$run();
   virtual ::java::lang::Object * run();
 private:
   ::java::lang::String * __attribute__((aligned(__alignof__( ::java::lang::Object)))) name;
diff --git a/libjava/gnu/javax/net/ssl/provider/AbstractHandshake$1.h b/libjava/gnu/javax/net/ssl/provider/AbstractHandshake$1.h
index 2e88834..eaef0d0 100644
--- a/libjava/gnu/javax/net/ssl/provider/AbstractHandshake$1.h
+++ b/libjava/gnu/javax/net/ssl/provider/AbstractHandshake$1.h
@@ -34,7 +34,7 @@ class gnu::javax::net::ssl::provider::AbstractHandshake$1 : public ::java::lang:
 public: // actually package-private
   AbstractHandshake$1(::gnu::javax::net::ssl::provider::AbstractHandshake$CertVerifier *);
 public:
-  ::java::lang::ClassLoader * target$run();
+  ::java::lang::ClassLoader * AbstractHandshake$1$run();
   ::java::lang::Object * run();
 public: // actually package-private
   ::gnu::javax::net::ssl::provider::AbstractHandshake$CertVerifier * __attribute__((aligned(__alignof__( ::java::lang::Object)))) this$1;
diff --git a/libjava/gnu/javax/net/ssl/provider/CertificateStatusRequest$ResponderIdIterator.h b/libjava/gnu/javax/net/ssl/provider/CertificateStatusRequest$ResponderIdIterator.h
index ce75fe6..b19a13f 100644
--- a/libjava/gnu/javax/net/ssl/provider/CertificateStatusRequest$ResponderIdIterator.h
+++ b/libjava/gnu/javax/net/ssl/provider/CertificateStatusRequest$ResponderIdIterator.h
@@ -35,7 +35,7 @@ class gnu::javax::net::ssl::provider::CertificateStatusRequest$ResponderIdIterat
 
 public:
   CertificateStatusRequest$ResponderIdIterator(::gnu::javax::net::ssl::provider::CertificateStatusRequest *);
-  virtual JArray< jbyte > * target$next();
+  virtual JArray< jbyte > * CertificateStatusRequest$ResponderIdIterator$next();
   virtual jboolean hasNext();
   virtual void remove();
   virtual ::java::lang::Object * next();
diff --git a/libjava/gnu/javax/net/ssl/provider/CertificateURL$Iterator.h b/libjava/gnu/javax/net/ssl/provider/CertificateURL$Iterator.h
index 9809890..059ea01 100644
--- a/libjava/gnu/javax/net/ssl/provider/CertificateURL$Iterator.h
+++ b/libjava/gnu/javax/net/ssl/provider/CertificateURL$Iterator.h
@@ -34,7 +34,7 @@ class gnu::javax::net::ssl::provider::CertificateURL$Iterator : public ::java::l
 
 public:
   CertificateURL$Iterator(::gnu::javax::net::ssl::provider::CertificateURL *);
-  virtual ::gnu::javax::net::ssl::provider::CertificateURL$URLAndOptionalHash * target$next();
+  virtual ::gnu::javax::net::ssl::provider::CertificateURL$URLAndOptionalHash * CertificateURL$Iterator$next();
   virtual jboolean hasNext();
   virtual void remove();
   virtual ::java::lang::Object * next();
diff --git a/libjava/gnu/javax/net/ssl/provider/CipherSuiteList$Iterator.h b/libjava/gnu/javax/net/ssl/provider/CipherSuiteList$Iterator.h
index 0d206f0..2cf1f2f 100644
--- a/libjava/gnu/javax/net/ssl/provider/CipherSuiteList$Iterator.h
+++ b/libjava/gnu/javax/net/ssl/provider/CipherSuiteList$Iterator.h
@@ -35,15 +35,15 @@ class gnu::javax::net::ssl::provider::CipherSuiteList$Iterator : public ::java::
 public: // actually package-private
   CipherSuiteList$Iterator(::gnu::javax::net::ssl::provider::CipherSuiteList *);
 public:
-  virtual void target$add(::gnu::javax::net::ssl::provider::CipherSuite *);
+  virtual void CipherSuiteList$Iterator$add(::gnu::javax::net::ssl::provider::CipherSuite *);
   virtual jboolean hasNext();
   virtual jboolean hasPrevious();
-  virtual ::gnu::javax::net::ssl::provider::CipherSuite * target$next();
+  virtual ::gnu::javax::net::ssl::provider::CipherSuite * CipherSuiteList$Iterator$next();
   virtual jint nextIndex();
-  virtual ::gnu::javax::net::ssl::provider::CipherSuite * target$previous();
+  virtual ::gnu::javax::net::ssl::provider::CipherSuite * CipherSuiteList$Iterator$previous();
   virtual jint previousIndex();
   virtual void remove();
-  virtual void target$set(::gnu::javax::net::ssl::provider::CipherSuite *);
+  virtual void CipherSuiteList$Iterator$set(::gnu::javax::net::ssl::provider::CipherSuite *);
   virtual ::java::lang::Object * next();
   virtual ::java::lang::Object * previous();
   virtual void add(::java::lang::Object *);
diff --git a/libjava/gnu/javax/net/ssl/provider/ClientCertificateTypeList$Iterator.h b/libjava/gnu/javax/net/ssl/provider/ClientCertificateTypeList$Iterator.h
index 215e4b3..7d9d7ad 100644
--- a/libjava/gnu/javax/net/ssl/provider/ClientCertificateTypeList$Iterator.h
+++ b/libjava/gnu/javax/net/ssl/provider/ClientCertificateTypeList$Iterator.h
@@ -35,15 +35,15 @@ class gnu::javax::net::ssl::provider::ClientCertificateTypeList$Iterator : publi
 public: // actually package-private
   ClientCertificateTypeList$Iterator(::gnu::javax::net::ssl::provider::ClientCertificateTypeList *);
 public:
-  virtual void target$add(::gnu::javax::net::ssl::provider::CertificateRequest$ClientCertificateType *);
+  virtual void ClientCertificateTypeList$Iterator$add(::gnu::javax::net::ssl::provider::CertificateRequest$ClientCertificateType *);
   virtual jboolean hasNext();
   virtual jboolean hasPrevious();
-  virtual ::gnu::javax::net::ssl::provider::CertificateRequest$ClientCertificateType * target$next();
+  virtual ::gnu::javax::net::ssl::provider::CertificateRequest$ClientCertificateType * ClientCertificateTypeList$Iterator$next();
   virtual jint nextIndex();
-  virtual ::gnu::javax::net::ssl::provider::CertificateRequest$ClientCertificateType * target$previous();
+  virtual ::gnu::javax::net::ssl::provider::CertificateRequest$ClientCertificateType * ClientCertificateTypeList$Iterator$previous();
   virtual jint previousIndex();
   virtual void remove();
-  virtual void target$set(::gnu::javax::net::ssl::provider::CertificateRequest$ClientCertificateType *);
+  virtual void ClientCertificateTypeList$Iterator$set(::gnu::javax::net::ssl::provider::CertificateRequest$ClientCertificateType *);
   virtual ::java::lang::Object * next();
   virtual ::java::lang::Object * previous();
   virtual void add(::java::lang::Object *);
diff --git a/libjava/gnu/javax/net/ssl/provider/CompressionMethodList$Iterator.h b/libjava/gnu/javax/net/ssl/provider/CompressionMethodList$Iterator.h
index 44519e1..6eff62d 100644
--- a/libjava/gnu/javax/net/ssl/provider/CompressionMethodList$Iterator.h
+++ b/libjava/gnu/javax/net/ssl/provider/CompressionMethodList$Iterator.h
@@ -35,15 +35,15 @@ class gnu::javax::net::ssl::provider::CompressionMethodList$Iterator : public ::
 public: // actually package-private
   CompressionMethodList$Iterator(::gnu::javax::net::ssl::provider::CompressionMethodList *);
 public:
-  virtual void target$add(::gnu::javax::net::ssl::provider::CompressionMethod *);
+  virtual void CompressionMethodList$Iterator$add(::gnu::javax::net::ssl::provider::CompressionMethod *);
   virtual jboolean hasNext();
   virtual jboolean hasPrevious();
-  virtual ::gnu::javax::net::ssl::provider::CompressionMethod * target$next();
+  virtual ::gnu::javax::net::ssl::provider::CompressionMethod * CompressionMethodList$Iterator$next();
   virtual jint nextIndex();
-  virtual ::gnu::javax::net::ssl::provider::CompressionMethod * target$previous();
+  virtual ::gnu::javax::net::ssl::provider::CompressionMethod * CompressionMethodList$Iterator$previous();
   virtual jint previousIndex();
   virtual void remove();
-  virtual void target$set(::gnu::javax::net::ssl::provider::CompressionMethod *);
+  virtual void CompressionMethodList$Iterator$set(::gnu::javax::net::ssl::provider::CompressionMethod *);
   virtual ::java::lang::Object * next();
   virtual ::java::lang::Object * previous();
   virtual void add(::java::lang::Object *);
diff --git a/libjava/gnu/javax/net/ssl/provider/ExtensionList$ExtensionsIterator.h b/libjava/gnu/javax/net/ssl/provider/ExtensionList$ExtensionsIterator.h
index 9472746..d658578 100644
--- a/libjava/gnu/javax/net/ssl/provider/ExtensionList$ExtensionsIterator.h
+++ b/libjava/gnu/javax/net/ssl/provider/ExtensionList$ExtensionsIterator.h
@@ -36,13 +36,13 @@ public:
   ExtensionList$ExtensionsIterator(::gnu::javax::net::ssl::provider::ExtensionList *);
   jboolean hasNext();
   jboolean hasPrevious();
-  ::gnu::javax::net::ssl::provider::Extension * target$next();
-  ::gnu::javax::net::ssl::provider::Extension * target$previous();
+  ::gnu::javax::net::ssl::provider::Extension * ExtensionList$ExtensionsIterator$next();
+  ::gnu::javax::net::ssl::provider::Extension * ExtensionList$ExtensionsIterator$previous();
   jint nextIndex();
   jint previousIndex();
-  void target$add(::gnu::javax::net::ssl::provider::Extension *);
+  void ExtensionList$ExtensionsIterator$add(::gnu::javax::net::ssl::provider::Extension *);
   void remove();
-  void target$set(::gnu::javax::net::ssl::provider::Extension *);
+  void ExtensionList$ExtensionsIterator$set(::gnu::javax::net::ssl::provider::Extension *);
   ::java::lang::Object * next();
   ::java::lang::Object * previous();
   void add(::java::lang::Object *);
diff --git a/libjava/gnu/javax/net/ssl/provider/ProtocolVersion.h b/libjava/gnu/javax/net/ssl/provider/ProtocolVersion.h
index f6cc3b7..79230e2 100644
--- a/libjava/gnu/javax/net/ssl/provider/ProtocolVersion.h
+++ b/libjava/gnu/javax/net/ssl/provider/ProtocolVersion.h
@@ -45,7 +45,7 @@ public:
   jint rawValue();
   jboolean equals(::java::lang::Object *);
   jint hashCode();
-  jint target$compareTo(::gnu::javax::net::ssl::provider::ProtocolVersion *);
+  jint ProtocolVersion$compareTo(::gnu::javax::net::ssl::provider::ProtocolVersion *);
   ::java::lang::String * toString(::java::lang::String *);
   ::java::lang::String * toString();
   jint compareTo(::java::lang::Object *);
diff --git a/libjava/gnu/javax/net/ssl/provider/SSLServerSocketFactoryImpl.h b/libjava/gnu/javax/net/ssl/provider/SSLServerSocketFactoryImpl.h
index a775cf8..411d009 100644
--- a/libjava/gnu/javax/net/ssl/provider/SSLServerSocketFactoryImpl.h
+++ b/libjava/gnu/javax/net/ssl/provider/SSLServerSocketFactoryImpl.h
@@ -46,9 +46,9 @@ public:
   SSLServerSocketFactoryImpl(::gnu::javax::net::ssl::provider::SSLContextImpl *);
   virtual JArray< ::java::lang::String * > * getDefaultCipherSuites();
   virtual JArray< ::java::lang::String * > * getSupportedCipherSuites();
-  virtual ::gnu::javax::net::ssl::provider::SSLServerSocketImpl * target$createServerSocket(jint);
-  virtual ::gnu::javax::net::ssl::provider::SSLServerSocketImpl * target$createServerSocket(jint, jint);
-  virtual ::gnu::javax::net::ssl::provider::SSLServerSocketImpl * target$createServerSocket(jint, jint, ::java::net::InetAddress *);
+  virtual ::gnu::javax::net::ssl::provider::SSLServerSocketImpl * SSLServerSocketFactoryImpl$createServerSocket(jint);
+  virtual ::gnu::javax::net::ssl::provider::SSLServerSocketImpl * SSLServerSocketFactoryImpl$createServerSocket(jint, jint);
+  virtual ::gnu::javax::net::ssl::provider::SSLServerSocketImpl * SSLServerSocketFactoryImpl$createServerSocket(jint, jint, ::java::net::InetAddress *);
   virtual ::java::net::ServerSocket * createServerSocket(jint, jint, ::java::net::InetAddress *);
   virtual ::java::net::ServerSocket * createServerSocket(jint, jint);
   virtual ::java::net::ServerSocket * createServerSocket(jint);
diff --git a/libjava/gnu/javax/net/ssl/provider/SSLServerSocketImpl.h b/libjava/gnu/javax/net/ssl/provider/SSLServerSocketImpl.h
index 4367a832..3302def 100644
--- a/libjava/gnu/javax/net/ssl/provider/SSLServerSocketImpl.h
+++ b/libjava/gnu/javax/net/ssl/provider/SSLServerSocketImpl.h
@@ -57,7 +57,7 @@ public:
   virtual void setNeedClientAuth(jboolean);
   virtual void setUseClientMode(jboolean);
   virtual void setWantClientAuth(jboolean);
-  virtual ::gnu::javax::net::ssl::provider::SSLSocketImpl * target$accept();
+  virtual ::gnu::javax::net::ssl::provider::SSLSocketImpl * SSLServerSocketImpl$accept();
   virtual ::java::net::Socket * accept();
 private:
   ::gnu::javax::net::ssl::provider::SSLContextImpl * __attribute__((aligned(__alignof__( ::javax::net::ssl::SSLServerSocket)))) contextImpl;
diff --git a/libjava/gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.h b/libjava/gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.h
index eec32a9..24ac5f9 100644
--- a/libjava/gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.h
+++ b/libjava/gnu/javax/net/ssl/provider/SSLSocketFactoryImpl.h
@@ -47,10 +47,10 @@ public:
   virtual ::java::net::Socket * createSocket(::java::net::Socket *, ::java::lang::String *, jint, jboolean);
   virtual JArray< ::java::lang::String * > * getDefaultCipherSuites();
   virtual JArray< ::java::lang::String * > * getSupportedCipherSuites();
-  virtual ::gnu::javax::net::ssl::provider::SSLSocketImpl * target$createSocket(::java::lang::String *, jint);
-  virtual ::gnu::javax::net::ssl::provider::SSLSocketImpl * target$createSocket(::java::lang::String *, jint, ::java::net::InetAddress *, jint);
-  virtual ::gnu::javax::net::ssl::provider::SSLSocketImpl * target$createSocket(::java::net::InetAddress *, jint);
-  virtual ::gnu::javax::net::ssl::provider::SSLSocketImpl * target$createSocket(::java::net::InetAddress *, jint, ::java::net::InetAddress *, jint);
+  virtual ::gnu::javax::net::ssl::provider::SSLSocketImpl * SSLSocketFactoryImpl$createSocket(::java::lang::String *, jint);
+  virtual ::gnu::javax::net::ssl::provider::SSLSocketImpl * SSLSocketFactoryImpl$createSocket(::java::lang::String *, jint, ::java::net::InetAddress *, jint);
+  virtual ::gnu::javax::net::ssl::provider::SSLSocketImpl * SSLSocketFactoryImpl$createSocket(::java::net::InetAddress *, jint);
+  virtual ::gnu::javax::net::ssl::provider::SSLSocketImpl * SSLSocketFactoryImpl$createSocket(::java::net::InetAddress *, jint, ::java::net::InetAddress *, jint);
   virtual ::java::net::Socket * createSocket(::java::net::InetAddress *, jint, ::java::net::InetAddress *, jint);
   virtual ::java::net::Socket * createSocket(::java::net::InetAddress *, jint);
   virtual ::java::net::Socket * createSocket(::java::lang::String *, jint, ::java::net::InetAddress *, jint);
diff --git a/libjava/gnu/javax/net/ssl/provider/ServerNameList$Iterator.h b/libjava/gnu/javax/net/ssl/provider/ServerNameList$Iterator.h
index 6ee36ed..6289bfd 100644
--- a/libjava/gnu/javax/net/ssl/provider/ServerNameList$Iterator.h
+++ b/libjava/gnu/javax/net/ssl/provider/ServerNameList$Iterator.h
@@ -35,7 +35,7 @@ class gnu::javax::net::ssl::provider::ServerNameList$Iterator : public ::java::l
 public:
   ServerNameList$Iterator(::gnu::javax::net::ssl::provider::ServerNameList *);
   virtual jboolean hasNext();
-  virtual ::gnu::javax::net::ssl::provider::ServerNameList$ServerName * target$next();
+  virtual ::gnu::javax::net::ssl::provider::ServerNameList$ServerName * ServerNameList$Iterator$next();
   virtual void remove();
   virtual ::java::lang::Object * next();
 private:
diff --git a/libjava/gnu/javax/net/ssl/provider/TrustedAuthorities$AuthoritiesIterator.h b/libjava/gnu/javax/net/ssl/provider/TrustedAuthorities$AuthoritiesIterator.h
index 4cdcf79..89969b1 100644
--- a/libjava/gnu/javax/net/ssl/provider/TrustedAuthorities$AuthoritiesIterator.h
+++ b/libjava/gnu/javax/net/ssl/provider/TrustedAuthorities$AuthoritiesIterator.h
@@ -34,7 +34,7 @@ class gnu::javax::net::ssl::provider::TrustedAuthorities$AuthoritiesIterator : p
 
 public:
   TrustedAuthorities$AuthoritiesIterator(::gnu::javax::net::ssl::provider::TrustedAuthorities *);
-  virtual ::gnu::javax::net::ssl::provider::TrustedAuthorities$TrustedAuthority * target$next();
+  virtual ::gnu::javax::net::ssl::provider::TrustedAuthorities$TrustedAuthority * TrustedAuthorities$AuthoritiesIterator$next();
   virtual jboolean hasNext();
   virtual void remove();
   virtual ::java::lang::Object * next();
diff --git a/libjava/gnu/javax/net/ssl/provider/X500PrincipalList$Iterator.h b/libjava/gnu/javax/net/ssl/provider/X500PrincipalList$Iterator.h
index f5e9280..f41f17b 100644
--- a/libjava/gnu/javax/net/ssl/provider/X500PrincipalList$Iterator.h
+++ b/libjava/gnu/javax/net/ssl/provider/X500PrincipalList$Iterator.h
@@ -46,15 +46,15 @@ class gnu::javax::net::ssl::provider::X500PrincipalList$Iterator : public ::java
 
 public:
   X500PrincipalList$Iterator(::gnu::javax::net::ssl::provider::X500PrincipalList *);
-  virtual void target$add(::javax::security::auth::x500::X500Principal *);
+  virtual void X500PrincipalList$Iterator$add(::javax::security::auth::x500::X500Principal *);
   virtual jboolean hasNext();
   virtual jboolean hasPrevious();
-  virtual ::javax::security::auth::x500::X500Principal * target$next();
+  virtual ::javax::security::auth::x500::X500Principal * X500PrincipalList$Iterator$next();
   virtual jint nextIndex();
-  virtual ::javax::security::auth::x500::X500Principal * target$previous();
+  virtual ::javax::security::auth::x500::X500Principal * X500PrincipalList$Iterator$previous();
   virtual jint previousIndex();
   virtual void remove();
-  virtual void target$set(::javax::security::auth::x500::X500Principal *);
+  virtual void X500PrincipalList$Iterator$set(::javax::security::auth::x500::X500Principal *);
   virtual ::java::lang::Object * next();
   virtual ::java::lang::Object * previous();
   virtual void add(::java::lang::Object *);