Minor. renames

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@204 1c488680-804c-0410-94cd-c6b725194a0e
weld · Oct 29, 2008 · 76e78c8 · 76e78c8
1 parent 18964bb
commit 76e78c8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java b/webbeans-ri/src/main/java/org/jboss/webbeans/ManagerImpl.java
@@ -34,7 +34,7 @@
 import org.jboss.webbeans.exceptions.TypesafeResolutionLocation;
 import org.jboss.webbeans.injectable.Injectable;
 import org.jboss.webbeans.injectable.ResolverInjectable;
-import org.jboss.webbeans.util.ClientProxyUtil;
+import org.jboss.webbeans.util.ClientProxy;
 import org.jboss.webbeans.util.MapWrapper;
 import org.jboss.webbeans.util.Reflections;
 
@@ -341,7 +341,7 @@ else if (beans.size() > 1)
       else
       {
          Bean<T> bean = beans.iterator().next();
-         if (getModelManager().getScopeModel(bean.getScopeType()).isNormal() && !ClientProxyUtil.isProxyable(injectable.getType()))
+         if (getModelManager().getScopeModel(bean.getScopeType()).isNormal() && !ClientProxy.isProxyable(injectable.getType()))
          {
             throw new UnproxyableDependencyException(new TypesafeResolutionLocation(injectable) + "Unable to proxy");
          }
@@ -390,7 +390,7 @@ private Bean<?> getClientProxy(Bean<?> bean)
       {
          try 
          {
-            clientProxy = ClientProxyUtil.createProxy(new ProxyData(bean, this));
+            clientProxy = ClientProxy.createProxy(new ProxyData(bean, this));
          } catch (Exception e) {
             throw new UnproxyableDependencyException("Could not create proxy", e);
          }

diff --git a/.../jboss/webbeans/util/ClientProxyUtil.java → .../org/jboss/webbeans/util/ClientProxy.java b/.../jboss/webbeans/util/ClientProxyUtil.java → .../org/jboss/webbeans/util/ClientProxy.java
@@ -14,7 +14,7 @@
 import org.jboss.webbeans.ProxyData;
 
 
-public class ClientProxyUtil
+public class ClientProxy
 {
 
    public static boolean isProxyable(Class<?> rawType)
@@ -56,10 +56,10 @@ public Object invoke(Object self, Method m, Method proceed, Object[] args) throw
       }
    };
 
-   public static Bean<?> createProxy(ProxyData clientProxy) throws InstantiationException, IllegalAccessException
+   public static Bean<?> createProxy(ProxyData proxyData) throws InstantiationException, IllegalAccessException
    {
       ProxyFactory proxyFactory = new ProxyFactory();
-      proxyFactory.setSuperclass(clientProxy.getClass());
+      proxyFactory.setSuperclass(proxyData.getClass());
       Class<?> proxyClass = proxyFactory.createClass();
       Bean<?> proxy = (Bean<?>) proxyClass.newInstance();
       ((ProxyObject)proxy).setHandler(methodHandler);