Author: pete.muir(a)jboss.org Date: 2009-10-29 16:01:08 -0400 (Thu, 29 Oct 2009) New Revision: 4421 Added: api/trunk/cdi/src/main/java/javax/decorator/Delegate.java Removed: api/trunk/cdi/src/main/java/javax/decorator/Decorates.java Modified: api/trunk/cdi/src/main/java/javax/decorator/Decorator.java api/trunk/cdi/src/main/java/javax/decorator/package-info.java Log: @Decorates -> @Delegate Deleted: api/trunk/cdi/src/main/java/javax/decorator/Decorates.java =================================================================== --- api/trunk/cdi/src/main/java/javax/decorator/Decorates.java 2009-10-29 19:38:03 UTC (rev 4420) +++ api/trunk/cdi/src/main/java/javax/decorator/Decorates.java 2009-10-29 20:01:08 UTC (rev 4421) @@ -1,87 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package javax.decorator; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.PARAMETER; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Documented; -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * <p>Identifies the delegate injection point of a decorator. - * May be applied to a field, bean constructor parameter or - * initializer method parameter of a decorator bean class.</p> - * - * <pre> - * &#064;Decorator - * class TimestampLogger implements Logger { - * &#064;Decorates &#064;Any Logger logger; - * ... - * } - * </pre> - * <pre> - * &#064;Decorator - * class TimestampLogger implements Logger { - * private Logger logger; - * - * public TimestampLogger(&#064;Decorates &#064;Debug Logger logger) { - * this.logger=logger; - * } - * ... - * } - * </pre> - * - * <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 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 - * a decorator during business method interception, the decorator may - * invoke any method of the delegate object. If a decorator invokes the - * delegate object at any other time, the invoked method throws an - * {@link java.lang.IllegalStateException}.</p> - * - * <pre> - * &#064;Decorator - * class TimestampLogger implements Logger { - * &#064;Decorates &#064;Any Logger logger; - * - * void log(String message) { - * logger.log( timestamp() + ": " + message ); - * } - * ... - * } - * </pre> - * - * @see javax.decorator.Decorator &#064;Decorator specifies that a - * class is a decorator. - * - * @author Gavin King - * @author Pete Muir - */ -@Target({FIELD, PARAMETER}) -@Retention(RUNTIME) -@Documented -public @interface Decorates -{ -} Modified: api/trunk/cdi/src/main/java/javax/decorator/Decorator.java =================================================================== --- api/trunk/cdi/src/main/java/javax/decorator/Decorator.java 2009-10-29 19:38:03 UTC (rev 4420) +++ api/trunk/cdi/src/main/java/javax/decorator/Decorator.java 2009-10-29 20:01:08 UTC (rev 4421) @@ -41,7 +41,7 @@ * for instance passivation and conversational state defined by the * EJB specification.</p> * - * @see javax.decorator.Decorates &#064;Decorates identifies the + * @see javax.decorator.Delegate &#064;Decorates identifies the * delegate injection point of a decorator. * * @author Gavin King Copied: api/trunk/cdi/src/main/java/javax/decorator/Delegate.java (from rev 4406, api/trunk/cdi/src/main/java/javax/decorator/Decorates.java) =================================================================== --- api/trunk/cdi/src/main/java/javax/decorator/Delegate.java (rev 0) +++ api/trunk/cdi/src/main/java/javax/decorator/Delegate.java 2009-10-29 20:01:08 UTC (rev 4421) @@ -0,0 +1,87 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package javax.decorator; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.PARAMETER; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Documented; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * <p>Identifies the delegate injection point of a decorator. + * May be applied to a field, bean constructor parameter or + * initializer method parameter of a decorator bean class.</p> + * + * <pre> + * &#064;Decorator + * class TimestampLogger implements Logger { + * &#064;Decorates &#064;Any Logger logger; + * ... + * } + * </pre> + * <pre> + * &#064;Decorator + * class TimestampLogger implements Logger { + * private Logger logger; + * + * public TimestampLogger(&#064;Decorates &#064;Debug Logger logger) { + * this.logger=logger; + * } + * ... + * } + * </pre> + * + * <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 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 + * a decorator during business method interception, the decorator may + * invoke any method of the delegate object. If a decorator invokes the + * delegate object at any other time, the invoked method throws an + * {@link java.lang.IllegalStateException}.</p> + * + * <pre> + * &#064;Decorator + * class TimestampLogger implements Logger { + * &#064;Decorates &#064;Any Logger logger; + * + * void log(String message) { + * logger.log( timestamp() + ": " + message ); + * } + * ... + * } + * </pre> + * + * @see javax.decorator.Decorator &#064;Decorator specifies that a + * class is a decorator. + * + * @author Gavin King + * @author Pete Muir + */ +@Target({FIELD, PARAMETER}) +@Retention(RUNTIME) +@Documented +public @interface Delegate +{ +} Property changes on: api/trunk/cdi/src/main/java/javax/decorator/Delegate.java ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native 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-29 19:38:03 UTC (rev 4420) +++ api/trunk/cdi/src/main/java/javax/decorator/package-info.java 2009-10-29 20:01:08 UTC (rev 4421) @@ -37,9 +37,9 @@ * <h3>Delegate injection points</h3> * * <p>All decorators have a - * {@linkplain javax.decorator.Decorates delegate injection point}. + * {@linkplain javax.decorator.Delegate delegate injection point}. * A delegate injection point is an injection point of the bean - * class annotated {@link javax.decorator.Decorates &#064;Decorates}.</p> + * class annotated {@link javax.decorator.Delegate &#064;Decorates}.</p> * * <p>The type of the delegate injection point must implement or * extend every decorated type. A decorator is not required to @@ -76,7 +76,7 @@ * @see javax.enterprise.inject * * @see javax.decorator.Decorator - * @see javax.decorator.Decorates + * @see javax.decorator.Delegate * */ package javax.decorator;