[webbeans-commits] Webbeans SVN: r318 - ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy.

[webbeans-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2008-11-17 22:54:10 -0500 (Mon, 17 Nov 2008)
New Revision: 318

Modified:
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/ProxyMethodHandler.java
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/ProxyPool.java
Log:
WS

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/ProxyMethodHandler.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/ProxyMethodHandler.java	2008-11-18 03:52:16 UTC (rev 317)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/ProxyMethodHandler.java	2008-11-18 03:54:10 UTC (rev 318)
@@ -26,8 +26,7 @@
       ProxyMethodHandler.manager = manager;
    }
 
-   public Object invoke(Object self, Method method, Method proceed,
-         Object[] args) throws Throwable
+   public Object invoke(Object self, Method method, Method proceed, Object[] args) throws Throwable
    {
       if (bean == null)
       {
@@ -38,7 +37,5 @@
       Method proxiedMethod = Reflections.lookupMethod(method, proxiedInstance);
       return proxiedMethod.invoke(proxiedInstance, args);
    }
-
-
-
+   
 }

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/ProxyPool.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/ProxyPool.java	2008-11-18 03:52:16 UTC (rev 317)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/proxy/ProxyPool.java	2008-11-18 03:54:10 UTC (rev 318)
@@ -45,7 +45,8 @@
    private ManagerImpl manager;
    private Pool pool;
    
-   public ProxyPool(ManagerImpl manager) {
+   public ProxyPool(ManagerImpl manager) 
+   {
       this.manager = manager;
       this.pool = new Pool();
    }
@@ -55,14 +56,19 @@
       Class<?> superclass;
    }
    
-   private TypeInfo getTypeInfo(Set<Class<?>> types) {
+   private TypeInfo getTypeInfo(Set<Class<?>> types) 
+   {
       TypeInfo typeInfo = new TypeInfo();
       List<Class<?>> interfaces = new ArrayList<Class<?>>();
       Class<?> superclass = null;
-      for (Class<?> type : types) {
-         if (type.isInterface()) {
+      for (Class<?> type : types) 
+      {
+         if (type.isInterface()) 
+         {
             interfaces.add(type);
-         } else if (superclass == null || (type != Object.class && superclass.isAssignableFrom(type))) {
+         }
+         else if (superclass == null || (type != Object.class && superclass.isAssignableFrom(type))) 
+         {
             superclass = type;
          }
       }
@@ -72,14 +78,15 @@
       return typeInfo;
    }
    
-   private <T> T createClientProxy(Bean<T> bean, int beanIndex) throws InstantiationException, IllegalAccessException {
+   private <T> T createClientProxy(Bean<T> bean, int beanIndex) throws InstantiationException, IllegalAccessException 
+   {
       ProxyFactory proxyFactory = new ProxyFactory();
       TypeInfo typeInfo = getTypeInfo(bean.getTypes());
       proxyFactory.setInterfaces(typeInfo.interfaces);
       proxyFactory.setSuperclass(typeInfo.superclass);
       T clientProxy = (T) proxyFactory.createClass().newInstance();
       ProxyMethodHandler proxyMethodHandler = new ProxyMethodHandler(bean, beanIndex, manager);
-      ((ProxyObject)clientProxy).setHandler(proxyMethodHandler);
+      ((ProxyObject) clientProxy).setHandler(proxyMethodHandler);
       return clientProxy;
    }
 
@@ -92,7 +99,8 @@
          {
             int beanIndex = manager.getBeans().indexOf(bean);
             // Implicit add required since it is looked up on activation with then index
-            if (beanIndex < 0) {
+            if (beanIndex < 0) 
+            {
                manager.addBean(bean);
                beanIndex = manager.getBeans().size() - 1;
             }
@@ -108,5 +116,4 @@
       return clientProxy;
    }
    
-   
 }