From 06a4a507625bf9a3b979ccb275bf4182f07b8ea2 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 19 Apr 2007 00:24:09 +0000 Subject: [PATCH] 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 --- libjava/ChangeLog | 4 ++ libjava/classpath/ChangeLog | 9 ++++ .../java/awt/peer/gtk/ComponentGraphics.class | Bin 12284 -> 12162 bytes .../lib/gnu/java/rmi/server/TripleKey.class | Bin 1315 -> 1315 bytes .../rmi/server/UnicastConnectionManager.class | Bin 7405 -> 7404 bytes .../classpath/tools/javah/ClassWrapper.class | Bin 7779 -> 8524 bytes .../classpath/tools/javah/MethodHelper.class | Bin 3041 -> 2902 bytes .../classpath/tools/javah/ClassWrapper.java | 39 +++++++++++++++--- .../classpath/tools/javah/MethodHelper.java | 14 ++----- .../java/security/action/GetPropertyAction.h | 2 +- .../action/GetSecurityPropertyAction.h | 2 +- .../net/ssl/provider/AbstractHandshake$1.h | 2 +- ...ificateStatusRequest$ResponderIdIterator.h | 2 +- .../ssl/provider/CertificateURL$Iterator.h | 2 +- .../ssl/provider/CipherSuiteList$Iterator.h | 8 ++-- .../ClientCertificateTypeList$Iterator.h | 8 ++-- .../provider/CompressionMethodList$Iterator.h | 8 ++-- .../ExtensionList$ExtensionsIterator.h | 8 ++-- .../javax/net/ssl/provider/ProtocolVersion.h | 2 +- .../ssl/provider/SSLServerSocketFactoryImpl.h | 6 +-- .../net/ssl/provider/SSLServerSocketImpl.h | 2 +- .../net/ssl/provider/SSLSocketFactoryImpl.h | 8 ++-- .../ssl/provider/ServerNameList$Iterator.h | 2 +- .../TrustedAuthorities$AuthoritiesIterator.h | 2 +- .../ssl/provider/X500PrincipalList$Iterator.h | 8 ++-- libjava/java/io/CharArrayWriter.h | 12 +++--- libjava/java/io/PrintStream.h | 6 +-- libjava/java/io/PrintWriter.h | 12 +++--- libjava/java/io/StringWriter.h | 12 +++--- libjava/java/io/Writer.h | 6 +-- libjava/java/lang/Boolean.h | 2 +- libjava/java/lang/Byte.h | 2 +- libjava/java/lang/Character.h | 2 +- libjava/java/lang/Double.h | 2 +- libjava/java/lang/Enum.h | 2 +- libjava/java/lang/Float.h | 2 +- libjava/java/lang/Integer.h | 2 +- libjava/java/lang/Long.h | 2 +- libjava/java/lang/Short.h | 2 +- .../lang/String$CaseInsensitiveComparator.h | 2 +- libjava/java/lang/String.h | 2 +- libjava/java/lang/StringBuffer.h | 6 +-- libjava/java/lang/StringBuilder.h | 6 +-- libjava/java/lang/System$EnvironmentMap.h | 6 +-- libjava/java/math/BigDecimal.h | 2 +- libjava/java/math/BigInteger.h | 2 +- libjava/java/net/URI.h | 2 +- libjava/java/nio/ByteBuffer.h | 2 +- libjava/java/nio/CharBuffer.h | 8 ++-- libjava/java/nio/DoubleBuffer.h | 2 +- libjava/java/nio/FloatBuffer.h | 2 +- libjava/java/nio/IntBuffer.h | 2 +- libjava/java/nio/LongBuffer.h | 2 +- libjava/java/nio/ShortBuffer.h | 2 +- libjava/java/nio/charset/Charset.h | 2 +- libjava/java/sql/Timestamp.h | 2 +- libjava/java/text/CollationKey.h | 2 +- libjava/java/util/ArrayDeque.h | 2 +- libjava/java/util/Calendar.h | 2 +- libjava/java/util/Collections$4.h | 2 +- libjava/java/util/Collections$5.h | 2 +- ...ons$UnmodifiableMap$UnmodifiableEntrySet.h | 2 +- libjava/java/util/Date.h | 2 +- libjava/java/util/EnumMap$2.h | 2 +- libjava/java/util/EnumMap$6.h | 2 +- libjava/java/util/EnumMap.h | 4 +- libjava/java/util/EnumSet$1.h | 2 +- libjava/java/util/EnumSet.h | 4 +- libjava/java/util/Hashtable$EntryEnumerator.h | 2 +- libjava/java/util/Hashtable$EntryIterator.h | 2 +- libjava/java/util/UUID.h | 2 +- .../ConcurrentHashMap$EntryIterator.h | 2 +- .../ConcurrentSkipListMap$EntryIterator.h | 2 +- .../concurrent/ConcurrentSkipListMap$KeySet.h | 6 +-- ...ntSkipListMap$SubMap$SubMapEntryIterator.h | 2 +- .../concurrent/ConcurrentSkipListMap$SubMap.h | 16 +++---- .../util/concurrent/ConcurrentSkipListMap.h | 18 ++++---- .../util/concurrent/ConcurrentSkipListSet.h | 8 ++-- libjava/java/util/concurrent/DelayQueue$Itr.h | 2 +- libjava/java/util/concurrent/DelayQueue.h | 16 +++---- .../ScheduledThreadPoolExecutor$1.h | 2 +- ...duledThreadPoolExecutor$DelayedWorkQueue.h | 20 ++++----- ...edThreadPoolExecutor$ScheduledFutureTask.h | 2 +- ...eadWriteLock$Sync$ThreadLocalHoldCounter.h | 2 +- .../concurrent/locks/ReentrantReadWriteLock.h | 4 +- .../java/util/jar/JarFile$JarEnumeration.h | 2 +- .../util/zip/ZipFile$ZipEntryEnumeration.h | 2 +- libjava/javax/imageio/ImageIO$1.h | 2 +- .../imageio/ImageIO$ImageReaderIterator.h | 2 +- .../imageio/ImageIO$ImageWriterIterator.h | 2 +- .../attribute/standard/JobStateReasons.h | 2 +- .../attribute/standard/PrinterStateReasons.h | 2 +- 92 files changed, 220 insertions(+), 186 deletions(-) diff --git a/libjava/ChangeLog b/libjava/ChangeLog index eeb1ab4ca22..500d47c999c 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,7 @@ +2007-04-18 Tom Tromey + + * Regenerated headers with new gjavah. + 2007-04-18 Andrew Haley * java/lang/reflect/natVMProxy.cc (ncode_closure): Add diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog index fac684a421c..987ac9eff84 100644 --- a/libjava/classpath/ChangeLog +++ b/libjava/classpath/ChangeLog @@ -1,3 +1,12 @@ +2007-04-18 Tom Tromey + + * 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. + 2007-04-17 Andrew Haley * gnu/java/rmi/server/UnicastConnectionManager.java diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/ComponentGraphics.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/ComponentGraphics.class index 655eba16fc1753809517a39514b5aa93d7268114..0e671874914fb9eda4b473bb0ef5356841c3d988 100644 GIT binary patch delta 5712 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 V4Yf|T9{TFB9D)S}ks^}j`WLONgrWcd diff --git a/libjava/classpath/lib/gnu/java/rmi/server/TripleKey.class b/libjava/classpath/lib/gnu/java/rmi/server/TripleKey.class index faa602b8bb234e444031e84824eedbac77c6e94e..661d491ff4985fb8a0ce1cb060d8f6b43a50f40e 100644 GIT binary patch delta 91 zcmZ3?wU}$eRA$~y3@nVB88{iYFz_*MoxF%Sm2vN64wh`mgADA9hZuMm4>L$H9$`>r sJj!6ec#Oe_@#N$lmMYnc3=#|s3_J{sKvJJUl0gbcGcvdUNhStY04rD$&;S4c delta 91 zcmZ3?wU}$eRA$~a3@nUm88{i&G4L_2pS*}Um2vxI4wh`m-3;uEdl+~a_cBN^?qg78 s+|OXZc!0r(@$lpxmMYoP3=#|s3_J{sKvJJUl0gbcGcvdUNhStY02($Df&c&j diff --git a/libjava/classpath/lib/gnu/java/rmi/server/UnicastConnectionManager.class b/libjava/classpath/lib/gnu/java/rmi/server/UnicastConnectionManager.class index e5d557909731b1c1caee01365643b177a466008f..917dfc9b564512d8f17a7129049f6cd3bb1ce229 100644 GIT binary patch delta 443 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 QUb9VVk5hOq1ANT?2Z&37`2YX_ delta 683 zcmX9*OH30{6g{tyfdpoZ(I9fw)T&G%# zh{L!k;TDe2EmXZLp&OdgZ@6KRV5l>+)s4H<*C8T~qJ;Zaz-6vg^=?f~rc;NikE3!g zgP`iMjB3okb}cc_A2{Ixn8V6@`tm#EEelvzfm+6}?94OJ4fVp{)ul z$X26GtqV9E".equals(meth.name)) return; @@ -97,15 +97,7 @@ public class MethodHelper { out.print(Type.getReturnType(meth.desc)); out.print(" "); - if (isBridgeTarget) - { - out.print("target$"); - out.print(meth.name); - } - else - { - out.print(Keywords.getCxxName(meth.name)); - } + out.print(realMethodName); } else { diff --git a/libjava/gnu/java/security/action/GetPropertyAction.h b/libjava/gnu/java/security/action/GetPropertyAction.h index ce401be9db8..e3ab18316f0 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 7308876d7cb..b10ee5d31de 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 2e888342633..eaef0d0d255 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 ce75fe69272..b19a13f22fd 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 9809890d767..059ea01eda4 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 0d206f0a93e..2cf1f2fa6b7 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 215e4b38832..7d9d7ad34f3 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 44519e1903e..6eff62df8c8 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 94727465b17..d65857822ba 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 f6cc3b78d6e..79230e257ff 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 a775cf82c66..411d009a531 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 4367a832bc6..3302defad14 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 eec32a994f5..24ac5f9bce1 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 6ee36ed59e9..6289bfdef1d 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 4cdcf79f4bf..89969b11165 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 f5e928014b8..f41f17b9fce 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 *); diff --git a/libjava/java/io/CharArrayWriter.h b/libjava/java/io/CharArrayWriter.h index 35f49d23b78..d5d2de3a167 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 3740fc78596..b76912e34ef 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 2cbbd042dd9..cf1fb324a9c 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 16e6de52b73..c2933e7aff6 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 611566470ba..148501ac6e6 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); diff --git a/libjava/java/lang/Boolean.h b/libjava/java/lang/Boolean.h index a8476f7b8b1..0ead5b527e4 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 2caccd7be5c..fc9e3b33f67 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 7c3a4b9ae3f..a2144709853 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 5fb99da4a99..7808acc4659 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 cb3aabc94e4..a75f2766c93 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 87859cb28c0..0069df44bff 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 e33c78f2cc2..aebcd0a164f 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 da04281a659..b0358e6d729 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 42671174cfc..4858db52f4a 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 b0c3d620973..8a1b121bc2b 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 eea80fb9e16..5fa06de982b 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 07400f78060..983ef98d73c 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 d34cd86c0a6..b8b504a995d 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 1220f57e28f..c8ef8aade07 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 *); diff --git a/libjava/java/math/BigDecimal.h b/libjava/java/math/BigDecimal.h index 72b877e85f4..aeeab25236d 100644 --- a/libjava/java/math/BigDecimal.h +++ b/libjava/java/math/BigDecimal.h @@ -62,7 +62,7 @@ public: private: ::java::math::BigDecimal * floor(); public: - virtual jint target$compareTo(::java::math::BigDecimal *); + virtual jint BigDecimal$compareTo(::java::math::BigDecimal *); virtual jboolean equals(::java::lang::Object *); virtual jint hashCode(); virtual ::java::math::BigDecimal * max(::java::math::BigDecimal *); diff --git a/libjava/java/math/BigInteger.h b/libjava/java/math/BigInteger.h index e1d4461e850..eaf03268224 100644 --- a/libjava/java/math/BigInteger.h +++ b/libjava/java/math/BigInteger.h @@ -48,7 +48,7 @@ public: private: static jint compareTo(::java::math::BigInteger *, ::java::math::BigInteger *); public: - virtual jint target$compareTo(::java::math::BigInteger *); + virtual jint BigInteger$compareTo(::java::math::BigInteger *); virtual ::java::math::BigInteger * min(::java::math::BigInteger *); virtual ::java::math::BigInteger * max(::java::math::BigInteger *); private: diff --git a/libjava/java/net/URI.h b/libjava/java/net/URI.h index 9c8f4f2d1fc..d955dce503c 100644 --- a/libjava/java/net/URI.h +++ b/libjava/java/net/URI.h @@ -69,7 +69,7 @@ public: ::java::lang::String * getFragment(); jboolean equals(::java::lang::Object *); jint hashCode(); - jint target$compareTo(::java::net::URI *); + jint URI$compareTo(::java::net::URI *); private: jint compareFragments(::java::net::URI *); public: diff --git a/libjava/java/nio/ByteBuffer.h b/libjava/java/nio/ByteBuffer.h index 08f821b2825..7836894bde7 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 9ab6d7e21f1..3d3356041ea 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 4fb0ef033e2..e201a4f2761 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 61c02144b98..18348f2ea4b 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 0922342cb25..e099d4a0b23 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 f100e050e7f..0e6ad30ef07 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 27b9814a811..ddcfc093ee2 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 a2f3b3ead16..dabf4671d4f 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(); diff --git a/libjava/java/sql/Timestamp.h b/libjava/java/sql/Timestamp.h index 2b27498c843..5b85eff3537 100644 --- a/libjava/java/sql/Timestamp.h +++ b/libjava/java/sql/Timestamp.h @@ -39,7 +39,7 @@ public: virtual jboolean equals(::java::lang::Object *); virtual jboolean equals(::java::sql::Timestamp *); virtual jint compareTo(::java::sql::Timestamp *); - virtual jint target$compareTo(::java::util::Date *); + virtual jint Timestamp$compareTo(::java::util::Date *); public: // actually package-private static const jlong serialVersionUID = 2745179027874758501LL; private: diff --git a/libjava/java/text/CollationKey.h b/libjava/java/text/CollationKey.h index 83a6c5ae5dd..ac110813f14 100644 --- a/libjava/java/text/CollationKey.h +++ b/libjava/java/text/CollationKey.h @@ -27,7 +27,7 @@ class java::text::CollationKey : public ::java::lang::Object public: // actually package-private CollationKey(::java::text::Collator *, ::java::lang::String *, JArray< jbyte > *); public: - virtual jint target$compareTo(::java::text::CollationKey *); + virtual jint CollationKey$compareTo(::java::text::CollationKey *); virtual jboolean equals(::java::lang::Object *); virtual ::java::lang::String * getSourceString(); virtual jint hashCode(); diff --git a/libjava/java/util/ArrayDeque.h b/libjava/java/util/ArrayDeque.h index 6154213dd7e..d1ac9e514d2 100644 --- a/libjava/java/util/ArrayDeque.h +++ b/libjava/java/util/ArrayDeque.h @@ -55,7 +55,7 @@ public: virtual void clear(); virtual JArray< ::java::lang::Object * > * toArray(); virtual JArray< ::java::lang::Object * > * toArray(JArray< ::java::lang::Object * > *); - virtual ::java::util::ArrayDeque * target$clone(); + virtual ::java::util::ArrayDeque * ArrayDeque$clone(); private: void writeObject(::java::io::ObjectOutputStream *); void readObject(::java::io::ObjectInputStream *); diff --git a/libjava/java/util/Calendar.h b/libjava/java/util/Calendar.h index bde84d5558a..3a46dc03793 100644 --- a/libjava/java/util/Calendar.h +++ b/libjava/java/util/Calendar.h @@ -66,7 +66,7 @@ public: virtual jint getLeastMaximum(jint) = 0; virtual jint getActualMinimum(jint); virtual jint getActualMaximum(jint); - virtual jint target$compareTo(::java::util::Calendar *); + virtual jint Calendar$compareTo(::java::util::Calendar *); virtual ::java::lang::Object * clone(); virtual ::java::lang::String * toString(); private: diff --git a/libjava/java/util/Collections$4.h b/libjava/java/util/Collections$4.h index eb7699b0da2..11c7d205243 100644 --- a/libjava/java/util/Collections$4.h +++ b/libjava/java/util/Collections$4.h @@ -14,7 +14,7 @@ class java::util::Collections$4 : public ::java::util::Collections$SynchronizedI public: // actually package-private Collections$4(::java::util::Collections$3 *, ::java::lang::Object *, ::java::util::Iterator *); public: - ::java::util::Map$Entry * target$next(); + ::java::util::Map$Entry * Collections$4$next(); ::java::lang::Object * next(); public: // actually package-private ::java::util::Collections$3 * __attribute__((aligned(__alignof__( ::java::util::Collections$SynchronizedIterator)))) this$2; diff --git a/libjava/java/util/Collections$5.h b/libjava/java/util/Collections$5.h index b57ee4f03cc..a5cf8b690e6 100644 --- a/libjava/java/util/Collections$5.h +++ b/libjava/java/util/Collections$5.h @@ -14,7 +14,7 @@ class java::util::Collections$5 : public ::java::util::Collections$UnmodifiableI public: // actually package-private Collections$5(::java::util::Collections$UnmodifiableMap$UnmodifiableEntrySet *, ::java::util::Iterator *); public: - ::java::util::Map$Entry * target$next(); + ::java::util::Map$Entry * Collections$5$next(); ::java::lang::Object * next(); public: // actually package-private ::java::util::Collections$UnmodifiableMap$UnmodifiableEntrySet * __attribute__((aligned(__alignof__( ::java::util::Collections$UnmodifiableIterator)))) this$2; diff --git a/libjava/java/util/Collections$UnmodifiableMap$UnmodifiableEntrySet.h b/libjava/java/util/Collections$UnmodifiableMap$UnmodifiableEntrySet.h index 24daec69337..1128060de45 100644 --- a/libjava/java/util/Collections$UnmodifiableMap$UnmodifiableEntrySet.h +++ b/libjava/java/util/Collections$UnmodifiableMap$UnmodifiableEntrySet.h @@ -17,7 +17,7 @@ public: // actually package-private Collections$UnmodifiableMap$UnmodifiableEntrySet(::java::util::Set *); public: ::java::util::Iterator * iterator(); - JArray< ::java::util::Map$Entry * > * target$toArray(); + JArray< ::java::util::Map$Entry * > * Collections$UnmodifiableMap$UnmodifiableEntrySet$toArray(); JArray< ::java::lang::Object * > * toArray(JArray< ::java::lang::Object * > *); JArray< ::java::lang::Object * > * toArray(); private: diff --git a/libjava/java/util/Date.h b/libjava/java/util/Date.h index e9814834457..0f801d87aa0 100644 --- a/libjava/java/util/Date.h +++ b/libjava/java/util/Date.h @@ -28,7 +28,7 @@ public: virtual jboolean after(::java::util::Date *); virtual jboolean before(::java::util::Date *); virtual jboolean equals(::java::lang::Object *); - virtual jint target$compareTo(::java::util::Date *); + virtual jint Date$compareTo(::java::util::Date *); virtual jint hashCode(); virtual ::java::lang::String * toString(); virtual ::java::lang::String * toLocaleString(); diff --git a/libjava/java/util/EnumMap$2.h b/libjava/java/util/EnumMap$2.h index 325d8ad583d..6ab63d39069 100644 --- a/libjava/java/util/EnumMap$2.h +++ b/libjava/java/util/EnumMap$2.h @@ -15,7 +15,7 @@ public: // actually package-private EnumMap$2(::java::util::EnumMap$1 *); public: jboolean hasNext(); - ::java::lang::Enum * target$next(); + ::java::lang::Enum * EnumMap$2$next(); void remove(); ::java::lang::Object * next(); public: // actually package-private diff --git a/libjava/java/util/EnumMap$6.h b/libjava/java/util/EnumMap$6.h index fde1cbd4d82..eaa36b04c9e 100644 --- a/libjava/java/util/EnumMap$6.h +++ b/libjava/java/util/EnumMap$6.h @@ -15,7 +15,7 @@ public: // actually package-private EnumMap$6(::java::util::EnumMap$5 *); public: jboolean hasNext(); - ::java::util::Map$Entry * target$next(); + ::java::util::Map$Entry * EnumMap$6$next(); void remove(); ::java::lang::Object * next(); public: // actually package-private diff --git a/libjava/java/util/EnumMap.h b/libjava/java/util/EnumMap.h index 0c303d82529..074f8783917 100644 --- a/libjava/java/util/EnumMap.h +++ b/libjava/java/util/EnumMap.h @@ -21,7 +21,7 @@ public: virtual jboolean containsValue(::java::lang::Object *); virtual jboolean containsKey(::java::lang::Object *); virtual ::java::lang::Object * get(::java::lang::Object *); - virtual ::java::lang::Object * target$put(::java::lang::Enum *, ::java::lang::Object *); + virtual ::java::lang::Object * EnumMap$put(::java::lang::Enum *, ::java::lang::Object *); virtual ::java::lang::Object * remove(::java::lang::Object *); virtual void putAll(::java::util::Map *); virtual void clear(); @@ -29,7 +29,7 @@ public: virtual ::java::util::Collection * values(); virtual ::java::util::Set * entrySet(); virtual jboolean equals(::java::lang::Object *); - virtual ::java::util::EnumMap * target$clone(); + virtual ::java::util::EnumMap * EnumMap$clone(); virtual ::java::lang::Object * clone(); virtual ::java::lang::Object * put(::java::lang::Object *, ::java::lang::Object *); private: diff --git a/libjava/java/util/EnumSet$1.h b/libjava/java/util/EnumSet$1.h index 38088dc013f..55e1c91d248 100644 --- a/libjava/java/util/EnumSet$1.h +++ b/libjava/java/util/EnumSet$1.h @@ -15,7 +15,7 @@ public: // actually package-private EnumSet$1(::java::util::EnumSet *); public: jboolean hasNext(); - ::java::lang::Enum * target$next(); + ::java::lang::Enum * EnumSet$1$next(); void remove(); ::java::lang::Object * next(); public: // actually package-private diff --git a/libjava/java/util/EnumSet.h b/libjava/java/util/EnumSet.h index f0e2a7af3a6..200868ae876 100644 --- a/libjava/java/util/EnumSet.h +++ b/libjava/java/util/EnumSet.h @@ -16,10 +16,10 @@ class java::util::EnumSet : public ::java::util::AbstractSet public: // actually package-private EnumSet(); public: - virtual ::java::util::EnumSet * target$clone(); + virtual ::java::util::EnumSet * EnumSet$clone(); virtual jint size(); virtual ::java::util::Iterator * iterator(); - virtual jboolean target$add(::java::lang::Enum *); + virtual jboolean EnumSet$add(::java::lang::Enum *); virtual jboolean addAll(::java::util::Collection *); virtual void clear(); virtual jboolean contains(::java::lang::Object *); diff --git a/libjava/java/util/Hashtable$EntryEnumerator.h b/libjava/java/util/Hashtable$EntryEnumerator.h index 1480d182e3b..a0f16015312 100644 --- a/libjava/java/util/Hashtable$EntryEnumerator.h +++ b/libjava/java/util/Hashtable$EntryEnumerator.h @@ -15,7 +15,7 @@ public: // actually package-private Hashtable$EntryEnumerator(::java::util::Hashtable *); public: virtual jboolean hasMoreElements(); - virtual ::java::util::Map$Entry * target$nextElement(); + virtual ::java::util::Map$Entry * Hashtable$EntryEnumerator$nextElement(); virtual ::java::lang::Object * nextElement(); public: // actually package-private jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) count; diff --git a/libjava/java/util/Hashtable$EntryIterator.h b/libjava/java/util/Hashtable$EntryIterator.h index d70d486c70a..7927391ef4a 100644 --- a/libjava/java/util/Hashtable$EntryIterator.h +++ b/libjava/java/util/Hashtable$EntryIterator.h @@ -15,7 +15,7 @@ public: // actually package-private Hashtable$EntryIterator(::java::util::Hashtable *); public: virtual jboolean hasNext(); - virtual ::java::util::Map$Entry * target$next(); + virtual ::java::util::Map$Entry * Hashtable$EntryIterator$next(); virtual void remove(); virtual ::java::lang::Object * next(); public: // actually package-private diff --git a/libjava/java/util/UUID.h b/libjava/java/util/UUID.h index 86cb4bc476e..0eda9d67bbb 100644 --- a/libjava/java/util/UUID.h +++ b/libjava/java/util/UUID.h @@ -16,7 +16,7 @@ class java::util::UUID : public ::java::lang::Object public: UUID(jlong, jlong); jint clockSequence(); - jint target$compareTo(::java::util::UUID *); + jint UUID$compareTo(::java::util::UUID *); jboolean equals(::java::lang::Object *); static ::java::util::UUID * fromString(::java::lang::String *); ::java::lang::String * toString(); diff --git a/libjava/java/util/concurrent/ConcurrentHashMap$EntryIterator.h b/libjava/java/util/concurrent/ConcurrentHashMap$EntryIterator.h index 5044f070ab8..4c4c191b51b 100644 --- a/libjava/java/util/concurrent/ConcurrentHashMap$EntryIterator.h +++ b/libjava/java/util/concurrent/ConcurrentHashMap$EntryIterator.h @@ -14,7 +14,7 @@ class java::util::concurrent::ConcurrentHashMap$EntryIterator : public ::java::u public: // actually package-private ConcurrentHashMap$EntryIterator(::java::util::concurrent::ConcurrentHashMap *); public: - ::java::util::Map$Entry * target$next(); + ::java::util::Map$Entry * ConcurrentHashMap$EntryIterator$next(); ::java::lang::Object * next(); public: // actually package-private ::java::util::concurrent::ConcurrentHashMap * __attribute__((aligned(__alignof__( ::java::util::concurrent::ConcurrentHashMap$HashIterator)))) this$0; diff --git a/libjava/java/util/concurrent/ConcurrentSkipListMap$EntryIterator.h b/libjava/java/util/concurrent/ConcurrentSkipListMap$EntryIterator.h index 1949e5ac617..67d71928f54 100644 --- a/libjava/java/util/concurrent/ConcurrentSkipListMap$EntryIterator.h +++ b/libjava/java/util/concurrent/ConcurrentSkipListMap$EntryIterator.h @@ -14,7 +14,7 @@ class java::util::concurrent::ConcurrentSkipListMap$EntryIterator : public ::jav public: // actually package-private ConcurrentSkipListMap$EntryIterator(::java::util::concurrent::ConcurrentSkipListMap *); public: - ::java::util::Map$Entry * target$next(); + ::java::util::Map$Entry * ConcurrentSkipListMap$EntryIterator$next(); ::java::lang::Object * next(); public: // actually package-private ::java::util::concurrent::ConcurrentSkipListMap * __attribute__((aligned(__alignof__( ::java::util::concurrent::ConcurrentSkipListMap$Iter)))) this$0; diff --git a/libjava/java/util/concurrent/ConcurrentSkipListMap$KeySet.h b/libjava/java/util/concurrent/ConcurrentSkipListMap$KeySet.h index c2372f8b491..e52b30ea14d 100644 --- a/libjava/java/util/concurrent/ConcurrentSkipListMap$KeySet.h +++ b/libjava/java/util/concurrent/ConcurrentSkipListMap$KeySet.h @@ -38,9 +38,9 @@ public: ::java::util::NavigableSet * subSet(::java::lang::Object *, jboolean, ::java::lang::Object *, jboolean); ::java::util::NavigableSet * headSet(::java::lang::Object *, jboolean); ::java::util::NavigableSet * tailSet(::java::lang::Object *, jboolean); - ::java::util::NavigableSet * target$subSet(::java::lang::Object *, ::java::lang::Object *); - ::java::util::NavigableSet * target$headSet(::java::lang::Object *); - ::java::util::NavigableSet * target$tailSet(::java::lang::Object *); + ::java::util::NavigableSet * ConcurrentSkipListMap$KeySet$subSet(::java::lang::Object *, ::java::lang::Object *); + ::java::util::NavigableSet * ConcurrentSkipListMap$KeySet$headSet(::java::lang::Object *); + ::java::util::NavigableSet * ConcurrentSkipListMap$KeySet$tailSet(::java::lang::Object *); ::java::util::NavigableSet * descendingSet(); ::java::util::SortedSet * subSet(::java::lang::Object *, ::java::lang::Object *); ::java::util::SortedSet * tailSet(::java::lang::Object *); diff --git a/libjava/java/util/concurrent/ConcurrentSkipListMap$SubMap$SubMapEntryIterator.h b/libjava/java/util/concurrent/ConcurrentSkipListMap$SubMap$SubMapEntryIterator.h index 8b01d994082..0c0c9e55248 100644 --- a/libjava/java/util/concurrent/ConcurrentSkipListMap$SubMap$SubMapEntryIterator.h +++ b/libjava/java/util/concurrent/ConcurrentSkipListMap$SubMap$SubMapEntryIterator.h @@ -14,7 +14,7 @@ class java::util::concurrent::ConcurrentSkipListMap$SubMap$SubMapEntryIterator : public: // actually package-private ConcurrentSkipListMap$SubMap$SubMapEntryIterator(::java::util::concurrent::ConcurrentSkipListMap$SubMap *); public: - ::java::util::Map$Entry * target$next(); + ::java::util::Map$Entry * ConcurrentSkipListMap$SubMap$SubMapEntryIterator$next(); ::java::lang::Object * next(); public: // actually package-private ::java::util::concurrent::ConcurrentSkipListMap$SubMap * __attribute__((aligned(__alignof__( ::java::util::concurrent::ConcurrentSkipListMap$SubMap$SubMapIter)))) this$1; diff --git a/libjava/java/util/concurrent/ConcurrentSkipListMap$SubMap.h b/libjava/java/util/concurrent/ConcurrentSkipListMap$SubMap.h index e065dbe6caa..345fb255173 100644 --- a/libjava/java/util/concurrent/ConcurrentSkipListMap$SubMap.h +++ b/libjava/java/util/concurrent/ConcurrentSkipListMap$SubMap.h @@ -46,13 +46,13 @@ public: private: ::java::util::concurrent::ConcurrentSkipListMap$SubMap * newSubMap(::java::lang::Object *, jboolean, ::java::lang::Object *, jboolean); public: - ::java::util::concurrent::ConcurrentSkipListMap$SubMap * target$subMap(::java::lang::Object *, jboolean, ::java::lang::Object *, jboolean); - ::java::util::concurrent::ConcurrentSkipListMap$SubMap * target$headMap(::java::lang::Object *, jboolean); - ::java::util::concurrent::ConcurrentSkipListMap$SubMap * target$tailMap(::java::lang::Object *, jboolean); - ::java::util::concurrent::ConcurrentSkipListMap$SubMap * target$subMap(::java::lang::Object *, ::java::lang::Object *); - ::java::util::concurrent::ConcurrentSkipListMap$SubMap * target$headMap(::java::lang::Object *); - ::java::util::concurrent::ConcurrentSkipListMap$SubMap * target$tailMap(::java::lang::Object *); - ::java::util::concurrent::ConcurrentSkipListMap$SubMap * target$descendingMap(); + ::java::util::concurrent::ConcurrentSkipListMap$SubMap * ConcurrentSkipListMap$SubMap$subMap(::java::lang::Object *, jboolean, ::java::lang::Object *, jboolean); + ::java::util::concurrent::ConcurrentSkipListMap$SubMap * ConcurrentSkipListMap$SubMap$headMap(::java::lang::Object *, jboolean); + ::java::util::concurrent::ConcurrentSkipListMap$SubMap * ConcurrentSkipListMap$SubMap$tailMap(::java::lang::Object *, jboolean); + ::java::util::concurrent::ConcurrentSkipListMap$SubMap * ConcurrentSkipListMap$SubMap$subMap(::java::lang::Object *, ::java::lang::Object *); + ::java::util::concurrent::ConcurrentSkipListMap$SubMap * ConcurrentSkipListMap$SubMap$headMap(::java::lang::Object *); + ::java::util::concurrent::ConcurrentSkipListMap$SubMap * ConcurrentSkipListMap$SubMap$tailMap(::java::lang::Object *); + ::java::util::concurrent::ConcurrentSkipListMap$SubMap * ConcurrentSkipListMap$SubMap$descendingMap(); ::java::util::Map$Entry * ceilingEntry(::java::lang::Object *); ::java::lang::Object * ceilingKey(::java::lang::Object *); ::java::util::Map$Entry * lowerEntry(::java::lang::Object *); @@ -67,7 +67,7 @@ public: ::java::util::Map$Entry * lastEntry(); ::java::util::Map$Entry * pollFirstEntry(); ::java::util::Map$Entry * pollLastEntry(); - ::java::util::NavigableSet * target$keySet(); + ::java::util::NavigableSet * ConcurrentSkipListMap$SubMap$keySet(); ::java::util::NavigableSet * navigableKeySet(); ::java::util::Collection * values(); ::java::util::Set * entrySet(); diff --git a/libjava/java/util/concurrent/ConcurrentSkipListMap.h b/libjava/java/util/concurrent/ConcurrentSkipListMap.h index be9beb80ca9..2f4da898b7c 100644 --- a/libjava/java/util/concurrent/ConcurrentSkipListMap.h +++ b/libjava/java/util/concurrent/ConcurrentSkipListMap.h @@ -51,7 +51,7 @@ public: ConcurrentSkipListMap(::java::util::Comparator *); ConcurrentSkipListMap(::java::util::Map *); ConcurrentSkipListMap(::java::util::SortedMap *); - virtual ::java::util::concurrent::ConcurrentSkipListMap * target$clone(); + virtual ::java::util::concurrent::ConcurrentSkipListMap * ConcurrentSkipListMap$clone(); private: void buildFromSorted(::java::util::SortedMap *); void writeObject(::java::io::ObjectOutputStream *); @@ -65,11 +65,11 @@ public: virtual jint size(); virtual jboolean isEmpty(); virtual void clear(); - virtual ::java::util::NavigableSet * target$keySet(); + virtual ::java::util::NavigableSet * ConcurrentSkipListMap$keySet(); virtual ::java::util::NavigableSet * navigableKeySet(); virtual ::java::util::Collection * values(); virtual ::java::util::Set * entrySet(); - virtual ::java::util::concurrent::ConcurrentNavigableMap * target$descendingMap(); + virtual ::java::util::concurrent::ConcurrentNavigableMap * ConcurrentSkipListMap$descendingMap(); virtual ::java::util::NavigableSet * descendingKeySet(); virtual jboolean equals(::java::lang::Object *); virtual ::java::lang::Object * putIfAbsent(::java::lang::Object *, ::java::lang::Object *); @@ -79,12 +79,12 @@ public: virtual ::java::util::Comparator * comparator(); virtual ::java::lang::Object * firstKey(); virtual ::java::lang::Object * lastKey(); - virtual ::java::util::concurrent::ConcurrentNavigableMap * target$subMap(::java::lang::Object *, jboolean, ::java::lang::Object *, jboolean); - virtual ::java::util::concurrent::ConcurrentNavigableMap * target$headMap(::java::lang::Object *, jboolean); - virtual ::java::util::concurrent::ConcurrentNavigableMap * target$tailMap(::java::lang::Object *, jboolean); - virtual ::java::util::concurrent::ConcurrentNavigableMap * target$subMap(::java::lang::Object *, ::java::lang::Object *); - virtual ::java::util::concurrent::ConcurrentNavigableMap * target$headMap(::java::lang::Object *); - virtual ::java::util::concurrent::ConcurrentNavigableMap * target$tailMap(::java::lang::Object *); + virtual ::java::util::concurrent::ConcurrentNavigableMap * ConcurrentSkipListMap$subMap(::java::lang::Object *, jboolean, ::java::lang::Object *, jboolean); + virtual ::java::util::concurrent::ConcurrentNavigableMap * ConcurrentSkipListMap$headMap(::java::lang::Object *, jboolean); + virtual ::java::util::concurrent::ConcurrentNavigableMap * ConcurrentSkipListMap$tailMap(::java::lang::Object *, jboolean); + virtual ::java::util::concurrent::ConcurrentNavigableMap * ConcurrentSkipListMap$subMap(::java::lang::Object *, ::java::lang::Object *); + virtual ::java::util::concurrent::ConcurrentNavigableMap * ConcurrentSkipListMap$headMap(::java::lang::Object *); + virtual ::java::util::concurrent::ConcurrentNavigableMap * ConcurrentSkipListMap$tailMap(::java::lang::Object *); virtual ::java::util::Map$Entry * lowerEntry(::java::lang::Object *); virtual ::java::lang::Object * lowerKey(::java::lang::Object *); virtual ::java::util::Map$Entry * floorEntry(::java::lang::Object *); diff --git a/libjava/java/util/concurrent/ConcurrentSkipListSet.h b/libjava/java/util/concurrent/ConcurrentSkipListSet.h index 75afde92de6..65ea1a9a932 100644 --- a/libjava/java/util/concurrent/ConcurrentSkipListSet.h +++ b/libjava/java/util/concurrent/ConcurrentSkipListSet.h @@ -29,7 +29,7 @@ public: public: // actually package-private ConcurrentSkipListSet(::java::util::concurrent::ConcurrentNavigableMap *); public: - virtual ::java::util::concurrent::ConcurrentSkipListSet * target$clone(); + virtual ::java::util::concurrent::ConcurrentSkipListSet * ConcurrentSkipListSet$clone(); virtual jint size(); virtual jboolean isEmpty(); virtual jboolean contains(::java::lang::Object *); @@ -52,9 +52,9 @@ public: virtual ::java::util::NavigableSet * subSet(::java::lang::Object *, jboolean, ::java::lang::Object *, jboolean); virtual ::java::util::NavigableSet * headSet(::java::lang::Object *, jboolean); virtual ::java::util::NavigableSet * tailSet(::java::lang::Object *, jboolean); - virtual ::java::util::NavigableSet * target$subSet(::java::lang::Object *, ::java::lang::Object *); - virtual ::java::util::NavigableSet * target$headSet(::java::lang::Object *); - virtual ::java::util::NavigableSet * target$tailSet(::java::lang::Object *); + virtual ::java::util::NavigableSet * ConcurrentSkipListSet$subSet(::java::lang::Object *, ::java::lang::Object *); + virtual ::java::util::NavigableSet * ConcurrentSkipListSet$headSet(::java::lang::Object *); + virtual ::java::util::NavigableSet * ConcurrentSkipListSet$tailSet(::java::lang::Object *); virtual ::java::util::NavigableSet * descendingSet(); private: void setMap(::java::util::concurrent::ConcurrentNavigableMap *); diff --git a/libjava/java/util/concurrent/DelayQueue$Itr.h b/libjava/java/util/concurrent/DelayQueue$Itr.h index ab7af20e87b..cdcc1bf20b3 100644 --- a/libjava/java/util/concurrent/DelayQueue$Itr.h +++ b/libjava/java/util/concurrent/DelayQueue$Itr.h @@ -17,7 +17,7 @@ public: // actually package-private DelayQueue$Itr(::java::util::concurrent::DelayQueue *, JArray< ::java::lang::Object * > *); public: virtual jboolean hasNext(); - virtual ::java::util::concurrent::Delayed * target$next(); + virtual ::java::util::concurrent::Delayed * DelayQueue$Itr$next(); virtual void remove(); virtual ::java::lang::Object * next(); public: // actually package-private diff --git a/libjava/java/util/concurrent/DelayQueue.h b/libjava/java/util/concurrent/DelayQueue.h index 76dd489f298..b97f32248cc 100644 --- a/libjava/java/util/concurrent/DelayQueue.h +++ b/libjava/java/util/concurrent/DelayQueue.h @@ -16,14 +16,14 @@ class java::util::concurrent::DelayQueue : public ::java::util::AbstractQueue public: DelayQueue(); DelayQueue(::java::util::Collection *); - virtual jboolean target$add(::java::util::concurrent::Delayed *); - virtual jboolean target$offer(::java::util::concurrent::Delayed *); - virtual void target$put(::java::util::concurrent::Delayed *); - virtual jboolean target$offer(::java::util::concurrent::Delayed *, jlong, ::java::util::concurrent::TimeUnit *); - virtual ::java::util::concurrent::Delayed * target$poll(); - virtual ::java::util::concurrent::Delayed * target$take(); - virtual ::java::util::concurrent::Delayed * target$poll(jlong, ::java::util::concurrent::TimeUnit *); - virtual ::java::util::concurrent::Delayed * target$peek(); + virtual jboolean DelayQueue$add(::java::util::concurrent::Delayed *); + virtual jboolean DelayQueue$offer(::java::util::concurrent::Delayed *); + virtual void DelayQueue$put(::java::util::concurrent::Delayed *); + virtual jboolean DelayQueue$offer(::java::util::concurrent::Delayed *, jlong, ::java::util::concurrent::TimeUnit *); + virtual ::java::util::concurrent::Delayed * DelayQueue$poll(); + virtual ::java::util::concurrent::Delayed * DelayQueue$take(); + virtual ::java::util::concurrent::Delayed * DelayQueue$poll(jlong, ::java::util::concurrent::TimeUnit *); + virtual ::java::util::concurrent::Delayed * DelayQueue$peek(); virtual jint size(); virtual jint drainTo(::java::util::Collection *); virtual jint drainTo(::java::util::Collection *, jint); diff --git a/libjava/java/util/concurrent/ScheduledThreadPoolExecutor$1.h b/libjava/java/util/concurrent/ScheduledThreadPoolExecutor$1.h index cd6608f955e..5ae31075595 100644 --- a/libjava/java/util/concurrent/ScheduledThreadPoolExecutor$1.h +++ b/libjava/java/util/concurrent/ScheduledThreadPoolExecutor$1.h @@ -15,7 +15,7 @@ public: // actually package-private ScheduledThreadPoolExecutor$1(::java::util::concurrent::ScheduledThreadPoolExecutor$DelayedWorkQueue *); public: jboolean hasNext(); - ::java::lang::Runnable * target$next(); + ::java::lang::Runnable * ScheduledThreadPoolExecutor$1$next(); void remove(); ::java::lang::Object * next(); private: diff --git a/libjava/java/util/concurrent/ScheduledThreadPoolExecutor$DelayedWorkQueue.h b/libjava/java/util/concurrent/ScheduledThreadPoolExecutor$DelayedWorkQueue.h index fd5871a6a72..26fac62545c 100644 --- a/libjava/java/util/concurrent/ScheduledThreadPoolExecutor$DelayedWorkQueue.h +++ b/libjava/java/util/concurrent/ScheduledThreadPoolExecutor$DelayedWorkQueue.h @@ -15,16 +15,16 @@ class java::util::concurrent::ScheduledThreadPoolExecutor$DelayedWorkQueue : pub ScheduledThreadPoolExecutor$DelayedWorkQueue(); public: - virtual ::java::lang::Runnable * target$poll(); - virtual ::java::lang::Runnable * target$peek(); - virtual ::java::lang::Runnable * target$take(); - virtual ::java::lang::Runnable * target$poll(jlong, ::java::util::concurrent::TimeUnit *); - virtual jboolean target$add(::java::lang::Runnable *); - virtual jboolean target$offer(::java::lang::Runnable *); - virtual void target$put(::java::lang::Runnable *); - virtual jboolean target$offer(::java::lang::Runnable *, jlong, ::java::util::concurrent::TimeUnit *); - virtual ::java::lang::Runnable * target$remove(); - virtual ::java::lang::Runnable * target$element(); + virtual ::java::lang::Runnable * ScheduledThreadPoolExecutor$DelayedWorkQueue$poll(); + virtual ::java::lang::Runnable * ScheduledThreadPoolExecutor$DelayedWorkQueue$peek(); + virtual ::java::lang::Runnable * ScheduledThreadPoolExecutor$DelayedWorkQueue$take(); + virtual ::java::lang::Runnable * ScheduledThreadPoolExecutor$DelayedWorkQueue$poll(jlong, ::java::util::concurrent::TimeUnit *); + virtual jboolean ScheduledThreadPoolExecutor$DelayedWorkQueue$add(::java::lang::Runnable *); + virtual jboolean ScheduledThreadPoolExecutor$DelayedWorkQueue$offer(::java::lang::Runnable *); + virtual void ScheduledThreadPoolExecutor$DelayedWorkQueue$put(::java::lang::Runnable *); + virtual jboolean ScheduledThreadPoolExecutor$DelayedWorkQueue$offer(::java::lang::Runnable *, jlong, ::java::util::concurrent::TimeUnit *); + virtual ::java::lang::Runnable * ScheduledThreadPoolExecutor$DelayedWorkQueue$remove(); + virtual ::java::lang::Runnable * ScheduledThreadPoolExecutor$DelayedWorkQueue$element(); virtual void clear(); virtual jint drainTo(::java::util::Collection *); virtual jint drainTo(::java::util::Collection *, jint); diff --git a/libjava/java/util/concurrent/ScheduledThreadPoolExecutor$ScheduledFutureTask.h b/libjava/java/util/concurrent/ScheduledThreadPoolExecutor$ScheduledFutureTask.h index 1bd4e3bdacb..ba9ad31a4a6 100644 --- a/libjava/java/util/concurrent/ScheduledThreadPoolExecutor$ScheduledFutureTask.h +++ b/libjava/java/util/concurrent/ScheduledThreadPoolExecutor$ScheduledFutureTask.h @@ -17,7 +17,7 @@ public: // actually package-private ScheduledThreadPoolExecutor$ScheduledFutureTask(::java::util::concurrent::ScheduledThreadPoolExecutor *, ::java::util::concurrent::Callable *, jlong); public: virtual jlong getDelay(::java::util::concurrent::TimeUnit *); - virtual jint target$compareTo(::java::util::concurrent::Delayed *); + virtual jint ScheduledThreadPoolExecutor$ScheduledFutureTask$compareTo(::java::util::concurrent::Delayed *); virtual jboolean isPeriodic(); private: void runPeriodic(); diff --git a/libjava/java/util/concurrent/locks/ReentrantReadWriteLock$Sync$ThreadLocalHoldCounter.h b/libjava/java/util/concurrent/locks/ReentrantReadWriteLock$Sync$ThreadLocalHoldCounter.h index c9dedf0df50..10f87c92202 100644 --- a/libjava/java/util/concurrent/locks/ReentrantReadWriteLock$Sync$ThreadLocalHoldCounter.h +++ b/libjava/java/util/concurrent/locks/ReentrantReadWriteLock$Sync$ThreadLocalHoldCounter.h @@ -14,7 +14,7 @@ class java::util::concurrent::locks::ReentrantReadWriteLock$Sync$ThreadLocalHold public: // actually package-private ReentrantReadWriteLock$Sync$ThreadLocalHoldCounter(); public: - ::java::util::concurrent::locks::ReentrantReadWriteLock$Sync$HoldCounter * target$initialValue(); + ::java::util::concurrent::locks::ReentrantReadWriteLock$Sync$HoldCounter * ReentrantReadWriteLock$Sync$ThreadLocalHoldCounter$initialValue(); ::java::lang::Object * initialValue(); static ::java::lang::Class class$; }; diff --git a/libjava/java/util/concurrent/locks/ReentrantReadWriteLock.h b/libjava/java/util/concurrent/locks/ReentrantReadWriteLock.h index 3bea3cc54a1..e7da50a750b 100644 --- a/libjava/java/util/concurrent/locks/ReentrantReadWriteLock.h +++ b/libjava/java/util/concurrent/locks/ReentrantReadWriteLock.h @@ -14,8 +14,8 @@ class java::util::concurrent::locks::ReentrantReadWriteLock : public ::java::lan public: ReentrantReadWriteLock(); ReentrantReadWriteLock(jboolean); - virtual ::java::util::concurrent::locks::ReentrantReadWriteLock$WriteLock * target$writeLock(); - virtual ::java::util::concurrent::locks::ReentrantReadWriteLock$ReadLock * target$readLock(); + virtual ::java::util::concurrent::locks::ReentrantReadWriteLock$WriteLock * ReentrantReadWriteLock$writeLock(); + virtual ::java::util::concurrent::locks::ReentrantReadWriteLock$ReadLock * ReentrantReadWriteLock$readLock(); virtual jboolean isFair(); public: // actually protected virtual ::java::lang::Thread * getOwner(); diff --git a/libjava/java/util/jar/JarFile$JarEnumeration.h b/libjava/java/util/jar/JarFile$JarEnumeration.h index 8916b5bf14b..60aea699679 100644 --- a/libjava/java/util/jar/JarFile$JarEnumeration.h +++ b/libjava/java/util/jar/JarFile$JarEnumeration.h @@ -15,7 +15,7 @@ public: // actually package-private JarFile$JarEnumeration(::java::util::Enumeration *, ::java::util::jar::JarFile *); public: virtual jboolean hasMoreElements(); - virtual ::java::util::jar::JarEntry * target$nextElement(); + virtual ::java::util::jar::JarEntry * JarFile$JarEnumeration$nextElement(); virtual ::java::lang::Object * nextElement(); private: ::java::util::Enumeration * __attribute__((aligned(__alignof__( ::java::lang::Object)))) entries; diff --git a/libjava/java/util/zip/ZipFile$ZipEntryEnumeration.h b/libjava/java/util/zip/ZipFile$ZipEntryEnumeration.h index 40a7e975b2e..f041ae04a4f 100644 --- a/libjava/java/util/zip/ZipFile$ZipEntryEnumeration.h +++ b/libjava/java/util/zip/ZipFile$ZipEntryEnumeration.h @@ -14,7 +14,7 @@ class java::util::zip::ZipFile$ZipEntryEnumeration : public ::java::lang::Object public: ZipFile$ZipEntryEnumeration(::java::util::Iterator *); virtual jboolean hasMoreElements(); - virtual ::java::util::zip::ZipEntry * target$nextElement(); + virtual ::java::util::zip::ZipEntry * ZipFile$ZipEntryEnumeration$nextElement(); virtual ::java::lang::Object * nextElement(); private: ::java::util::Iterator * __attribute__((aligned(__alignof__( ::java::lang::Object)))) elements; diff --git a/libjava/javax/imageio/ImageIO$1.h b/libjava/javax/imageio/ImageIO$1.h index 5c3ae21e031..ba1077fd49f 100644 --- a/libjava/javax/imageio/ImageIO$1.h +++ b/libjava/javax/imageio/ImageIO$1.h @@ -26,7 +26,7 @@ public: // actually package-private ImageIO$1(::java::util::Iterator *); public: jboolean hasNext(); - ::javax::imageio::ImageTranscoder * target$next(); + ::javax::imageio::ImageTranscoder * ImageIO$1$next(); void remove(); ::java::lang::Object * next(); private: diff --git a/libjava/javax/imageio/ImageIO$ImageReaderIterator.h b/libjava/javax/imageio/ImageIO$ImageReaderIterator.h index 5288ca9254c..bb0285eee30 100644 --- a/libjava/javax/imageio/ImageIO$ImageReaderIterator.h +++ b/libjava/javax/imageio/ImageIO$ImageReaderIterator.h @@ -26,7 +26,7 @@ public: ImageIO$ImageReaderIterator(::java::util::Iterator *, ::java::lang::Object *); ImageIO$ImageReaderIterator(::java::util::Iterator *); jboolean hasNext(); - ::javax::imageio::ImageReader * target$next(); + ::javax::imageio::ImageReader * ImageIO$ImageReaderIterator$next(); void remove(); ::java::lang::Object * next(); public: // actually package-private diff --git a/libjava/javax/imageio/ImageIO$ImageWriterIterator.h b/libjava/javax/imageio/ImageIO$ImageWriterIterator.h index 78f74fb2649..dcf9101f00d 100644 --- a/libjava/javax/imageio/ImageIO$ImageWriterIterator.h +++ b/libjava/javax/imageio/ImageIO$ImageWriterIterator.h @@ -26,7 +26,7 @@ public: ImageIO$ImageWriterIterator(::java::util::Iterator *, ::java::lang::Object *); ImageIO$ImageWriterIterator(::java::util::Iterator *); jboolean hasNext(); - ::javax::imageio::ImageWriter * target$next(); + ::javax::imageio::ImageWriter * ImageIO$ImageWriterIterator$next(); void remove(); ::java::lang::Object * next(); public: // actually package-private diff --git a/libjava/javax/print/attribute/standard/JobStateReasons.h b/libjava/javax/print/attribute/standard/JobStateReasons.h index 4e5fce82d60..e02a3e7e99b 100644 --- a/libjava/javax/print/attribute/standard/JobStateReasons.h +++ b/libjava/javax/print/attribute/standard/JobStateReasons.h @@ -33,7 +33,7 @@ public: JobStateReasons(jint, jfloat); JobStateReasons(jint); JobStateReasons(::java::util::Collection *); - jboolean target$add(::javax::print::attribute::standard::JobStateReason *); + jboolean JobStateReasons$add(::javax::print::attribute::standard::JobStateReason *); ::java::lang::Class * getCategory(); ::java::lang::String * getName(); jboolean add(::java::lang::Object *); diff --git a/libjava/javax/print/attribute/standard/PrinterStateReasons.h b/libjava/javax/print/attribute/standard/PrinterStateReasons.h index bedc8b81d54..fc3d70330e4 100644 --- a/libjava/javax/print/attribute/standard/PrinterStateReasons.h +++ b/libjava/javax/print/attribute/standard/PrinterStateReasons.h @@ -35,7 +35,7 @@ public: PrinterStateReasons(jint); PrinterStateReasons(::java::util::Map *); ::java::util::Set * printerStateReasonSet(::javax::print::attribute::standard::Severity *); - ::javax::print::attribute::standard::Severity * target$put(::javax::print::attribute::standard::PrinterStateReason *, ::javax::print::attribute::standard::Severity *); + ::javax::print::attribute::standard::Severity * PrinterStateReasons$put(::javax::print::attribute::standard::PrinterStateReason *, ::javax::print::attribute::standard::Severity *); ::java::lang::Class * getCategory(); ::java::lang::String * getName(); ::java::lang::Object * put(::java::lang::Object *, ::java::lang::Object *);