diff -crw jcfe/LastBuild.txt jcfe.orig/LastBuild.txt
*** jcfe/LastBuild.txt	Mon Aug 20 19:11:41 2001
--- jcfe.orig/LastBuild.txt	Thu Jul  5 17:24:30 2001
***************
*** 1,10 ****
! Last build began on August 20 2001 at 1911.
  
! Ant file:       /Users/shane/Projects/jcfe/build/build.xml.
  User:		shane.
! Java VM:	1.3.1.
! 
! Full build completed.
! 
! 
  
--- 1,7 ----
! Last build began on July 5 2001 at 1724.
  
! Ant file:       /Users/shane/Projects/jcfe.orig/build/build.xml.
  User:		shane.
! Java VM:	1.3.0.
  
+ Full build not completed.
Only in jcfe.orig: classes
Only in jcfe.orig: docs
Only in jcfe.orig: lib
Only in jcfe: license.txt
diff -crw jcfe/src/com/develop/classfile/ClassFile.java jcfe.orig/src/com/develop/classfile/ClassFile.java
*** jcfe/src/com/develop/classfile/ClassFile.java	Tue Jun 26 19:12:24 2001
--- jcfe.orig/src/com/develop/classfile/ClassFile.java	Wed Apr 25 16:42:22 2001
***************
*** 22,28 ****
    private short access_flags;
    public short this_class = 0;
    public short super_class = 0;
-   public JavaType super_class_type = null;
    //private short interfaces_count = 0;
    private HashMap interfaces = new HashMap();
    //private short fields_count = 0;
--- 22,27 ----
***************
*** 118,127 ****
    }
  
    public void setSuperclass(String name) {
!       super_class_type = new JavaType(name);
!       super_class = addClass(super_class_type);
    }
