checkpoint

[sbp.git] / src / edu / berkeley / sbp / bind / Bindable.java

diff --git a/src/edu/berkeley/sbp/bind/Bindable.java b/src/edu/berkeley/sbp/bind/Bindable.java
index d045e16..0e2da13 100644 (file)
--- a/src/edu/berkeley/sbp/bind/Bindable.java
+++ b/src/edu/berkeley/sbp/bind/Bindable.java
@@ -52,7 +52,7 @@ public abstract class Bindable implements ToJava {
         private final Constructor _constructor;
         public String toString() { return "BindableConstructor["+_constructor+"]"; }
         public BindableConstructor(Constructor _constructor) { this._constructor = _constructor; }
         private final Constructor _constructor;
         public String toString() { return "BindableConstructor["+_constructor+"]"; }
         public BindableConstructor(Constructor _constructor) { this._constructor = _constructor; }

-        public String getSimpleName() { return _constructor.getName(); }
+        public String getSimpleName() { return _constructor.getDeclaringClass().getSimpleName(); }

         public <A extends Annotation> A getAnnotation(Class<A> c) { return _constructor.getAnnotation(c); }
         public Object impose(Object[] fields) { return Reflection.impose(_constructor, fields); }
         public Annotation[][] getArgAnnotations() { return _constructor.getParameterAnnotations(); }
         public <A extends Annotation> A getAnnotation(Class<A> c) { return _constructor.getAnnotation(c); }
         public Object impose(Object[] fields) { return Reflection.impose(_constructor, fields); }
         public Annotation[][] getArgAnnotations() { return _constructor.getParameterAnnotations(); }

@@ -70,12 +70,7 @@ public abstract class Bindable implements ToJava {
         private final Class _class;
         public String toString() { return "BindableClass["+_class+"]"; }
         public BindableClass(Class _class) { this._class = _class; }
         private final Class _class;
         public String toString() { return "BindableClass["+_class+"]"; }
         public BindableClass(Class _class) { this._class = _class; }

-        public String getSimpleName() {
-            String s = _class.getSimpleName();
-            if (s.indexOf('$') != -1)
-                return s.substring(s.indexOf('$')+1);
-            return s;
-        }
+        public String getSimpleName() { return _class.getSimpleName(); }

         public <A extends Annotation> A getAnnotation(Class<A> c) { return (A)_class.getAnnotation(c); }
         public Object impose(Object[] fields) { return Reflection.impose(_class, fields); }
         public Annotation[][] getArgAnnotations() {
         public <A extends Annotation> A getAnnotation(Class<A> c) { return (A)_class.getAnnotation(c); }
         public Object impose(Object[] fields) { return Reflection.impose(_class, fields); }
         public Annotation[][] getArgAnnotations() {