[jboss-cvs] jboss-seam/src/main/org/jboss/seam/annotations ...

[Gavin King]

  User: gavin   
  Date: 07/06/18 01:12:15

  Modified:    src/main/org/jboss/seam/annotations     HttpError.java
                        Namespace.java RaiseEvent.java Redirect.java
  Log:
  deprecate end() on exception annotations
  tolerate multiple calls to begin()/end(), esp for @ApplicationException
  
  Revision  Changes    Path
  1.7       +1 -0      jboss-seam/src/main/org/jboss/seam/annotations/HttpError.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: HttpError.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/annotations/HttpError.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- HttpError.java	4 Feb 2007 17:03:33 -0000	1.6
  +++ HttpError.java	18 Jun 2007 05:12:14 -0000	1.7
  @@ -41,6 +41,7 @@
       * when this exception occurs.
       * 
       * @return true if we should end the conversation
  +    * @deprecated use @ApplicationException(end=true)
       */
      boolean end() default false;
   }
  
  
  
  1.3       +6 -1      jboss-seam/src/main/org/jboss/seam/annotations/Namespace.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Namespace.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/annotations/Namespace.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- Namespace.java	16 Feb 2007 16:49:03 -0000	1.2
  +++ Namespace.java	18 Jun 2007 05:12:15 -0000	1.3
  @@ -6,11 +6,16 @@
    */
   package org.jboss.seam.annotations;
   
  -import java.lang.annotation.*;
  +import java.lang.annotation.Documented;
  +import java.lang.annotation.ElementType;
  +import java.lang.annotation.Retention;
  +import java.lang.annotation.RetentionPolicy;
  +import java.lang.annotation.Target;
   
   /**
    * Specifies the configuration namespace of a seam component.
    * 
  + * @author Norman Richards
    */
   @Target(ElementType.PACKAGE)
   @Retention(RetentionPolicy.RUNTIME)
  
  
  
  1.4       +2 -0      jboss-seam/src/main/org/jboss/seam/annotations/RaiseEvent.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: RaiseEvent.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/annotations/RaiseEvent.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- RaiseEvent.java	21 May 2007 17:45:04 -0000	1.3
  +++ RaiseEvent.java	18 Jun 2007 05:12:15 -0000	1.4
  @@ -16,6 +16,8 @@
   /**
    * Causes an event to be raised after the method returns
    * a non-null result without exception.
  + * 
  + * @author Gavin King
    */
   @Target(METHOD)
   @Retention(RUNTIME)
  
  
  
  1.7       +1 -0      jboss-seam/src/main/org/jboss/seam/annotations/Redirect.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Redirect.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/annotations/Redirect.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- Redirect.java	4 Feb 2007 17:03:33 -0000	1.6
  +++ Redirect.java	18 Jun 2007 05:12:15 -0000	1.7
  @@ -39,6 +39,7 @@
       * when this exception occurs.
       * 
       * @return true if we should end the conversation
  +    * @deprecated use @ApplicationException(end=true)
       */
      boolean end() default false;
   }