[jboss-cvs] jboss-seam/ui/src/main/java/org/jboss/seam/ui/converter ...

[Gavin King]

  User: gavin   
  Date: 07/06/20 13:53:18

  Modified:    ui/src/main/java/org/jboss/seam/ui/converter  
                        EntityConverter.java EntityConverterStore.java
  Log:
  refactored interception annotations
  
  Revision  Changes    Path
  1.3       +6 -5      jboss-seam/ui/src/main/java/org/jboss/seam/ui/converter/EntityConverter.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: EntityConverter.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/ui/src/main/java/org/jboss/seam/ui/converter/EntityConverter.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- EntityConverter.java	19 Jun 2007 21:57:48 -0000	1.2
  +++ EntityConverter.java	20 Jun 2007 17:53:18 -0000	1.3
  @@ -1,6 +1,5 @@
   package org.jboss.seam.ui.converter;
   
  -import static org.jboss.seam.InterceptionType.NEVER;
   import static org.jboss.seam.ScopeType.CONVERSATION;
   import static org.jboss.seam.annotations.Install.BUILT_IN;
   
  @@ -13,11 +12,11 @@
   
   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.Role;
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.annotations.Transactional;
  +import org.jboss.seam.annotations.intercept.BypassInterceptors;
   import org.jboss.seam.annotations.jsf.Converter;
   import org.jboss.seam.core.Expressions.ValueExpression;
   
  @@ -31,7 +30,7 @@
   @Scope(CONVERSATION)
   @Install(precedence = BUILT_IN)
   @Converter
  - at Intercept(NEVER)
  + at BypassInterceptors
   public class EntityConverter implements
            javax.faces.convert.Converter, Serializable
   {
  @@ -87,7 +86,9 @@
         this.entityManager = entityManager;
      }
      
  -   private EntityManager getEntityManager() {
  -      return entityManager == null ? null : entityManager.getValue();
  +   private EntityManager getEntityManager() 
  +   {
  +      return entityManager == null ? 
  +            null : entityManager.getValue();
      }
   }
  \ No newline at end of file
  
  
  
  1.2       +3 -4      jboss-seam/ui/src/main/java/org/jboss/seam/ui/converter/EntityConverterStore.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: EntityConverterStore.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/ui/src/main/java/org/jboss/seam/ui/converter/EntityConverterStore.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- EntityConverterStore.java	15 Jun 2007 17:06:59 -0000	1.1
  +++ EntityConverterStore.java	20 Jun 2007 17:53:18 -0000	1.2
  @@ -1,18 +1,17 @@
   package org.jboss.seam.ui.converter;
   
  -import static org.jboss.seam.annotations.Install.BUILT_IN;
   import static org.jboss.seam.ScopeType.PAGE;
  -import static org.jboss.seam.InterceptionType.NEVER;
  +import static org.jboss.seam.annotations.Install.BUILT_IN;
   
   import java.util.ArrayList;
   import java.util.List;
   
   import org.jboss.seam.Component;
   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.Transactional;
  +import org.jboss.seam.annotations.intercept.BypassInterceptors;
   import org.jboss.seam.contexts.Contexts;
   import org.jboss.seam.framework.EntityIdentifier;
   import org.jboss.seam.framework.MutableEntityController;
  @@ -25,7 +24,7 @@
   @Name("org.jboss.seam.ui.entityConverterStore")
   @Install(precedence=BUILT_IN)
   @Scope(PAGE)
  - at Intercept(NEVER)
  + at BypassInterceptors
   public class EntityConverterStore extends MutableEntityController
   {