Fixed the API for selecting events using Weld.event()

weld · Nov 30, 2009 · 67ffb34 · 67ffb34
1 parent 6f8d971
commit 67ffb34
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/src/main/java/org/jboss/weld/environment/se/Weld.java b/src/main/java/org/jboss/weld/environment/se/Weld.java
@@ -89,7 +89,7 @@ public Instance<Object> instance()
       return instanceManager.getInstances();
    }
 
-   public Instance<Event> event()
+   public Event<Object> event()
    {
       return instanceManager.getEvents();
    }

diff --git a/src/main/java/org/jboss/weld/environment/se/beans/InstanceManager.java b/src/main/java/org/jboss/weld/environment/se/beans/InstanceManager.java
@@ -33,7 +33,7 @@ public class InstanceManager
 {
 
    @Inject Instance<Object> instances;
-   @Inject Instance<Event> events;
+   @Inject Event<Object> events;
 
    public InstanceManager()
    {
@@ -44,7 +44,7 @@ public Instance<Object> getInstances()
       return instances;
    }
 
-   public Instance<Event> getEvents()
+   public Event<Object> getEvents()
    {
       return events;
    }

diff --git a/src/test/java/org/jboss/weld/environment/se/test/WeldMainTest.java b/src/test/java/org/jboss/weld/environment/se/test/WeldMainTest.java
@@ -65,9 +65,7 @@ public void testObservers()
       ObserverTestBean.reset();
 
       Weld weld = new Weld().initialize();
-      weld.getBeanManager().fireEvent(new CustomEvent());
-//      TODO(PR): this should work. What's with the compile error?
-//      weld.event().select(CustomEvent.class).fire(new CustomEvent());
+      weld.event().select(CustomEvent.class).fire(new CustomEvent());
 
       Assert.assertTrue(ObserverTestBean.isBuiltInObserved());
       Assert.assertTrue(ObserverTestBean.isCustomObserved());