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

[Gavin King]

  User: gavin   
  Date: 07/05/19 12:44:53

  Modified:    src/main/org/jboss/seam/jsf  AbstractSeamPhaseListener.java
  Log:
  add restore permission for pages
  
  Revision  Changes    Path
  1.46      +5 -12     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.45
  retrieving revision 1.46
  diff -u -b -r1.45 -r1.46
  --- AbstractSeamPhaseListener.java	27 Mar 2007 02:24:20 -0000	1.45
  +++ AbstractSeamPhaseListener.java	19 May 2007 16:44:53 -0000	1.46
  @@ -67,15 +67,8 @@
            log.debug( "After restoring conversation context: " + Contexts.getConversationContext() );
         }
         
  -      //apply page parameters to the model
  -      if ( facesContext.getRenderResponse() )
  -      {
  -         Pages.instance().applyRequestParameterValues(facesContext);
  -      }
  -      else
  -      {
  -         Pages.instance().applyViewRootValues(facesContext);
  -      }
  +      Pages.instance().postRestorePage(facesContext);
  +            
      }
     
      /**
  @@ -211,7 +204,7 @@
         }
         selectDataModelRow( facesContext.getExternalContext().getRequestParameterMap() );
         
  -      enterPage(event);
  +      preRenderPage(event);
         
         if ( facesContext.getResponseComplete() )
         {
  @@ -267,13 +260,13 @@
         Lifecycle.endRequest( facesContext.getExternalContext() );
      }
      
  -   private boolean enterPage(PhaseEvent event)
  +   private boolean preRenderPage(PhaseEvent event)
      {
         Lifecycle.setPhaseId( PhaseId.INVOKE_APPLICATION );
         boolean actionsWereCalled = false;
         try
         {
  -         actionsWereCalled = Pages.instance().enterPage( event.getFacesContext() );
  +         actionsWereCalled = Pages.instance().preRenderPage( event.getFacesContext() );
            return actionsWereCalled;
         }
         finally