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

[Gavin King]

  User: gavin   
  Date: 07/02/09 21:03:50

  Modified:    src/main/org/jboss/seam/pages  ConversationControl.java
  Log:
  added begin-conversation if, end-conversation if
  
  Revision  Changes    Path
  1.3       +39 -4     jboss-seam/src/main/org/jboss/seam/pages/ConversationControl.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ConversationControl.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/pages/ConversationControl.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- ConversationControl.java	23 Jan 2007 23:42:32 -0000	1.2
  +++ ConversationControl.java	10 Feb 2007 02:03:50 -0000	1.3
  @@ -6,6 +6,7 @@
   import org.jboss.seam.annotations.FlushModeType;
   import org.jboss.seam.core.Conversation;
   import org.jboss.seam.core.Pageflow;
  +import org.jboss.seam.core.Expressions.ValueBinding;
   
   public class ConversationControl
   {
  @@ -17,6 +18,8 @@
      private boolean nested;
      private FlushModeType flushMode;
      private String pageflow;
  +   private ValueBinding<Boolean> beginConversationCondition;
  +   private ValueBinding<Boolean> endConversationCondition;
      
      public boolean isBeginConversation()
      {
  @@ -40,7 +43,7 @@
      
      public void beginOrEndConversation()
      {
  -      if ( isEndConversation )
  +      if ( endConversation() )
         {
            if (isEndConversationBeforeRedirect)
            {
  @@ -51,12 +54,12 @@
               Conversation.instance().end();
            }
         }
  -      if ( isBeginConversation )
  +      if ( beginConversation() )
         {
            boolean begun = Conversation.instance().begin(join, nested);
            if (begun)
            {
  -            if (flushMode!=null)
  +            if ( flushMode!=null )
               {
                  Conversation.instance().changeFlushMode(flushMode);
               }
  @@ -68,6 +71,18 @@
         }
      }
   
  +   private boolean beginConversation()
  +   {
  +      return isBeginConversation && 
  +         (beginConversationCondition==null || Boolean.TRUE.equals( beginConversationCondition.getValue() ) );
  +   }
  +
  +   private boolean endConversation()
  +   {
  +      return isEndConversation && 
  +         (endConversationCondition==null || Boolean.TRUE.equals( endConversationCondition.getValue() ) );
  +   }
  +
      public FlushModeType getFlushMode()
      {
         return flushMode;
  @@ -118,4 +133,24 @@
         this.isEndConversationBeforeRedirect = isEndConversationBeforeRedirect;
      }
      
  +   public ValueBinding<Boolean> getBeginConversationCondition()
  +   {
  +      return beginConversationCondition;
  +   }
  +
  +   public void setBeginConversationCondition(ValueBinding<Boolean> beginConversationCondition)
  +   {
  +      this.beginConversationCondition = beginConversationCondition;
  +   }
  +
  +   public ValueBinding<Boolean> getEndConversationCondition()
  +   {
  +      return endConversationCondition;
  +   }
  +
  +   public void setEndConversationCondition(ValueBinding<Boolean> endConversationCondition)
  +   {
  +      this.endConversationCondition = endConversationCondition;
  +   }
  +   
   }
  \ No newline at end of file