From ea76b80108b4c292379e37e01cdbb9d984d74759 Mon Sep 17 00:00:00 2001 From: Henning Heinold Date: Wed, 18 Jul 2012 22:48:50 +0200 Subject: classpath: update to version 0.99 * switch to INC_PR for native and initial * clean up dependencies * inherit gettext class instead of depeding directly on the package * clean up patches --- .../classpath/classpath-0.98/SimpleName.diff | 66 ---------------------- 1 file changed, 66 deletions(-) delete mode 100644 recipes-core/classpath/classpath-0.98/SimpleName.diff (limited to 'recipes-core/classpath/classpath-0.98/SimpleName.diff') diff --git a/recipes-core/classpath/classpath-0.98/SimpleName.diff b/recipes-core/classpath/classpath-0.98/SimpleName.diff deleted file mode 100644 index ff2bec0..0000000 --- a/recipes-core/classpath/classpath-0.98/SimpleName.diff +++ /dev/null @@ -1,66 +0,0 @@ -Index: vm/reference/java/lang/VMClass.java -=================================================================== -RCS file: /sources/classpath/classpath/vm/reference/java/lang/VMClass.java,v -retrieving revision 1.20 -diff -u -r1.20 VMClass.java ---- vm/reference/java/lang/VMClass.java 18 Sep 2007 21:52:38 -0000 1.20 -+++ vm/reference/java/lang/VMClass.java 19 Apr 2008 15:19:00 -0000 -@@ -296,27 +296,43 @@ - */ - static String getSimpleName(Class klass) - { -+ int arrayCount = 0; -+ while (klass.isArray()) -+ { -+ klass = klass.getComponentType(); -+ ++arrayCount; -+ } -+ // now klass is the component type -+ -+ String simpleComponentName = null; - if (isAnonymousClass(klass)) -- return ""; -- if (isArray(klass)) - { -- return getComponentType(klass).getSimpleName() + "[]"; -+ simpleComponentName = ""; - } -- String fullName = getName(klass); -- int pos = fullName.lastIndexOf("$"); -- if (pos == -1) -- pos = 0; - else - { -- ++pos; -- while (Character.isDigit(fullName.charAt(pos))) -- ++pos; -+ String fullName = getName(klass); -+ int pos = fullName.lastIndexOf("$"); -+ if (pos != -1) -+ { //inner class or local class -+ // skip digits of local classes -+ while (Character.isDigit(fullName.charAt(pos+1))) -+ pos++; -+ } -+ else -+ { -+ pos = fullName.lastIndexOf("."); -+ } -+ simpleComponentName = fullName.substring(pos+1); - } -- int packagePos = fullName.lastIndexOf(".", pos); -- if (packagePos == -1) -- return fullName.substring(pos); -- else -- return fullName.substring(packagePos + 1); -+ -+ if (arrayCount == 0) -+ return simpleComponentName; -+ -+ StringBuffer sb = new StringBuffer(simpleComponentName); -+ while (arrayCount-- > 0) -+ sb.append("[]"); -+ return sb.toString(); - } - - /** -- cgit v1.2.3-54-g00ecf