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

[Gavin King]

  User: gavin   
  Date: 06/11/03 20:00:14

  Modified:    src/main/org/jboss/seam/jsf   AbstractSeamPhaseListener.java
                        SeamStateManager.java
  Log:
  JBSEAM-460, reduce reliance on StateManager
  
  Revision  Changes    Path
  1.22      +6 -2      jboss-seam/src/main/org/jboss/seam/jsf/AbstractSeamPhaseListener.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AbstractSeamPhaseListener.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/jsf/AbstractSeamPhaseListener.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -b -r1.21 -r1.22
  --- AbstractSeamPhaseListener.java	3 Nov 2006 23:38:27 -0000	1.21
  +++ AbstractSeamPhaseListener.java	4 Nov 2006 01:00:14 -0000	1.22
  @@ -22,6 +22,7 @@
   import org.jboss.seam.core.ConversationList;
   import org.jboss.seam.core.ConversationStack;
   import org.jboss.seam.core.FacesMessages;
  +import org.jboss.seam.core.FacesPage;
   import org.jboss.seam.core.Init;
   import org.jboss.seam.core.Manager;
   import org.jboss.seam.core.Pageflow;
  @@ -155,6 +156,9 @@
            Manager.instance().prepareBackswitch(facesContext); 
         }
         
  +      FacesPage.instance().storeConversation();
  +      FacesPage.instance().storePageflow();
  +      
      }
      
      protected void afterRender(FacesContext facesContext)
  @@ -164,7 +168,7 @@
         Manager.instance().prepareBackswitch(facesContext);
         
         ExternalContext externalContext = facesContext.getExternalContext();
  -      Manager.instance().endRequest( ContextAdaptor.getSession(externalContext, true) );
  +      Manager.instance().endRequest( ContextAdaptor.getSession(externalContext) );
         Lifecycle.endRequest(externalContext);
      }
   
  @@ -175,7 +179,7 @@
         //Note: we can't call Manager.instance().beforeRedirect() here, 
         //since a redirect is not the only reason for a responseComplete
         ExternalContext externalContext = facesContext.getExternalContext();
  -      Manager.instance().endRequest( ContextAdaptor.getSession(externalContext, true) );
  +      Manager.instance().endRequest( ContextAdaptor.getSession(externalContext) );
         Lifecycle.endRequest( facesContext.getExternalContext() );
      }
   
  
  
  
  1.8       +1 -31     jboss-seam/src/main/org/jboss/seam/jsf/SeamStateManager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SeamStateManager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/jsf/SeamStateManager.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- SeamStateManager.java	3 Nov 2006 22:47:24 -0000	1.7
  +++ SeamStateManager.java	4 Nov 2006 01:00:14 -0000	1.8
  @@ -6,11 +6,7 @@
   import javax.faces.component.UIViewRoot;
   import javax.faces.context.FacesContext;
   
  -import org.jboss.seam.Seam;
  -import org.jboss.seam.contexts.ContextAdaptor;
   import org.jboss.seam.contexts.Contexts;
  -import org.jboss.seam.core.Init;
  -import org.jboss.seam.core.Manager;
   import org.jboss.seam.core.Pages;
   
   /**
  @@ -59,35 +55,9 @@
         if ( Contexts.isPageContextActive() )
         {
            //store the page parameters in the view root
  -         if ( Contexts.isApplicationContextActive() )
  -         {
               Pages.instance().storePageParameters(facesContext);
            }
   
  -         //store the conversation id and information about
  -         //the pageflow execution state in the view root
  -         if ( Contexts.isEventContextActive() )
  -         {
  -            Manager.instance().writeValuesToViewRoot( 
  -                  ContextAdaptor.getSession( facesContext.getExternalContext(), true ), 
  -                  facesContext.getExternalContext().getResponse() 
  -               );
  -         }
  -
  -         //if we are using client-side conversations, flush
  -         //the conversation context variables to the view root
  -         boolean flushNeeded = Contexts.isApplicationContextActive() &&
  -               Init.instance().isClientSideConversations() &&
  -               Contexts.isConversationContextActive() &&
  -               !Seam.isSessionInvalid();
  -            
  -         if (flushNeeded)
  -         {
  -            Contexts.getConversationContext().flush();
  -         }
  -         
  -      }
  -
         return stateManager.saveSerializedView(facesContext);
      }