Change @observable -> @fires, @obtainable -> @Obtains

git-svn-id: http://anonsvn.jboss.org/repos/weld/ri/trunk@700 1c488680-804c-0410-94cd-c6b725194a0e
weld · Dec 24, 2008 · 1220b07 · 1220b07
1 parent 82aecc9
commit 1220b07
Show file tree

Hide file tree

Showing 16 changed files with 34 additions and 34 deletions.
diff --git a/.../main/java/javax/webbeans/Observable.java → ...i/src/main/java/javax/webbeans/Fires.java b/.../main/java/javax/webbeans/Observable.java → ...i/src/main/java/javax/webbeans/Fires.java
@@ -38,6 +38,6 @@
 @Retention(RUNTIME)
 @Target( { TYPE, METHOD, FIELD, PARAMETER })
 @Documented
-public @interface Observable
+public @interface Fires
 {
 }
diff --git a/.../main/java/javax/webbeans/Obtainable.java → ...src/main/java/javax/webbeans/Obtains.java b/.../main/java/javax/webbeans/Obtainable.java → ...src/main/java/javax/webbeans/Obtains.java
@@ -36,6 +36,6 @@
 @Retention(RUNTIME)
 @Target( { TYPE, METHOD, FIELD, PARAMETER })
 @Documented
-public @interface Obtainable
+public @interface Obtains
 {
 }
diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java b/webbeans-ri/src/main/java/org/jboss/webbeans/bootstrap/WebBeansBootstrap.java
@@ -42,10 +42,10 @@
 
 import javax.webbeans.DefinitionException;
 import javax.webbeans.Initializer;
-import javax.webbeans.Observable;
+import javax.webbeans.Fires;
 import javax.webbeans.Observer;
 import javax.webbeans.Observes;
-import javax.webbeans.Obtainable;
+import javax.webbeans.Obtains;
 
 import org.jboss.webbeans.CurrentManager;
 import org.jboss.webbeans.ManagerImpl;
