diff options
| author | Mark Wielaard <mark@klomp.org> | 2007-03-05 17:27:44 +0000 |
|---|---|---|
| committer | Tom Tromey <tromey@gcc.gnu.org> | 2007-03-05 17:27:44 +0000 |
| commit | 666ff4f65d256dec0974941605cf76db0b138a76 (patch) | |
| tree | 7094a7844e13e49f92832894c3b7a7f8ff638d8b /libjava/java/lang/String.h | |
| parent | b48a45922ddcdfd0aa2cd3ff24c7c158d20c1f2e (diff) | |
| download | gcc-666ff4f65d256dec0974941605cf76db0b138a76.zip gcc-666ff4f65d256dec0974941605cf76db0b138a76.tar.gz gcc-666ff4f65d256dec0974941605cf76db0b138a76.tar.bz2 | |
Character.java: Re-merged with Classpath.
2007-03-05 Mark Wielaard <mark@klomp.org>
* java/lang/Character.java: Re-merged with Classpath.
* java/lang/natString.cc (nativeCompareTo): Renamed from
compareTo.
* java/lang/StringBuilder.java: Re-merged with Classpath.
* java/lang/String.java: Re-merged with Classpath.
(nativeCompareTo): Renamed from compareTo.
* java/lang/StringBuffer.java: Re-merged with Classpath.
* jni.cc (_Jv_JNI_GetAnyMethodID): Split calls to append.
From-SVN: r122560
Diffstat (limited to 'libjava/java/lang/String.h')
| -rw-r--r-- | libjava/java/lang/String.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/libjava/java/lang/String.h b/libjava/java/lang/String.h index 44be274..eea80fb 100644 --- a/libjava/java/lang/String.h +++ b/libjava/java/lang/String.h @@ -62,8 +62,10 @@ public: jboolean contentEquals(::java::lang::StringBuffer *); jboolean contentEquals(::java::lang::CharSequence *); jboolean equalsIgnoreCase(::java::lang::String *); - jint compareTo(::java::lang::String *); - jint compareTo(::java::lang::Object *); + jint target$compareTo(::java::lang::String *); +private: + jint nativeCompareTo(::java::lang::String *); +public: jint compareToIgnoreCase(::java::lang::String *); jboolean regionMatches(jint, ::java::lang::String *, jint, jint); jboolean regionMatches(jboolean, jint, ::java::lang::String *, jint, jint); @@ -107,15 +109,22 @@ public: static ::java::lang::String * valueOf(jlong); static ::java::lang::String * valueOf(jfloat); static ::java::lang::String * valueOf(jdouble); + static ::java::lang::String * format(::java::util::Locale *, ::java::lang::String *, JArray< ::java::lang::Object * > *); + static ::java::lang::String * format(::java::lang::String *, JArray< ::java::lang::Object * > *); ::java::lang::String * intern(); jint codePointCount(jint, jint); jboolean contains(::java::lang::CharSequence *); ::java::lang::String * replace(::java::lang::CharSequence *, ::java::lang::CharSequence *); + jint offsetByCodePoints(jint, jint); + jboolean isEmpty(); private: void init(JArray< jchar > *, jint, jint, jboolean); void init(JArray< jbyte > *, jint, jint, jint); void init(JArray< jbyte > *, jint, jint, ::java::lang::String *); void init(::gnu::gcj::runtime::StringBuffer *); +public: + jint compareTo(::java::lang::Object *); +private: static const jlong serialVersionUID = -6849794470754667710LL; ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) data; jint boffset; |