Index: jython/org/python/core/PyJavaClass.java
===================================================================
RCS file: /cvsroot/jython/jython/org/python/core/PyJavaClass.java,v
retrieving revision 2.41
diff -c -r2.41 PyJavaClass.java
*** jython/org/python/core/PyJavaClass.java	6 Nov 2002 14:53:47 -0000	2.41
--- jython/org/python/core/PyJavaClass.java	21 Nov 2002 21:59:14 -0000
***************
*** 128,134 ****
                  m.initModule(__dict__);
              }
              catch (Exception exc) {
- //                 System.err.println("Got exception: " + exc);
                  throw Py.JavaError(exc);
              }
          }
--- 128,133 ----
***************
*** 141,153 ****
          if (__dict__ != null)
              return;
          PyStringMap d = new PyStringMap();
- //         d.__setitem__("__module__", Py.None);
          __dict__ = d;
          try {
              Method[] methods = getAccessibleMethods(proxyClass);
!             setBeanInfoCustom(proxyClass, methods);
!             setFields(proxyClass);
!             setMethods(proxyClass, methods);
          } catch (SecurityException se) {}
      }
  
--- 140,153 ----
          if (__dict__ != null)
              return;
          PyStringMap d = new PyStringMap();
          __dict__ = d;
          try {
              Method[] methods = getAccessibleMethods(proxyClass);
! 	    setAttributes(proxyClass, methods);
! 	    Class [] intfs = proxyClass.getInterfaces();
! 	    for (int i = 0; i < intfs.length; i++) {
! 		setAttributes(intfs[i], methods);
! 	    }
          } catch (SecurityException se) {}
      }
  
***************
*** 266,277 ****
              // interfaces...
              c = c.getSuperclass();
          }
- //        return (Field[])fields.toArray(new Field[fields.size()]);
          Field[] ret = new Field[fields.size()];
          fields.copyInto(ret);
          return ret;
      }
  
      private void setFields(Class c) {
          Field[] fields = getAccessibleFields(c);
          for (int i=0; i<fields.length; i++) {
--- 266,284 ----
              // interfaces...
              c = c.getSuperclass();
          }
          Field[] ret = new Field[fields.size()];
          fields.copyInto(ret);
          return ret;
      }
  
+     private void setAttributes(Class c, Method[] methods) {
+ 	if (Modifier.isPublic(c.getModifiers())) {
+             setBeanInfoCustom(c, methods);
+ 	    setFields(c);
+ 	    setMethods(c, methods);
+ 	}
+     }
+ 
      private void setFields(Class c) {
          Field[] fields = getAccessibleFields(c);
          for (int i=0; i<fields.length; i++) {
***************
*** 454,472 ****
                      }
                  }
              }
-             // This is now handled in setFields which gets called after
-             // setBeanProperties
- //             else {
- //                 // Keep static fields around...
- //                 PyReflectedField field = (PyReflectedField)o;
- //                 if (Modifier.isStatic(field.field.getModifiers())) {
- //                     prop.field = field.field;
- //                 } else {
- //                     // If the field is not static (and thus subsumable)
- //                     // don't overwrite
- //                     return;
- //                 }
- //             }
          }
          if (set)
              __dict__.__setitem__(name, prop);
--- 461,466 ----
***************
*** 493,499 ****
         This is needed due to bugs in Netscape Navigator
      */
      private static String decapitalize(String s) {
-         //return java.beans.Introspector.decapitalize(s);
          if (s.length() == 0)
              return s;
          char c0 = s.charAt(0);
--- 487,492 ----
***************
*** 510,516 ****
  
      // This method is a workaround for Netscape's stupid security bug!
      private void setBeanInfoCustom(Class c, Method[] meths) {
-         //try {
          int i;
          int n = meths.length;
          for (i=0; i<n; i++) {
--- 503,508 ----
***************
*** 539,545 ****
                  getter = method;
                  pname = decapitalize(name.substring(3));
                  myType = ret;
-                 //System.out.println("get: "+name+", "+myType);
              } else {
                  if (name.startsWith("is")) {
                      if (args.length != 0 || ret != Boolean.TYPE)
--- 531,536 ----
***************
*** 554,560 ****
                          setter = method;
                          pname = decapitalize(name.substring(3));
                          myType = args[0];
-                         //System.out.println("set: "+name+", "+myType);
                      } else {
                          continue;
                      }
--- 545,550 ----
***************
*** 572,578 ****
                          addProperty(pname, myType, getter, setter);
                      }
                  } else {
-                     //System.out.println("p: "+prop.myType+", "+myType);
                      if (getter != null) prop.getMethod = getter;
                      if (setter != null && (ret == Void.TYPE || prop.setMethod==null))
                          prop.setMethod = setter;
--- 562,567 ----
***************
*** 627,636 ****
  
              addEvent(name, eClass, method, eClass.getMethods());
          }
-         /*} catch (Throwable t) {
-           System.err.println("Custom Bean error: "+t);
-           t.printStackTrace();
-           }*/
      }
  
       /**
--- 616,621 ----
***************
*** 686,692 ****
--- 671,679 ----
              }
          }
      }
+ 
      private boolean constructorsInitialized=false;
+ 
      synchronized void initConstructors() {
          if (constructorsInitialized)
              return;
***************
*** 800,808 ****
          }
          PyObject result = classInstance.__findattr__(name);
          return result;
-         //if (result == null) return null;
-         //__dict__.__setitem__(name, result);
-         //return result;
      }
  
      private PyObject findInnerClass(String name) {
--- 787,792 ----
***************
*** 832,838 ****
  
          if (!field._dodel(null)) {
              __dict__.__delitem__(name);
-             //throw Py.TypeError("attr not deletable: "+name);
          }
      }
  
--- 816,821 ----