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

[Gavin King]

  User: gavin   
  Date: 06/12/18 19:40:41

  Modified:    src/main/org/jboss/seam/jsf  AbstractSeamPhaseListener.java
  Log:
  in and out in pages.xml
  
  Revision  Changes    Path
  1.34      +3 -3      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.33
  retrieving revision 1.34
  diff -u -b -r1.33 -r1.34
  --- AbstractSeamPhaseListener.java	18 Dec 2006 15:38:49 -0000	1.33
  +++ AbstractSeamPhaseListener.java	19 Dec 2006 00:40:41 -0000	1.34
  @@ -199,7 +199,7 @@
   
         selectDataModelRow( facesContext.getExternalContext().getRequestParameterMap() );
         
  -      callPageActions(event);
  +      enterPage(event);
         
         if ( facesContext.getResponseComplete() )
         {
  @@ -244,7 +244,7 @@
         Lifecycle.endRequest( facesContext.getExternalContext() );
      }
   
  -   private boolean callPageActions(PhaseEvent event)
  +   private boolean enterPage(PhaseEvent event)
      {
         Lifecycle.setPhaseId( PhaseId.INVOKE_APPLICATION );
         boolean actionsWereCalled = false;
  @@ -252,7 +252,7 @@
         {
            FacesContext facesContext = event.getFacesContext();
            actionsWereCalled = Pages.callAction(facesContext) || actionsWereCalled;
  -         actionsWereCalled = Pages.instance().callActionsAndValidateConversation(facesContext) || actionsWereCalled;
  +         actionsWereCalled = Pages.instance().enterPage(facesContext) || actionsWereCalled;
            return actionsWereCalled;
         }
         catch (RuntimeException re)