[weld-commits] Weld SVN: r5436 - in core/trunk/impl/src/main/java/org/jboss/weld: introspector and 1 other directories.

[weld-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2010-01-12 06:51:13 -0500 (Tue, 12 Jan 2010)
New Revision: 5436

Modified:
   core/trunk/impl/src/main/java/org/jboss/weld/injection/WeldInjectionPoint.java
   core/trunk/impl/src/main/java/org/jboss/weld/introspector/ForwardingWeldParameter.java
   core/trunk/impl/src/main/java/org/jboss/weld/introspector/WeldParameter.java
   core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldParameterImpl.java
Log:
Actually use the declaring class

Modified: core/trunk/impl/src/main/java/org/jboss/weld/injection/WeldInjectionPoint.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/injection/WeldInjectionPoint.java	2010-01-11 23:28:05 UTC (rev 5435)
+++ core/trunk/impl/src/main/java/org/jboss/weld/injection/WeldInjectionPoint.java	2010-01-12 11:51:13 UTC (rev 5436)
@@ -41,7 +41,7 @@
       public WeldInjectionPointSerializationProxy(WeldInjectionPoint<T, S> injectionPoint)
       {
          this.declaringBeanId = Container.instance().services().get(ContextualStore.class).putIfAbsent(injectionPoint.getBean());
-         this.declaringClass = injectionPoint.getBean().getBeanClass();
+         this.declaringClass = injectionPoint.getDeclaringType().getJavaClass();
       }
 
       protected Bean<T> getDeclaringBean()
@@ -56,6 +56,8 @@
 
    }
    
+   public WeldClass<?> getDeclaringType();
+   
    /**
     * Injects an instance
     * 

Modified: core/trunk/impl/src/main/java/org/jboss/weld/introspector/ForwardingWeldParameter.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/introspector/ForwardingWeldParameter.java	2010-01-11 23:28:05 UTC (rev 5435)
+++ core/trunk/impl/src/main/java/org/jboss/weld/introspector/ForwardingWeldParameter.java	2010-01-12 11:51:13 UTC (rev 5436)
@@ -40,4 +40,9 @@
       return delegate().getDeclaringWeldCallable();
    }
    
+   public WeldClass<X> getDeclaringType()
+   {
+      return delegate().getDeclaringType();
+   }
+   
 }

Modified: core/trunk/impl/src/main/java/org/jboss/weld/introspector/WeldParameter.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/introspector/WeldParameter.java	2010-01-11 23:28:05 UTC (rev 5435)
+++ core/trunk/impl/src/main/java/org/jboss/weld/introspector/WeldParameter.java	2010-01-12 11:51:13 UTC (rev 5436)
@@ -29,5 +29,7 @@
 {
    
    public WeldCallable<?, X, ?> getDeclaringWeldCallable();
+   
+   public WeldClass<X> getDeclaringType();
 
 }

Modified: core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldParameterImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldParameterImpl.java	2010-01-11 23:28:05 UTC (rev 5435)
+++ core/trunk/impl/src/main/java/org/jboss/weld/introspector/jlr/WeldParameterImpl.java	2010-01-12 11:51:13 UTC (rev 5436)
@@ -27,6 +27,7 @@
 
 import org.jboss.weld.exceptions.ForbiddenArgumentException;
 import org.jboss.weld.introspector.WeldCallable;
+import org.jboss.weld.introspector.WeldClass;
 import org.jboss.weld.introspector.WeldParameter;
 import org.jboss.weld.resources.ClassTransformer;
 import org.jboss.weld.util.reflection.HierarchyDiscovery;
@@ -157,4 +158,9 @@
       return null;
    }
    
+   public WeldClass<X> getDeclaringType()
+   {
+      return getDeclaringWeldCallable().getDeclaringType();
+   }
+   
 }