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

[Gavin King]

  User: gavin   
  Date: 06/11/20 15:31:17

  Modified:    src/main/org/jboss/seam/core   Page.java Pages.java
  Log:
  endBeforeRedirect makes no sense for a <page>
  
  Revision  Changes    Path
  1.4       +1 -18     jboss-seam/src/main/org/jboss/seam/core/Page.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Page.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Page.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- Page.java	16 Nov 2006 22:58:13 -0000	1.3
  +++ Page.java	20 Nov 2006 20:31:16 -0000	1.4
  @@ -104,7 +104,6 @@
      private boolean nested;
      private FlushModeType flushMode;
      private String pageflow;
  -   private boolean beforeRedirect;
      
      Page(String viewId)
      {
  @@ -257,15 +256,8 @@
      {
         if ( isEndConversation )
         {
  -         if (beforeRedirect)
  -         {
  -            Conversation.instance().endBeforeRedirect();
  -         }
  -         else
  -         {
               Conversation.instance().end();
            }
  -      }
         if ( isBeginConversation )
         {
            Conversation.instance().begin(join, nested);
  @@ -320,13 +312,4 @@
         this.pageflow = pageflow;
      }
   
  -   protected boolean isBeforeRedirect()
  -   {
  -      return beforeRedirect;
  -   }
  -
  -   protected void setBeforeRedirect(boolean beforeRedirect)
  -   {
  -      this.beforeRedirect = beforeRedirect;
  -   }
   }
  \ No newline at end of file
  
  
  
  1.51      +0 -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.50
  retrieving revision 1.51
  diff -u -b -r1.50 -r1.51
  --- Pages.java	17 Nov 2006 02:35:45 -0000	1.50
  +++ Pages.java	20 Nov 2006 20:31:16 -0000	1.51
  @@ -160,7 +160,6 @@
         if ( endConversation!=null )
         {
            entry.setEndConversation(true);
  -         entry.setBeforeRedirect( "true".equals( endConversation.attributeValue("before-redirect") ) );
         }
         
         Element beginConversation = page.element("begin-conversation");