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

[Gavin King]

  User: gavin   
  Date: 07/02/24 23:49:57

  Modified:    src/main/org/jboss/seam/core    Filter.java
                        ManagedHibernateSession.java
                        ManagedPersistenceContext.java
  Log:
  conditionally enabled filters
  
  Revision  Changes    Path
  1.4       +25 -0     jboss-seam/src/main/org/jboss/seam/core/Filter.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Filter.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Filter.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- Filter.java	21 Nov 2006 00:44:01 -0000	1.3
  +++ Filter.java	25 Feb 2007 04:49:57 -0000	1.4
  @@ -25,6 +25,7 @@
   {
      private String name;
      private Map<String, ValueBinding> parameters;
  +   private ValueBinding enabled;
      
      @Create
      public void create(Component component)
  @@ -65,9 +66,33 @@
         this.name = name;
      }
   
  +   public boolean isFilterEnabled()
  +   {
  +      ValueBinding enabledValueBinding = getEnabled();
  +      if (enabledValueBinding==null)
  +      {
  +         return true;
  +      }
  +      else
  +      {
  +         Boolean enabled = (Boolean) enabledValueBinding.getValue();
  +         return enabled!=null && enabled;
  +      }
  +   }
  +
      @Override
      public String toString()
      {
         return "Filter(" + name + ")";
      }
  +
  +   public ValueBinding getEnabled()
  +   {
  +      return enabled;
  +   }
  +
  +   public void setEnabled(ValueBinding enabled)
  +   {
  +      this.enabled = enabled;
  +   }
   }
  
  
  
  1.31      +5 -2      jboss-seam/src/main/org/jboss/seam/core/ManagedHibernateSession.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ManagedHibernateSession.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ManagedHibernateSession.java,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -b -r1.30 -r1.31
  --- ManagedHibernateSession.java	2 Feb 2007 21:03:53 -0000	1.30
  +++ ManagedHibernateSession.java	25 Feb 2007 04:49:57 -0000	1.31
  @@ -1,4 +1,4 @@
  -//$Id: ManagedHibernateSession.java,v 1.30 2007/02/02 21:03:53 gavin Exp $
  +//$Id: ManagedHibernateSession.java,v 1.31 2007/02/25 04:49:57 gavin Exp $
   package org.jboss.seam.core;
   
   import static org.jboss.seam.InterceptionType.NEVER;
  @@ -76,8 +76,11 @@
         setSessionFlushMode( PersistenceContexts.instance().getFlushMode() );
         for (Filter f: filters)
         {
  +         if ( f.isFilterEnabled() )
  +         {
            enableFilter(f);
         }
  +      }
   
         if ( log.isDebugEnabled() )
         {
  
  
  
  1.37      +5 -2      jboss-seam/src/main/org/jboss/seam/core/ManagedPersistenceContext.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ManagedPersistenceContext.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/ManagedPersistenceContext.java,v
  retrieving revision 1.36
  retrieving revision 1.37
  diff -u -b -r1.36 -r1.37
  --- ManagedPersistenceContext.java	2 Feb 2007 21:03:53 -0000	1.36
  +++ ManagedPersistenceContext.java	25 Feb 2007 04:49:57 -0000	1.37
  @@ -1,4 +1,4 @@
  -//$Id: ManagedPersistenceContext.java,v 1.36 2007/02/02 21:03:53 gavin Exp $
  +//$Id: ManagedPersistenceContext.java,v 1.37 2007/02/25 04:49:57 gavin Exp $
   package org.jboss.seam.core;
   
   import static org.jboss.seam.InterceptionType.NEVER;
  @@ -78,8 +78,11 @@
   
         for (Filter f: filters)
         {
  +         if ( f.isFilterEnabled() )
  +         {
            PersistenceProvider.instance().enableFilter(f, entityManager);
         }
  +      }
   
         if ( log.isDebugEnabled() )
         {