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

[Peter Muir]

  User: pmuir   
  Date: 07/02/22 05:14:57

  Modified:    src/main/org/jboss/seam/core  Pages.java
  Log:
  Make start-task,begin-task and end-task in pages.xml begin/end conversations
  
  Revision  Changes    Path
  1.89      +5 -1      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.88
  retrieving revision 1.89
  diff -u -b -r1.88 -r1.89
  --- Pages.java	21 Feb 2007 20:32:41 -0000	1.88
  +++ Pages.java	22 Feb 2007 10:14:57 -0000	1.89
  @@ -799,11 +799,13 @@
         return action;
      }
      /**
  -    * Parse end-conversation and begin-conversation
  +    * Parse end-conversation (and end-task) and begin-conversation (start-task and begin-task) 
  +    *
       */
      private static void parseConversationControl(Element element, ConversationControl control)
      {
         Element endConversation = element.element("end-conversation");
  +      endConversation = endConversation == null ? element.element("end-task") : endConversation;
         if ( endConversation!=null )
         {
            control.setEndConversation(true);
  @@ -816,6 +818,8 @@
         }
         
         Element beginConversation = element.element("begin-conversation");
  +      beginConversation = beginConversation == null ? element.element("begin-task") : beginConversation;
  +      beginConversation = beginConversation == null ? element.element("start-task") : beginConversation;
         if ( beginConversation!=null )
         {
            control.setBeginConversation(true);