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

[Gavin King]

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

  Modified:    src/main/org/jboss/seam/core  Pages.java
  Log:
  added begin-conversation if, end-conversation if
  
  Revision  Changes    Path
  1.81      +10 -0     jboss-seam/src/main/org/jboss/seam/core/Pages.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Pages.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Pages.java,v
  retrieving revision 1.80
  retrieving revision 1.81
  diff -u -b -r1.80 -r1.81
  --- Pages.java	7 Feb 2007 17:12:31 -0000	1.80
  +++ Pages.java	10 Feb 2007 02:03:50 -0000	1.81
  @@ -728,6 +728,11 @@
         {
            control.setEndConversation(true);
            control.setEndConversationBeforeRedirect( "true".equals( endConversation.attributeValue("before-redirect") ) );
  +         String expression = endConversation.attributeValue("if");
  +         if (expression!=null)
  +         {
  +            control.setEndConversationCondition( Expressions.instance().createValueBinding(expression) );
  +         }
         }
         
         Element beginConversation = element.element("begin-conversation");
  @@ -742,6 +747,11 @@
            {
               control.setFlushMode( FlushModeType.valueOf( flushMode.toUpperCase() ) );
            }
  +         String expression = beginConversation.attributeValue("if");
  +         if (expression!=null)
  +         {
  +            control.setBeginConversationCondition( Expressions.instance().createValueBinding(expression) );
  +         }
         }
         
         if ( control.isBeginConversation() && control.isEndConversation() )