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

[Gavin King]

  User: gavin   
  Date: 07/06/20 04:23:17

  Modified:    src/main/org/jboss/seam/jsf  SeamPhaseListener.java
  Log:
  split up Lifecycle, much better
  
  Revision  Changes    Path
  1.106     +12 -12    jboss-seam/src/main/org/jboss/seam/jsf/SeamPhaseListener.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SeamPhaseListener.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/jsf/SeamPhaseListener.java,v
  retrieving revision 1.105
  retrieving revision 1.106
  diff -u -b -r1.105 -r1.106
  --- SeamPhaseListener.java	20 Jun 2007 05:34:32 -0000	1.105
  +++ SeamPhaseListener.java	20 Jun 2007 08:23:17 -0000	1.106
  @@ -25,7 +25,7 @@
   import org.jboss.seam.Seam;
   import org.jboss.seam.contexts.Context;
   import org.jboss.seam.contexts.Contexts;
  -import org.jboss.seam.contexts.Lifecycle;
  +import org.jboss.seam.contexts.FacesLifecycle;
   import org.jboss.seam.core.ConversationList;
   import org.jboss.seam.core.ConversationPropagation;
   import org.jboss.seam.core.ConversationStack;
  @@ -33,9 +33,9 @@
   import org.jboss.seam.core.Init;
   import org.jboss.seam.core.Manager;
   import org.jboss.seam.exceptions.Exceptions;
  +import org.jboss.seam.faces.FacesManager;
   import org.jboss.seam.faces.FacesMessages;
   import org.jboss.seam.faces.FacesPage;
  -import org.jboss.seam.faces.FacesManager;
   import org.jboss.seam.faces.Switcher;
   import org.jboss.seam.faces.Validation;
   import org.jboss.seam.log.LogProvider;
  @@ -102,7 +102,7 @@
      {
         log.trace( "before phase: " + event.getPhaseId() );
         
  -      Lifecycle.setPhaseId( event.getPhaseId() );
  +      FacesLifecycle.setPhaseId( event.getPhaseId() );
   
         try
         {
  @@ -197,7 +197,7 @@
            }
         }
   
  -      Lifecycle.setPhaseId(null);
  +      FacesLifecycle.clearPhaseId();
         
      }
   
  @@ -357,7 +357,7 @@
       */
      protected void beforeRestoreView(FacesContext facesContext)
      {
  -      Lifecycle.beginRequest( facesContext.getExternalContext() );
  +      FacesLifecycle.beginRequest( facesContext.getExternalContext() );
      }
      
      /**
  @@ -365,11 +365,11 @@
       */
      protected void afterRestoreView(FacesContext facesContext)
      {
  -      Lifecycle.resumePage();
  +      FacesLifecycle.resumePage();
         Map parameters = facesContext.getExternalContext().getRequestParameterMap();
         ConversationPropagation.instance().restoreConversationId(parameters);
         boolean conversationFound = Manager.instance().restoreConversation();
  -      Lifecycle.resumeConversation( facesContext.getExternalContext() );
  +      FacesLifecycle.resumeConversation( facesContext.getExternalContext() );
         if (!conversationFound)
         {
            Pages.instance().redirectToNoConversationView();
  @@ -476,7 +476,7 @@
            //workaround for a bug in MyFaces prior to 1.1.3
            if ( Init.instance().isMyFacesLifecycleBug() ) 
            {
  -            Lifecycle.endRequest( facesContext.getExternalContext() );
  +            FacesLifecycle.endRequest( facesContext.getExternalContext() );
            }
         }
         else //if the page actions did not call responseComplete()
  @@ -511,7 +511,7 @@
         
         ExternalContext externalContext = facesContext.getExternalContext();
         Manager.instance().endRequest( externalContext.getSessionMap() );
  -      Lifecycle.endRequest(externalContext);
  +      FacesLifecycle.endRequest(externalContext);
      }
      
      protected void afterResponseComplete(FacesContext facesContext)
  @@ -522,7 +522,7 @@
         //since a redirect is not the only reason for a responseComplete
         ExternalContext externalContext = facesContext.getExternalContext();
         Manager.instance().endRequest( externalContext.getSessionMap() );
  -      Lifecycle.endRequest( facesContext.getExternalContext() );
  +      FacesLifecycle.endRequest( facesContext.getExternalContext() );
      }
      
      private boolean preRenderPage(PhaseEvent event)
  @@ -533,7 +533,7 @@
         }
         else
         {
  -         Lifecycle.setPhaseId(PhaseId.INVOKE_APPLICATION);
  +         FacesLifecycle.setPhaseId(PhaseId.INVOKE_APPLICATION);
            boolean actionsWereCalled = false;
            try
            {
  @@ -542,7 +542,7 @@
            }
            finally
            {
  -            Lifecycle.setPhaseId( PhaseId.RENDER_RESPONSE );
  +            FacesLifecycle.setPhaseId(PhaseId.RENDER_RESPONSE);
               if (actionsWereCalled) 
               {
                  FacesMessages.afterPhase();