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..4a10187 100644 (file)
--- a/src/edu/berkeley/sbp/bind/Bindable.java
+++ b/src/edu/berkeley/sbp/bind/Bindable.java
@@ -20,6 +20,7 @@ public abstract class Bindable implements ToJava {
 
     public abstract Annotation[][] getArgAnnotations();
     public abstract String[]       getArgNames();
+    public abstract Class[]        getArgTypes();
 
     public static Bindable create(Object o) {
         if (o instanceof Class) return new BindableClass((Class)o);
@@ -37,6 +38,7 @@ public abstract class Bindable implements ToJava {
         public Object impose(Object[] fields) { return Reflection.impose(_method, fields); }
         public Annotation[][] getArgAnnotations() { return _method.getParameterAnnotations(); }
         public String[]       getArgNames() { return new String[_method.getParameterTypes().length]; }
+        public Class[]        getArgTypes() { return _method.getParameterTypes(); }
         public void toJava(StringBuffer sb) {
             sb.append("Bindable.create(");
             sb.append(_method.getDeclaringClass().getName().replace('$','.'));
@@ -52,11 +54,12 @@ public abstract class Bindable implements ToJava {
         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 String[]       getArgNames() { return new String[_constructor.getParameterTypes().length]; }
+        public Class[]        getArgTypes() { return _constructor.getParameterTypes(); }
         public void toJava(StringBuffer sb) {
             sb.append("Bindable.create(");
             sb.append(_constructor.getDeclaringClass().getName().replace('$','.'));
@@ -70,12 +73,7 @@ public abstract class Bindable implements ToJava {
         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() {
@@ -92,6 +90,13 @@ public abstract class Bindable implements ToJava {
                 ret[i] = fields[i].getName();
             return ret;
         }
+        public Class[]       getArgTypes() {
+            Field[] fields = _class.getFields();
+            Class[] ret = new Class[fields.length];
+            for(int i=0; i<fields.length; i++)
+                ret[i] = fields[i].getType();
+            return ret;
+        }
         public void toJava(StringBuffer sb) {
             sb.append("Bindable.create(");
             sb.append(_class.getName().replace('$','.'));