[webbeans-commits] Webbeans SVN: r969 - in ri/trunk: webbeans-ri/src/main/java/org/jboss/webbeans/bean and 1 other directories.

[webbeans-commits at lists.jboss.org]

Author: pete.muir at jboss.org
Date: 2009-01-14 11:22:06 -0500 (Wed, 14 Jan 2009)
New Revision: 969

Modified:
   ri/trunk/pom.xml
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractFacadeBean.java
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/InstanceBean.java
   ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventObserver.java
Log:
minor changes, reinstate update-always

Modified: ri/trunk/pom.xml
===================================================================
--- ri/trunk/pom.xml	2009-01-14 16:18:30 UTC (rev 968)
+++ ri/trunk/pom.xml	2009-01-14 16:22:06 UTC (rev 969)
@@ -58,6 +58,7 @@
          </releases>
          <snapshots>
             <enabled>true</enabled>
+            <updatePolicy>always</updatePolicy>
          </snapshots>
       </repository>
    </repositories>

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractFacadeBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractFacadeBean.java	2009-01-14 16:18:30 UTC (rev 968)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/AbstractFacadeBean.java	2009-01-14 16:22:06 UTC (rev 969)
@@ -31,9 +31,9 @@
  * 
  * @author Gavin King
  * 
- * @param <T>
- * @param <S>
- * @param <P>
+ * @param <T> the bean type
+ * @param <S> the injection point type
+ * @param <P> the parameterized type
  */
 public abstract class AbstractFacadeBean<T, S, P> extends AbstractBean<T, S>
 {

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/InstanceBean.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/InstanceBean.java	2009-01-14 16:18:30 UTC (rev 968)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/bean/InstanceBean.java	2009-01-14 16:22:06 UTC (rev 969)
@@ -39,14 +39,14 @@
    /**
     * Creates an instance Web Bean
     * 
-    * @param field The instance injection point abstraction
+    * @param item The instance injection point abstraction
     * @param manager the current manager
     * @param declaringBean The declaring bean abstraction
     * @return An event Web Bean
     */
-   public static <T, S> InstanceBean<T, S> of(AnnotatedItem<Instance<T>, S> field, ManagerImpl manager)
+   public static <T, S> InstanceBean<T, S> of(AnnotatedItem<Instance<T>, S> item, ManagerImpl manager)
    {
-      return new InstanceBean<T, S>(field, manager);
+      return new InstanceBean<T, S>(item, manager);
    }
 
    /**

Modified: ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventObserver.java
===================================================================
--- ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventObserver.java	2009-01-14 16:18:30 UTC (rev 968)
+++ ri/trunk/webbeans-ri/src/main/java/org/jboss/webbeans/event/EventObserver.java	2009-01-14 16:22:06 UTC (rev 969)
@@ -109,7 +109,7 @@
    /**
     * @return the observer
     */
-   public final Observer<T> getObserver()
+   public final Observer<? extends T> getObserver()
    {
       return observer;
    }
@@ -170,8 +170,7 @@
       {
          return false;
       }
-      @SuppressWarnings("unchecked")
-      EventObserver<T> otherObserver = (EventObserver<T>) other;
+      EventObserver<?> otherObserver = (EventObserver<?>) other;
       if (!eventType.equals(otherObserver.getEventType()))
       {
          return false;