[weld-commits] Weld SVN: r4439 - api/trunk/cdi/src/main/java/javax/enterprise/inject/spi.

[weld-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2009-10-30 08:24:08 -0400 (Fri, 30 Oct 2009)
New Revision: 4439

Modified:
   api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/AfterBeanDiscovery.java
   api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/BeanManager.java
   api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ObserverMethod.java
   api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessObserverMethod.java
Log:
WELD-217, part 1

Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/AfterBeanDiscovery.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/AfterBeanDiscovery.java	2009-10-30 12:07:59 UTC (rev 4438)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/AfterBeanDiscovery.java	2009-10-30 12:24:08 UTC (rev 4439)
@@ -79,7 +79,7 @@
     * 
     * @param observerMethod The custom observer method to add to the deployment
     */
-   public void addObserverMethod(ObserverMethod<?, ?> observerMethod);
+   public void addObserverMethod(ObserverMethod<?> observerMethod);
 
    /**
     * Registers a custom {@link javax.enterprise.context.spi.Context} object

Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/BeanManager.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/BeanManager.java	2009-10-30 12:07:59 UTC (rev 4438)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/BeanManager.java	2009-10-30 12:24:08 UTC (rev 4439)
@@ -191,7 +191,7 @@
     * @throws IllegalArgumentException if two instances of the same binding type
     *            are passed
     */
-   public <T> Set<ObserverMethod<?, T>> resolveObserverMethods(T event, Annotation... qualifiers);
+   public <T> Set<ObserverMethod<T>> resolveObserverMethods(T event, Annotation... qualifiers);
 
    /**
     * Obtains an ordered list of enabled decorators for a set of bean types and

Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ObserverMethod.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ObserverMethod.java	2009-10-30 12:07:59 UTC (rev 4438)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ObserverMethod.java	2009-10-30 12:24:08 UTC (rev 4439)
@@ -13,17 +13,16 @@
  * 
  * @author Gavin King
  * @author David Allen
- * @param <X> the type of the bean with the observer method
  * @param <T> the event type 
  */
-public interface ObserverMethod<X, T>
+public interface ObserverMethod<T>
 {
    /**
     * Obtains the {@linkplain Class class} of bean defining the observer method.
     * 
     * @return the defining {@linkplain Class class}
     */
-   public Class<X> getBeanClass();
+   public Class<?> getBeanClass();
 
    /**
     * Obtains the observed event {@linkplain Type type}.

Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessObserverMethod.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessObserverMethod.java	2009-10-30 12:07:59 UTC (rev 4438)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/spi/ProcessObserverMethod.java	2009-10-30 12:24:08 UTC (rev 4439)
@@ -52,7 +52,7 @@
     * @return the {@link javax.enterprise.inject.spi.ObserverMethod} object that
     *         will be used by the container to call the observer method
     */
-   public ObserverMethod<X, T> getObserverMethod();
+   public ObserverMethod<T> getObserverMethod();
 
    /**
     * Registers a definition error with the container, causing the container to