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

[weld-commits at lists.jboss.org]

Author: dallen6
Date: 2009-10-27 13:31:19 -0400 (Tue, 27 Oct 2009)
New Revision: 4349

Modified:
   core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployment.java
   core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AfterBeanDiscoveryImpl.java
   core/trunk/impl/src/main/java/org/jboss/weld/event/ObserverMethodImpl.java
Log:
Updated JavaDocs and the ObserverMethod API to latest spec.

Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployment.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployment.java	2009-10-27 17:30:59 UTC (rev 4348)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/BeanDeployment.java	2009-10-27 17:31:19 UTC (rev 4349)
@@ -146,7 +146,7 @@
       }
       for (ObserverMethodImpl<?, ?> observerMethod : extensionBeanDeployerEnvironment.getObservers())
       {
-         if (deployment.loadBeanDeploymentArchive(observerMethod.getBean().getBeanClass()).equals(beanDeploymentArchive))
+         if (deployment.loadBeanDeploymentArchive(observerMethod.getBeanClass()).equals(beanDeploymentArchive))
          {
             beanDeployer.getManager().addObserver(observerMethod);
          }

Modified: core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AfterBeanDiscoveryImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AfterBeanDiscoveryImpl.java	2009-10-27 17:30:59 UTC (rev 4348)
+++ core/trunk/impl/src/main/java/org/jboss/weld/bootstrap/events/AfterBeanDiscoveryImpl.java	2009-10-27 17:31:19 UTC (rev 4349)
@@ -68,7 +68,7 @@
 
    public void addObserverMethod(ObserverMethod<?, ?> observerMethod)
    {
-      getOrCreateBeanDeployment(observerMethod.getBean().getBeanClass()).getBeanManager().addObserver(observerMethod);
+      getOrCreateBeanDeployment(observerMethod.getBeanClass()).getBeanManager().addObserver(observerMethod);
    }
 
 }

Modified: core/trunk/impl/src/main/java/org/jboss/weld/event/ObserverMethodImpl.java
===================================================================
--- core/trunk/impl/src/main/java/org/jboss/weld/event/ObserverMethodImpl.java	2009-10-27 17:30:59 UTC (rev 4348)
+++ core/trunk/impl/src/main/java/org/jboss/weld/event/ObserverMethodImpl.java	2009-10-27 17:31:19 UTC (rev 4349)
@@ -33,7 +33,6 @@
 import javax.enterprise.inject.Disposes;
 import javax.enterprise.inject.New;
 import javax.enterprise.inject.Produces;
-import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.ObserverMethod;
 import javax.inject.Inject;
 
@@ -164,10 +163,9 @@
 
    }
 
-   @SuppressWarnings("unchecked")
-   public Bean<X> getBean()
+   public Class<X> getBeanClass()
    {
-      return declaringBean;
+      return declaringBean.getType();
    }
 
    public Annotation[] getBindingsAsArray()