X-Git-Url: http://git.megacz.com/?p=sbp.git;a=blobdiff_plain;f=src%2Fedu%2Fberkeley%2Fsbp%2Futil%2FReflection.java;h=2cc7b0a5933517372e3c028c81e3d714a0e4785e;hp=3a129d48db8b89c21515aba9102a63b0f2a93a87;hb=fa49c4e86eaabb1fad07bcfdfb004aa1fc0dea8a;hpb=0f0ed458838eb080e12ad9a52a46a4060d40df43

diff --git a/src/edu/berkeley/sbp/util/Reflection.java b/src/edu/berkeley/sbp/util/Reflection.java
index 3a129d4..2cc7b0a 100644
--- a/src/edu/berkeley/sbp/util/Reflection.java
+++ b/src/edu/berkeley/sbp/util/Reflection.java
@@ -54,7 +54,7 @@ public final class Reflection {
 
     public static String show(Object o) {
         if (o==null) return "null";
-        if (o instanceof Show) return ((Show)o).toString();
+        if (o instanceof Show) return show((Show)o);
         if (! (o instanceof Object[])) return o.toString() + " : " + o.getClass().getName();
         Object[] arr = (Object[])o;
         StringBuffer ret = new StringBuffer();
@@ -219,7 +219,7 @@ public final class Reflection {
                 if (f[i].getType() == String.class) tgt = stringify(tgt);
                 // FUGLY
                 tgt = coerce(tgt, f[i].getType());
-                System.err.println("setting a " + f[i].getType().getName() + " to " + Reflection.show(tgt));
+                //System.err.println("setting a " + f[i].getType().getName() + " to " + Reflection.show(tgt));
                 f[i].set(ret, tgt);
             }
             return ret;
@@ -239,10 +239,10 @@ public final class Reflection {
                 if (argTypes[i] == String.class) tgt = Reflection.stringify(tgt);
                 // FUGLY
                 tgt = Reflection.coerce(tgt, argTypes[i]);
-                System.err.println("setting a " + argTypes[i].getName() + " to " + Reflection.show(tgt));
+                //System.err.println("setting a " + argTypes[i].getName() + " to " + Reflection.show(tgt));
                 args[i] = tgt;
             }
-            System.err.println("invoking " + _method + " with " + Reflection.show(args));
+            //System.err.println("invoking " + _method + " with " + Reflection.show(args));
             return _method.invoke(null, args);
         } catch (Exception e) {
             throw new RuntimeException(e);
@@ -259,7 +259,7 @@ public final class Reflection {
                 if (argTypes[i] == String.class) tgt = Reflection.stringify(tgt);
                 // FUGLY
                 tgt = Reflection.coerce(tgt, argTypes[i]);
-                System.err.println("setting a " + argTypes[i].getName() + " to " + Reflection.show(tgt));
+                //System.err.println("setting a " + argTypes[i].getName() + " to " + Reflection.show(tgt));
                 args[i] = tgt;
             }
             return _ctor.newInstance(args);
@@ -284,6 +284,10 @@ public final class Reflection {
         if (c == char.class) {
             return o.toString().charAt(0);
         }
+        if (c==int.class || c==Integer.class) {
+            String s = (String)coerce(o, String.class);
+            return new Integer(Integer.parseInt(s));
+        }
 
         if (o.getClass().isArray() &&
             o.getClass().getComponentType().isArray() &&
@@ -311,77 +315,16 @@ public final class Reflection {
             for(int i=0; i<((Object[])o).length; i++) {
                 Object ob = (((Object[])o)[i]);
                 if (ob != null) {
-                    System.err.println("no hit with " + c.getComponentType().getName() + " on " + Reflection.show(((Object[])o)[i]));
+                    //System.err.println("no hit with " + c.getComponentType().getName() + " on " + Reflection.show(((Object[])o)[i]));
                     ok = false;
                 }
             }
             if (ok) {
-                System.err.println("hit with " + c.getComponentType().getName());
+                //System.err.println("hit with " + c.getComponentType().getName());
                 return Array.newInstance(c.getComponentType(), ((Object[])o).length);
             }
         }
         return o;
     }
 
-    public static abstract class Bindable {
-        public abstract String getSimpleName();
-        public abstract String toString();
-        public abstract <A extends Annotation> A getAnnotation(Class<A> c);
-        public abstract Object impose(Object[] fields);
-        public boolean isAnnotationPresent(Class<? extends Annotation> c) { return getAnnotation(c) != null; }
-
-        public abstract Annotation[][] getArgAnnotations();
-        public abstract String[]       getArgNames();
-
-        public static Bindable create(Object o) {
-            if (o instanceof Class) return new BindableClass((Class)o);
-            if (o instanceof Method) return new BindableMethod((Method)o);
-            if (o instanceof Constructor) return new BindableConstructor((Constructor)o);
-            return null;
-        }
-    }
-
-    private static class BindableMethod extends Bindable {
-        private final Method _method;
-        public String toString() { return "BindableMethod["+_method+"]"; }
-        public BindableMethod(Method _method) { this._method = _method; }
-        public String getSimpleName() { return _method.getName(); }
-        public <A extends Annotation> A getAnnotation(Class<A> c) { return _method.getAnnotation(c); }
-        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]; }
-    }
-    private static class BindableConstructor extends Bindable {
-        private final Constructor _constructor;
-        public String toString() { return "BindableConstructor["+_constructor+"]"; }
-        public BindableConstructor(Constructor _constructor) { this._constructor = _constructor; }
-        public String getSimpleName() { return _constructor.getName(); }
-        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]; }
-    }
-    private static class BindableClass extends Bindable {
-        private final Class _class;
-        public String toString() { return "BindableClass["+_class+"]"; }
-        public BindableClass(Class _class) { this._class = _class; }
-        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() {
-            Field[] fields = _class.getFields();
-            Annotation[][] ret = new Annotation[fields.length][];
-            for(int i=0; i<fields.length; i++)
-                ret[i] = fields[i].getAnnotations();
-            return ret;
-        }
-        public String[]       getArgNames() {
-            Field[] fields = _class.getFields();
-            String[] ret = new String[fields.length];
-            for(int i=0; i<fields.length; i++)
-                ret[i] = fields[i].getName();
-            return ret;
-        }
-    }
-
 }