diff options
| author | Andrew Haley <aph@redhat.com> | 2008-05-22 16:20:55 +0000 |
|---|---|---|
| committer | Andrew Haley <aph@gcc.gnu.org> | 2008-05-22 16:20:55 +0000 |
| commit | 9f8e4e845ba0240f599fd541c5cee10cf8654cc5 (patch) | |
| tree | 74bb902e22e1765a9f3eb9e9c8e239af478de42b /libjava | |
| parent | 4799e6aa58eab27112b27c9ca328f57430f8d1ab (diff) | |
| download | gcc-9f8e4e845ba0240f599fd541c5cee10cf8654cc5.zip gcc-9f8e4e845ba0240f599fd541c5cee10cf8654cc5.tar.gz gcc-9f8e4e845ba0240f599fd541c5cee10cf8654cc5.tar.bz2 | |
re PR libgcj/35020 (Class.getSimpleName() differs from Sun Java)
2008-05-22 Andrew Haley <aph@redhat.com>
PR libgcj/35020
* java/lang/Class.java (getSimpleName): Import from GNU Classpath.
From-SVN: r135771
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 5 | ||||
| -rw-r--r-- | libjava/classpath/lib/java/lang/Class$1.class | bin | 677 -> 677 bytes | |||
| -rw-r--r-- | libjava/classpath/lib/java/lang/Class.class | bin | 15647 -> 15581 bytes | |||
| -rw-r--r-- | libjava/java/lang/Class.java | 29 |
4 files changed, 22 insertions, 12 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index e8cd46e..52061d2 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2008-05-22 Andrew Haley <aph@redhat.com> + + PR libgcj/35020 + * java/lang/Class.java (getSimpleName): Import from GNU Classpath. + 2008-05-20 David Daney <ddaney@avtrex.com> PR libgcj/36252 diff --git a/libjava/classpath/lib/java/lang/Class$1.class b/libjava/classpath/lib/java/lang/Class$1.class Binary files differindex 51ef884..09e3e86 100644 --- a/libjava/classpath/lib/java/lang/Class$1.class +++ b/libjava/classpath/lib/java/lang/Class$1.class diff --git a/libjava/classpath/lib/java/lang/Class.class b/libjava/classpath/lib/java/lang/Class.class Binary files differindex ffe072f..bdcfcfe 100644 --- a/libjava/classpath/lib/java/lang/Class.class +++ b/libjava/classpath/lib/java/lang/Class.class diff --git a/libjava/java/lang/Class.java b/libjava/java/lang/Class.java index 691f983..d59e83e 100644 --- a/libjava/java/lang/Class.java +++ b/libjava/java/lang/Class.java @@ -1075,22 +1075,27 @@ public final class Class<T> */ public String getSimpleName() { - StringBuffer sb = new StringBuffer(); - Class klass = this; - int arrayCount = 0; - while (klass.isArray()) + if (isAnonymousClass()) + return ""; + if (isArray()) { - klass = klass.getComponentType(); - ++arrayCount; + return getComponentType().getSimpleName() + "[]"; } - if (! klass.isAnonymousClass()) + String fullName = getName(); + int pos = fullName.lastIndexOf("$"); + if (pos == -1) + pos = 0; + else { - String fullName = klass.getName(); - sb.append(fullName, fullName.lastIndexOf(".") + 1, fullName.length()); + ++pos; + while (Character.isDigit(fullName.charAt(pos))) + ++pos; } - while (arrayCount-- > 0) - sb.append("[]"); - return sb.toString(); + int packagePos = fullName.lastIndexOf(".", pos); + if (packagePos == -1) + return fullName.substring(pos); + else + return fullName.substring(packagePos + 1); } /** |