@@ -210,18 +210,18 @@ protected void createBean(AbstractClassBean<?> bean, Set<AbstractBean<?, ?>> bea
       }
       for (AnnotatedMethod<Object> initializerMethod : bean.getInitializerMethods())
       {
-         for (AnnotatedParameter<Object> parameter : initializerMethod.getAnnotatedParameters(Observable.class))
+         for (AnnotatedParameter<Object> parameter : initializerMethod.getAnnotatedParameters(Fires.class))
          {
             registerEvent(parameter, beans);
          }
       }
       for (AnnotatedItem injectionPoint : bean.getInjectionPoints())
       {
-         if ( injectionPoint.isAnnotationPresent(Observable.class) )  
+         if ( injectionPoint.isAnnotationPresent(Fires.class) )  
          {
             registerEvent(injectionPoint, beans);
          }
-         if ( injectionPoint.isAnnotationPresent(Obtainable.class) )  
+         if ( injectionPoint.isAnnotationPresent(Obtains.class) )  
          {
             InstanceBean<Object, Field> instanceBean = createInstanceBean(injectionPoint, manager);
             beans.add(instanceBean);
@@ -343,7 +343,7 @@ private void registerEvents(Set<AnnotatedItem<?,?>> injectionPoints, Set<Abstrac
    @SuppressWarnings("unchecked")
    private void registerEvent(AnnotatedItem injectionPoint, Set<AbstractBean<?, ?>> beans)
    {
-      if ( injectionPoint.isAnnotationPresent(Observable.class) )
+      if ( injectionPoint.isAnnotationPresent(Fires.class) )
       {
          EventBean<Object, Method> eventBean = createEventBean(injectionPoint, manager);
          beans.add(eventBean);

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java b/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventImpl.java
@@ -23,7 +23,7 @@
 import java.util.Set;
 
 import javax.webbeans.Event;
-import javax.webbeans.Observable;
+import javax.webbeans.Fires;
 import javax.webbeans.Observer;
 import javax.webbeans.manager.Manager;
 
@@ -41,7 +41,7 @@
 public class EventImpl<T> extends FacadeImpl<T> implements Event<T>
 {
    @SuppressWarnings("unchecked")
-   private static final Set<Class<? extends Annotation>> FILTERED_ANNOTATIONS = new HashSet<Class<? extends Annotation>>(Arrays.asList(Observable.class));
+   private static final Set<Class<? extends Annotation>> FILTERED_ANNOTATIONS = new HashSet<Class<? extends Annotation>>(Arrays.asList(Fires.class));
 
    /**
     * Constructor

diff --git a/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedMethod.java b/webbeans-ri/src/main/java/org/jboss/webbeans/introspector/AnnotatedMethod.java
@@ -30,7 +30,7 @@
 import javax.webbeans.BeforeTransactionCompletion;
 import javax.webbeans.Disposes;
 import javax.webbeans.IfExists;
-import javax.webbeans.Observable;
+import javax.webbeans.Fires;
 import javax.webbeans.Observes;
 import javax.webbeans.manager.Manager;
 
@@ -44,7 +44,7 @@
 public interface AnnotatedMethod<T> extends AnnotatedItem<T, Method>
 {
    @SuppressWarnings("unchecked")
-   public static final Set<Class<? extends Annotation>> MAPPED_PARAMETER_ANNOTATIONS = new HashSet<Class<? extends Annotation>>(Arrays.asList(Disposes.class, Observes.class, Observable.class, IfExists.class, BeforeTransactionCompletion.class, AfterTransactionCompletion.class, AfterTransactionFailure.class, AfterTransactionSuccess.class));
+   public static final Set<Class<? extends Annotation>> MAPPED_PARAMETER_ANNOTATIONS = new HashSet<Class<? extends Annotation>>(Arrays.asList(Disposes.class, Observes.class, Fires.class, IfExists.class, BeforeTransactionCompletion.class, AfterTransactionCompletion.class, AfterTransactionFailure.class, AfterTransactionSuccess.class));
 
    /**
     * Gets the abstracted parameters of the method

diff --git a/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/AuroraFinch.java b/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/AuroraFinch.java
@@ -2,7 +2,7 @@
 
 import javax.webbeans.Event;
 import javax.webbeans.Initializer;
-import javax.webbeans.Observable;
+import javax.webbeans.Fires;
 
 import org.jboss.webbeans.test.beans.StarFinch.Mess;
 
@@ -12,7 +12,7 @@ public class AuroraFinch
    private Mess someMess;
 
    @Initializer
-   public AuroraFinch(@Observable Event<Mess> eventObject)
+   public AuroraFinch(@Fires Event<Mess> eventObject)
    {
       // Create a new mess and fire the event for it
       someMess = new Mess();

diff --git a/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BlueFacedParrotFinch.java b/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/BlueFacedParrotFinch.java
@@ -1,12 +1,12 @@
 package org.jboss.webbeans.test.beans;
 
 import javax.webbeans.Event;
-import javax.webbeans.Observable;
+import javax.webbeans.Fires;
 import javax.webbeans.Observer;
 
 public class BlueFacedParrotFinch
 {
-   @Observable
+   @Fires
    private Event<String> simpleEvent;
 
    public void methodThatFiresEvent()

diff --git a/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/EuropeanGoldfinch.java b/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/EuropeanGoldfinch.java
@@ -5,7 +5,7 @@
 import javax.webbeans.ConversationScoped;
 import javax.webbeans.Destructor;
 import javax.webbeans.Event;
-import javax.webbeans.Observable;
+import javax.webbeans.Fires;
 
 import org.jboss.webbeans.test.beans.StarFinch.Mess;
 
@@ -20,7 +20,7 @@ public Mess getSomeMess()
    }
 
    @Destructor @Remove
-   public void remove(@Observable Event<Mess> eventObject)
+   public void remove(@Fires Event<Mess> eventObject)
    {
       // Create a new mess and fire the event for it
       someMess = new Mess();

diff --git a/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/OrangeCheekedWaxbill.java b/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/OrangeCheekedWaxbill.java
@@ -2,7 +2,7 @@
 
 import javax.webbeans.Event;
 import javax.webbeans.Initializer;
-import javax.webbeans.Observable;
+import javax.webbeans.Fires;
 import javax.webbeans.RequestScoped;
 
 import org.jboss.webbeans.test.beans.StarFinch.Mess;
@@ -18,7 +18,7 @@ public OrangeCheekedWaxbill()
    }
 
    @Initializer
-   public void theInitializerMethod(@Observable Event<Mess> eventObject)
+   public void theInitializerMethod(@Fires Event<Mess> eventObject)
    {
       // Create a new mess and fire the event for it
       someMess = new Mess();

diff --git a/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/StarFinch.java b/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/StarFinch.java
@@ -2,7 +2,7 @@
 
 import javax.webbeans.Event;
 import javax.webbeans.Named;
-import javax.webbeans.Observable;
+import javax.webbeans.Fires;
 import javax.webbeans.Produces;
 import javax.webbeans.RequestScoped;
 
@@ -19,7 +19,7 @@ public StarFinch()
    }
 
    @Produces
-   public Mess producerOfMesses(@Observable Event<Mess> messEvent)
+   public Mess producerOfMesses(@Fires Event<Mess> messEvent)
    {
       Mess newMess = new Mess();
       messEvent.fire(newMess);

diff --git a/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/BlackRumpedWaxbill.java b/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/BlackRumpedWaxbill.java
@@ -1,11 +1,11 @@
 package org.jboss.webbeans.test.beans.broken;
 
 import javax.webbeans.Event;
-import javax.webbeans.Observable;
+import javax.webbeans.Fires;
 
 public class BlackRumpedWaxbill
 {
-   @Observable
+   @Fires
    private Event simpleEvent;
 
    public void eliminateWarning()

diff --git a/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/CommonWaxbill.java b/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/CommonWaxbill.java
@@ -2,11 +2,11 @@
 
 import java.util.ArrayList;
 
-import javax.webbeans.Observable;
+import javax.webbeans.Fires;
 
 public class CommonWaxbill
 {
-   @Observable
+   @Fires
    private ArrayList<String> simpleEvent;
 
    public void eliminateWarning()

diff --git a/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/GoldbreastWaxbill.java b/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/GoldbreastWaxbill.java
@@ -1,11 +1,11 @@
 package org.jboss.webbeans.test.beans.broken;
 
 import javax.webbeans.Event;
-import javax.webbeans.Observable;
+import javax.webbeans.Fires;
 
 public class GoldbreastWaxbill
 {
-   @Observable
+   @Fires
    private Event<?> simpleEvent;
 
    public void eliminateWarning()

diff --git a/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/JavaSparrow.java b/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/JavaSparrow.java
@@ -3,11 +3,11 @@
 import java.util.ArrayList;
 
 import javax.webbeans.Event;
-import javax.webbeans.Observable;
+import javax.webbeans.Fires;
 
 public class JavaSparrow
 {
-   @Observable
+   @Fires
    private Event<ArrayList<String>> simpleEvent;
 
    public void eliminateWarning()

diff --git a/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/OwlFinch.java b/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/OwlFinch.java
@@ -1,14 +1,14 @@
 package org.jboss.webbeans.test.beans.broken;
 
 import javax.webbeans.Event;
-import javax.webbeans.Observable;
+import javax.webbeans.Fires;
 import javax.webbeans.Observer;
 
 import org.jboss.webbeans.test.bindings.AnimalStereotypeAnnotationLiteral;
 
 public class OwlFinch
 {
-   @Observable
+   @Fires
    private Event<String> simpleEvent;
 
    public void methodThatFiresEvent()

diff --git a/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/SweeWaxbill.java b/webbeans-ri/src/test/java/org/jboss/webbeans/test/beans/broken/SweeWaxbill.java
@@ -1,15 +1,15 @@
 package org.jboss.webbeans.test.beans.broken;
 
 import javax.webbeans.Event;
-import javax.webbeans.Observable;
+import javax.webbeans.Fires;
 import javax.webbeans.Observer;
 
 import org.jboss.webbeans.test.annotations.Role;
 import org.jboss.webbeans.test.bindings.RoleBinding;
 
 public class SweeWaxbill
 {
-   @Observable @Role("Admin")
+   @Fires @Role("Admin")
    private Event<String> simpleEvent;
 
    public void methodThatFiresEvent()