- 
    public short addConstant(cp_info info) {
      if (info == null) return 0;
      HashMap check = (HashMap) constantMap.get(info.getClass());
--- 117,124 ----
    }
  
    public void setSuperclass(String name) {
!     super_class = addClass(new JavaType(name));
    }
    public short addConstant(cp_info info) {
      if (info == null) return 0;
      HashMap check = (HashMap) constantMap.get(info.getClass());
Only in jcfe/src/com/develop/delegator: #ByteCodeGenerator.java#
diff -crw jcfe/src/com/develop/delegator/ByteCodeGenerator.java jcfe.orig/src/com/develop/delegator/ByteCodeGenerator.java
*** jcfe/src/com/develop/delegator/ByteCodeGenerator.java	Tue Jun 26 19:12:47 2001
--- jcfe.orig/src/com/develop/delegator/ByteCodeGenerator.java	Sun Mar 18 23:40:18 2001
***************
*** 74,82 ****
      static private void addInitMethod(ClassFile cf) {
          MethodMachine mm = new MethodMachine(cf, "<init>", "(" + handlerClassName + ")V");
          mm.xload('A', 0);
!         //mm.invokespecial(new JavaType("Ljava/lang/Object;"), "<init>", "()V");
!         /** only null constructors work currently **/
!         mm.invokespecial(cf.super_class_type, "<init>", "()V");
          mm.xload('A', 0);
          mm.xload('A', 1);
          mm.putfield(cf.getThisClassString(), handlerFieldName, handlerClassName);
--- 74,80 ----
      static private void addInitMethod(ClassFile cf) {
          MethodMachine mm = new MethodMachine(cf, "<init>", "(" + handlerClassName + ")V");
          mm.xload('A', 0);
!         mm.invokespecial(new JavaType("Ljava/lang/Object;"), "<init>", "()V");
          mm.xload('A', 0);
          mm.xload('A', 1);
          mm.putfield(cf.getThisClassString(), handlerFieldName, handlerClassName);
diff -crw jcfe/src/com/develop/delegator/ProxyLoader.java jcfe.orig/src/com/develop/delegator/ProxyLoader.java
*** jcfe/src/com/develop/delegator/ProxyLoader.java	Mon Aug 20 19:08:07 2001
--- jcfe.orig/src/com/develop/delegator/ProxyLoader.java	Sun Mar 18 23:47:02 2001
***************
*** 125,134 ****
  
      static public String getProxyKey(Class[] itfs) {
          int length=itfs.length;
!         // can have a zero length interface array now
! //          if (length == 0) {
! //              throw new IllegalArgumentException();
! //          }
          StringBuffer sb = new StringBuffer();
          for (int n=0; n<length; n++) {
              sb.append(itfs[n].getName());
--- 125,133 ----
  
      static public String getProxyKey(Class[] itfs) {
          int length=itfs.length;
!         if (length == 0) {
!             throw new IllegalArgumentException();
!         }
          StringBuffer sb = new StringBuffer();
          for (int n=0; n<length; n++) {
              sb.append(itfs[n].getName());
***************
*** 138,148 ****
      }
  
      static public Class getProxyClass(ClassLoader ldr, Class[] interfaces) {
-         return getProxyClass(ldr, interfaces, Proxy.class);
-     }
- 
-     static public Class getProxyClass(ClassLoader ldr, Class[] interfaces,
-                                       Class superclass) {
                  // Workaround suggested by Nascif Abousalh-Neto, nascif@nortelnetworks.com
                  // [Nascif]
          // If the object was created by the bootstrap
--- 137,142 ----
***************
*** 158,171 ****
                  // This changes the documented semantics, but it works for most apps
                  // so enable this by setting the property 
                  // com.develop.delegator.HandleNullClassLoader
!         if (ldr == null) {
!             if (handleNullCL) {
                  ldr = ClassLoader.getSystemClassLoader();
                  if (ldr == null)
                      throw new InternalError("getSystemClassLoader failed");
!             } else {
!                 throw new IllegalArgumentException("Proxy implementations " +
! "not provided by the VM cannot inject classes into bootstrap classloader");
              }
          }
          LoaderGroup grp = getLoaderGroup(ldr);
--- 152,167 ----
                  // This changes the documented semantics, but it works for most apps
                  // so enable this by setting the property 
                  // com.develop.delegator.HandleNullClassLoader
!         if (ldr == null) 
!                 {
!                         if (handleNullCL)
!                 {
                  ldr = ClassLoader.getSystemClassLoader();
                                  if (ldr == null)
                                  throw new InternalError("getSystemClassLoader failed");
!                 } else 
!                         {
!                                 throw new IllegalArgumentException("Proxy implementations not provided by the VM cannot inject classes into bootstrap classloader");
                          }
                  }
          LoaderGroup grp = getLoaderGroup(ldr);
***************
*** 173,179 ****
          synchronized (grp) {
              Class cls = grp.getProxy(key);
              if (cls == null) {
!                 cls = createNewProxy(grp, key, ldr, interfaces, superclass);
              }
              return cls;
          }
--- 169,175 ----
          synchronized (grp) {
              Class cls = grp.getProxy(key);
              if (cls == null) {
!                 cls = createNewProxy(grp, key, ldr, interfaces);
              }
              return cls;
          }
***************
*** 211,255 ****
          catch (ClassNotFoundException cnfe) {}
          finally {
              if (!succeed)
!                 throw new IllegalArgumentException("Class " + cls.getName() + 
!                                              " not visible to loader " + cl);
          }
      }
  
      static private Class createNewProxy(LoaderGroup gr, 
!                                         String key, 
!                                         ClassLoader ldr, 
!                                         Class[] itfs, 
!                                         Class superclass) { 
          int itfCount = itfs.length;
          String pkgName = null;
          String newPkgName = null;
          int n=0;
          int mods;
          Class itf=null;
-         boolean isAProxy = Proxy.class.isAssignableFrom(superclass);
-         if (!isAProxy) {
-             /*
-              * Verify that the superclass Class object is actually a 
-              * class (might need more checking for final and what not).
-              */
-             if (superclass.isInterface()) {
-                 throw new IllegalArgumentException(
-                    superclass.getName() + " is an interface");
-             }
-             try {
-                 /** might want to do getDeclaredConstructor() **/
-                 int mod = superclass.getDeclaredConstructor(new Class[0])
-                     .getModifiers();
-                 if (Modifier.isPrivate(mod)) {
-                     throw new IllegalArgumentException(
-                superclass.getName() + " constructor must not be private");
-                 }
-             } catch (NoSuchMethodException nme) {
-                 throw new IllegalArgumentException(
-                    superclass.getName() + " has no default constructor");
-             }
-         }           
          for (n=0; n<itfCount; n++) {
              itf = itfs[n];
              checkLoaderVisibility(ldr, itf);
--- 207,224 ----
          catch (ClassNotFoundException cnfe) {}
          finally {
              if (!succeed)
!                 throw new IllegalArgumentException("Class " + cls.getName() + " not visible to loader " + cl);
          }
      }
  
      static private Class createNewProxy(LoaderGroup gr, 
!                         String key, ClassLoader ldr, Class[] itfs) { 
          int itfCount = itfs.length;
          String pkgName = null;
          String newPkgName = null;
          int n=0;
          int mods;
          Class itf=null;
          for (n=0; n<itfCount; n++) {
              itf = itfs[n];
              checkLoaderVisibility(ldr, itf);
***************
*** 275,282 ****
          String name = newClassName(pkgName);
          //if (LOG) Debug.log("creating proxy " + name);
          cf.setThisClass(name);
!         //cf.setSuperclass("java/lang/reflect/Proxy");
!         cf.setSuperclass(superclass.getName().replace('.', '/'));
          HashSet methsAdded = new HashSet();
          for (int m=0; m<objectMethods.length; m++) {
              String methKey = getMethodKey(objectMethods[m]);
--- 244,250 ----
          String name = newClassName(pkgName);
          //if (LOG) Debug.log("creating proxy " + name);
          cf.setThisClass(name);
!         cf.setSuperclass("java/lang/reflect/Proxy");
          HashSet methsAdded = new HashSet();
          for (int m=0; m<objectMethods.length; m++) {
              String methKey = getMethodKey(objectMethods[m]);
***************
*** 284,295 ****
                  ByteCodeGenerator.addDelegatingMethod(cf, Object.class, objectMethods[m]);
              }
          }
- 
          for (n=0; n<itfCount; n++) {
              itf = itfs[n];
              JavaType jt = new JavaType(itf.getName());
              Method[] meths = itf.getDeclaredMethods();
              cf.addImplementedInterface(jt);
              for (int m=0; m<meths.length; m++) {
                  String methKey = getMethodKey(meths[m]);
                  if (methsAdded.add(methKey)) {
--- 252,263 ----
                  ByteCodeGenerator.addDelegatingMethod(cf, Object.class, objectMethods[m]);
              }
          }
          for (n=0; n<itfCount; n++) {
              itf = itfs[n];
              JavaType jt = new JavaType(itf.getName());
              Method[] meths = itf.getDeclaredMethods();
              cf.addImplementedInterface(jt);
+             ByteCodeGenerator.initializeProxy(cf);
              for (int m=0; m<meths.length; m++) {
                  String methKey = getMethodKey(meths[m]);
                  if (methsAdded.add(methKey)) {
***************
*** 297,331 ****
                  }
              }
          }
- 
-         if (!isAProxy) {
-             ByteCodeGenerator.initialize(cf);
-             // might have to dig a little deeper to get all the declared method
-             Method[] methods = getAllMethods(superclass);
-             for (int m = 0; m < methods.length; m++) {
-                 String methKey = getMethodKey(methods[m]);
-                 if (methsAdded.add(methKey)) {
-                     ByteCodeGenerator.addDelegatingMethod(cf, 
-                                                           superclass, 
-                                                           methods[m]);
-                 }
-             }
-         } else {
-             ByteCodeGenerator.initializeProxy(cf);
-         }
- 
- 
          try {
              ByteArrayOutputStream bos = new ByteArrayOutputStream();
              DataOutputStream dos = new DataOutputStream(bos);
              cf.writeToStream(dos);
              dos.close();
- // XXX just debug stuff
- //              if (true) {
- //                  dos = new DataOutputStream(new FileOutputStream(name + ".class"));
- //                  cf.writeToStream(dos);
- //                  dos.close();
- //              }
              byte[] bytes = bos.toByteArray();
              Class newCls = (Class) defineClassMethod.invoke(ldr, new Object[] {
                                       name, bytes, ZERO, new Integer(bytes.length),
--- 265,275 ----
***************
*** 343,361 ****
          catch (Exception e) {
              throw new InternalError(e); 
          }
-     }
- 
-     private static Method[] getAllMethods(Class clazz) {
-         Set hash = new HashSet();
- 
-         Method[] methods = clazz.getMethods();
-         for (int i = 0; i < methods.length; i++) {
-             int mod = methods[i].getModifiers();
-             if (!Modifier.isFinal(mod) && !Modifier.isStatic(mod)) {
-                 hash.add(methods[i]);
-             }
-         }
-         return (Method[]) hash.toArray(new Method[0]);
      }
  }
  
--- 287,292 ----
diff -crw jcfe/version.txt jcfe.orig/version.txt
*** jcfe/version.txt	Mon Aug 20 19:11:41 2001
--- jcfe.orig/version.txt	Thu Apr 26 14:16:14 2001
***************
*** 1 ****
! Current version 1.1.200108201911
--- 1 ----
! Current version 1.1.200104261416