[weld-commits] Weld SVN: r4434 - in api/trunk/cdi/src/main/java/javax: enterprise/inject and 1 other directory.

[weld-commits at lists.jboss.org]

Author: gavin.king at jboss.com
Date: 2009-10-29 23:04:12 -0400 (Thu, 29 Oct 2009)
New Revision: 4434

Modified:
   api/trunk/cdi/src/main/java/javax/decorator/Decorator.java
   api/trunk/cdi/src/main/java/javax/decorator/Delegate.java
   api/trunk/cdi/src/main/java/javax/decorator/package-info.java
   api/trunk/cdi/src/main/java/javax/enterprise/inject/Any.java
Log:
@Inject @Delegate

Modified: api/trunk/cdi/src/main/java/javax/decorator/Decorator.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/decorator/Decorator.java	2009-10-30 02:47:44 UTC (rev 4433)
+++ api/trunk/cdi/src/main/java/javax/decorator/Decorator.java	2009-10-30 03:04:12 UTC (rev 4434)
@@ -41,7 +41,7 @@
  * for instance passivation and conversational state defined by the 
  * EJB specification.</p>
  * 
- * @see javax.decorator.Delegate &#064;Decorates identifies the 
+ * @see javax.decorator.Delegate &#064;Delegate identifies the 
  * delegate injection point of a decorator.
  * 
  * @author Gavin King

Modified: api/trunk/cdi/src/main/java/javax/decorator/Delegate.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/decorator/Delegate.java	2009-10-30 02:47:44 UTC (rev 4433)
+++ api/trunk/cdi/src/main/java/javax/decorator/Delegate.java	2009-10-30 03:04:12 UTC (rev 4434)
@@ -33,16 +33,17 @@
  * <pre>
  * &#064;Decorator 
  * class TimestampLogger implements Logger { 
- *    &#064;Decorates &#064;Any Logger logger; 
+ *    &#064;Inject &#064;Delegate &#064;Any Logger logger; 
  *    ... 
  * } 
  * </pre>
  * <pre>
  * &#064;Decorator 
  * class TimestampLogger implements Logger { 
- *    private Logger logger; 
+ *    private Logger logger;
  *    
- *    public TimestampLogger(&#064;Decorates &#064;Debug Logger logger) { 
+ *    &#064;Inject
+ *    public TimestampLogger(&#064;Delegate &#064;Debug Logger logger) { 
  *       this.logger=logger; 
  *    } 
  *    ... 
@@ -64,7 +65,7 @@
  * <pre>
  * &#064;Decorator 
  * class TimestampLogger implements Logger { 
- *    &#064;Decorates &#064;Any Logger logger; 
+ *    &#064;Inject &#064;Delegate &#064;Any Logger logger; 
  *    
  *    void log(String message) {
  *       logger.log( timestamp() + ": " + message );

Modified: api/trunk/cdi/src/main/java/javax/decorator/package-info.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/decorator/package-info.java	2009-10-30 02:47:44 UTC (rev 4433)
+++ api/trunk/cdi/src/main/java/javax/decorator/package-info.java	2009-10-30 03:04:12 UTC (rev 4434)
@@ -39,7 +39,7 @@
  * <p>All decorators have a 
  * {@linkplain javax.decorator.Delegate delegate injection point}.  
  * A delegate injection point is an injection point of the bean 
- * class annotated {@link javax.decorator.Delegate &#064;Decorates}.</p>
+ * class annotated {@link javax.decorator.Delegate &#064;Delegate}.</p>
  * 
  * <p>The type of the delegate injection point must implement or 
  * extend every decorated type. A decorator is not required to 

Modified: api/trunk/cdi/src/main/java/javax/enterprise/inject/Any.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/enterprise/inject/Any.java	2009-10-30 02:47:44 UTC (rev 4433)
+++ api/trunk/cdi/src/main/java/javax/enterprise/inject/Any.java	2009-10-30 03:04:12 UTC (rev 4434)
@@ -54,7 +54,7 @@
  * </pre>
  * 
  * <pre>
- * &#064;Decorates &#064;Any Logger logger;
+ * &#064;Inject &#064;Delegate &#064;Any Logger logger;
  * </pre>
  * 
  * @author Gavin King