[weld-commits] Weld SVN: r4304 - api/trunk/cdi/src/main/java/javax/decorator.

[weld-commits at lists.jboss.org]

Author: gavin.king at jboss.com
Date: 2009-10-25 11:44:57 -0400 (Sun, 25 Oct 2009)
New Revision: 4304

Modified:
   api/trunk/cdi/src/main/java/javax/decorator/Decorates.java
   api/trunk/cdi/src/main/java/javax/decorator/package-info.java
Log:
more reorg

Modified: api/trunk/cdi/src/main/java/javax/decorator/Decorates.java
===================================================================
--- api/trunk/cdi/src/main/java/javax/decorator/Decorates.java	2009-10-25 15:29:20 UTC (rev 4303)
+++ api/trunk/cdi/src/main/java/javax/decorator/Decorates.java	2009-10-25 15:44:57 UTC (rev 4304)
@@ -49,21 +49,10 @@
  * } 
  * </pre>
  * 
- * <p>All decorators have a delegate injection point. A delegate 
- * injection point is an injection point of the bean class. The 
- * type and qualifiers of the injection point are called the 
- * delegate type and delegate qualifiers. The decorator applies to 
- * any bean that is eligible for injection to the delegate injection 
- * point.</p>
- * 
  * <p>A decorator must have exactly one delegate injection point. The 
  * delegate injection point must be an injected field, initializer 
  * method parameter or bean constructor method parameter.</p>
  * 
- * <p>The delegate type of a decorator must implement or extend every 
- * decorated type. A decorator is not required to implement the delegate 
- * type.</p>
- * 
  * <p>The container injects a delegate object to the delegate injection 
  * point. The delegate object implements the delegate type and delegates 
  * method invocations along the decorator stack. When the container calls 

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-25 15:29:20 UTC (rev 4303)
+++ api/trunk/cdi/src/main/java/javax/decorator/package-info.java	2009-10-25 15:44:57 UTC (rev 4304)
@@ -6,19 +6,16 @@
  * implement those bean types. These bean types are called 
  * decorated types.</p>
  * 
+ * <p>A decorator is a managed bean annotated {@link 
+ * javax.decorator.Decorator &#064;Decorator}.</p>
+ * 
  * <p>Decorators are superficially similar to interceptors, 
  * but because they directly implement operations with business 
  * semantics, they are able to implement business logic and, 
  * conversely, unable to implement the cross-cutting concerns 
- * for which interceptors are optimized.</p>
+ * for which interceptors are optimized. Decorators are called 
+ * after interceptors.</p>
  * 
- * <p>Decorators are called after interceptors.</p>
- * 
- * <p>A decorator is a managed bean annotated {@link 
- * javax.decorator.Decorator &#064;Decorator} with a delegate 
- * injection point annotated {@link javax.decorator.Decorates 
- * &#064;Decorates}.</p>
- * 
  * <h3>Decorated types</h3>
  * 
  * <p>The set of decorated types 
@@ -35,7 +32,21 @@
  * 
  * <p>A decorator may be an abstract class, and is not required to 
  * implement every method of every decorated type.</p>
- *  
+ * 
+ * <h3>Delegate injection points</h3>
+ * 
+ * <p>All decorators have a 
+ * {@linkplain javax.decorator.Decorates delegate injection point}.  
+ * The decorator applies to any bean that is eligible for injection 
+ * to the delegate injection point.</p>
+ * 
+ * <p>A delegate injection point is an injection point of the bean 
+ * class annotated {@link javax.decorator.Decorates &#064;Decorates}.</p>
+ * 
+ * <p>The type of the delegate injection point must implement or 
+ * extend every decorated type. A decorator is not required to 
+ * implement the type of the delegate injection point.</p>
+ * 
  * <h3>Enabled decorators</h3>
  *  
  * <p>By default, a bean deployment archive has no enabled 
@@ -46,6 +57,9 @@
  * ordering. Decorators which occur earlier in the list are called 
  * first.</p>
  * 
+ * @see javax.decorator.Decorator
+ * @see javax.decorator.Decorates
+ * 
  */
 package javax.decorator;