[webbeans-commits] Webbeans SVN: r956 - in ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans: introspector/jlr and 1 other directory.

[webbeans-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2009-01-14 08:18:35 -0500 (Wed, 14 Jan 2009)
New Revision: 956

Modified:
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedMethodImpl.java
Log:
fix errors

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java	2009-01-14 13:02:29 UTC (rev 955)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/EnterpriseBean.java	2009-01-14 13:18:35 UTC (rev 956)
@@ -172,7 +172,7 @@
       ProxyFactory proxyFactory = Proxies.getProxyFactory(getTypes());
       
       @SuppressWarnings("unchecked")
-      Class<T> proxyClass = proxyFactory.createClass().asSubclass(getType());
+      Class<T> proxyClass = proxyFactory.createClass();
       
       this.proxyClass = proxyClass;
    }

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedMethodImpl.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedMethodImpl.java	2009-01-14 13:02:29 UTC (rev 955)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/jlr/AnnotatedMethodImpl.java	2009-01-14 13:18:35 UTC (rev 956)
@@ -246,17 +246,23 @@
     */
    public T invoke(Object instance, ManagerImpl manager)
    {
-      return getType().cast(Reflections.invokeAndWrap(getDelegate(), instance, getParameterValues(parameters, manager)));
+      @SuppressWarnings("unchecked")
+      T result = (T) Reflections.invokeAndWrap(getDelegate(), instance, getParameterValues(parameters, manager));
+      return result;
    }
    
    public T invokeOnInstance(Object instance, ManagerImpl manager)
    {
-      return getType().cast(Reflections.invokeAndWrap(getName(), getParameterTypesAsArray(), instance, getParameterValues(parameters, manager)));
+      @SuppressWarnings("unchecked")
+      T result = (T) Reflections.invokeAndWrap(getName(), getParameterTypesAsArray(), instance, getParameterValues(parameters, manager));
+      return result;
    }
 
    public T invokeWithSpecialValue(Object instance, Class<? extends Annotation> specialParam, Object specialVal, ManagerImpl manager)
    {
-      return getType().cast(Reflections.invokeAndWrap(getDelegate(), instance, getParameterValues(parameters, specialVal, specialParam, manager)));
+      @SuppressWarnings("unchecked")
+      T result = (T) Reflections.invokeAndWrap(getDelegate(), instance, getParameterValues(parameters, specialVal, specialParam, manager));
+      return result;
    }
 
    /**
@@ -270,7 +276,9 @@
     */
    public T invoke(Object instance, Object... parameters)
    {
-      return getType().cast(Reflections.invokeAndWrap(getDelegate(), instance, parameters));
+      @SuppressWarnings("unchecked")
+      T result = (T) Reflections.invokeAndWrap(getDelegate(), instance, parameters);
+      return result;
    }
 
    /**