[weld-commits] Weld SVN: r6632 - core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/util.

[weld-commits at lists.jboss.org]

Author: dallen6
Date: 2010-07-13 09:20:36 -0400 (Tue, 13 Jul 2010)
New Revision: 6632

Modified:
   core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/util/SerializableProxy.java
   core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/util/SimpleProxyServices.java
Log:
Cosmetic changes to ProxyServices SPI; better comments

Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/util/SerializableProxy.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/util/SerializableProxy.java	2010-07-13 13:20:17 UTC (rev 6631)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/util/SerializableProxy.java	2010-07-13 13:20:36 UTC (rev 6632)
@@ -26,7 +26,6 @@
 import java.io.ObjectStreamException;
 import java.io.Serializable;
 import java.lang.reflect.Type;
-import java.util.Arrays;
 import java.util.Set;
 
 import org.jboss.weld.Container;
@@ -103,7 +102,7 @@
    private void readObject(ObjectInputStream in) throws IOException, ClassNotFoundException
    {
       in.defaultReadObject();
-      Class<?> proxyBeanType = Container.instance().services().get(ProxyServices.class).loadProxySuperClass(proxySuperClassName);
+      Class<?> proxyBeanType = Container.instance().services().get(ProxyServices.class).loadBeanClass(proxySuperClassName);
       ArraySet<Type> proxyBeanInterfaces = loadInterfaces(); 
       Class<?> proxyClass = null;
       if (proxyClassName.endsWith(ProxyFactory.PROXY_SUFFIX))
@@ -131,7 +130,7 @@
       ArraySet<Type> interfaceClasses = new ArraySet<Type>(proxyInterfaces.size());
       for (String interfaceName : proxyInterfaces)
       {
-         interfaceClasses.add(proxyServices.loadProxySuperClass(interfaceName));
+         interfaceClasses.add(proxyServices.loadBeanClass(interfaceName));
       }
       return interfaceClasses;
    }

Modified: core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/util/SimpleProxyServices.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/util/SimpleProxyServices.java	2010-07-13 13:20:17 UTC (rev 6631)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bean/proxy/util/SimpleProxyServices.java	2010-07-13 13:20:36 UTC (rev 6632)
@@ -38,7 +38,7 @@
 public class SimpleProxyServices implements ProxyServices
 {
 
-   public ClassLoader getClassLoader(final Class<?> type)
+   public ClassLoader getClassLoader(final Class<?> proxiedBeanType)
    {
       SecurityManager sm = System.getSecurityManager();
       if (sm != null)
@@ -47,26 +47,26 @@
          {
             public ClassLoader run()
             {
-               return _getClassLoader(type);
+               return _getClassLoader(proxiedBeanType);
             }
          });
       }
       else
       {
-         return _getClassLoader(type);
+         return _getClassLoader(proxiedBeanType);
       }      
    }
 
-   private ClassLoader _getClassLoader(Class<?> type)
+   private ClassLoader _getClassLoader(Class<?> proxiedBeanType)
    {
       // return Thread.currentThread().getContextClassLoader();
-      if (type.getName().startsWith("java"))
+      if (proxiedBeanType.getName().startsWith("java"))
       {
          return this.getClass().getClassLoader();
       }
       else
       {
-         return type.getClassLoader();
+         return proxiedBeanType.getClassLoader();
       }
    }
 
@@ -94,7 +94,7 @@
       return new SerializableProxy(proxyObject);
    }
 
-   public Class<?> loadProxySuperClass(final String className)
+   public Class<?> loadBeanClass(final String className)
    {
       try
       {