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

[Gavin King]

  User: gavin   
  Date: 07/06/20 13:45:57

  Modified:    src/main/org/jboss/seam/theme   Theme.java
                        ThemeSelector.java
  Log:
  refactored interception annotations
  
  Revision  Changes    Path
  1.5       +2 -3      jboss-seam/src/main/org/jboss/seam/theme/Theme.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Theme.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/theme/Theme.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- Theme.java	21 Dec 2006 02:38:28 -0000	1.4
  +++ Theme.java	20 Jun 2007 17:45:57 -0000	1.5
  @@ -1,6 +1,5 @@
   package org.jboss.seam.theme;
   
  -import static org.jboss.seam.InterceptionType.NEVER;
   import static org.jboss.seam.annotations.Install.BUILT_IN;
   
   import java.io.Serializable;
  @@ -14,10 +13,10 @@
   import org.jboss.seam.Component;
   import org.jboss.seam.ScopeType;
   import org.jboss.seam.annotations.Install;
  -import org.jboss.seam.annotations.Intercept;
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.annotations.Unwrap;
  +import org.jboss.seam.annotations.intercept.BypassInterceptors;
   import org.jboss.seam.core.Interpolator;
   
   /**
  @@ -26,7 +25,7 @@
    * @author Gavin King
    */
   @Scope(ScopeType.SESSION)
  - at Intercept(NEVER)
  + at BypassInterceptors
   @Name("org.jboss.seam.theme.theme")
   @Install(precedence=BUILT_IN)
   public class Theme implements Serializable {
  
  
  
  1.20      +2 -3      jboss-seam/src/main/org/jboss/seam/theme/ThemeSelector.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ThemeSelector.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/theme/ThemeSelector.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -b -r1.19 -r1.20
  --- ThemeSelector.java	19 Jun 2007 20:08:13 -0000	1.19
  +++ ThemeSelector.java	20 Jun 2007 17:45:57 -0000	1.20
  @@ -1,6 +1,5 @@
   package org.jboss.seam.theme;
   
  -import static org.jboss.seam.InterceptionType.NEVER;
   import static org.jboss.seam.annotations.Install.BUILT_IN;
   
   import java.util.ArrayList;
  @@ -19,9 +18,9 @@
   import org.jboss.seam.Seam;
   import org.jboss.seam.annotations.Create;
   import org.jboss.seam.annotations.Install;
  -import org.jboss.seam.annotations.Intercept;
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Scope;
  +import org.jboss.seam.annotations.intercept.BypassInterceptors;
   import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.core.Events;
   import org.jboss.seam.faces.Selector;
  @@ -38,7 +37,7 @@
    */
   @Scope(ScopeType.SESSION)
   @Name("org.jboss.seam.theme.themeSelector")
  - at Intercept(NEVER)
  + at BypassInterceptors
   @Install(precedence=BUILT_IN, classDependencies="javax.faces.context.FacesContext")
   public class ThemeSelector extends Selector
   {