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

[Gavin King]

  User: gavin   
  Date: 07/03/26 22:24:20

  Modified:    src/main/org/jboss/seam/jsf   
                        AbstractSeamPhaseListener.java
                        SeamPhaseListener.java
                        SeamPortletPhaseListener.java
  Log:
  apply page parameters as soon as possible, since it works better with Home.isManaged()
  
  Revision  Changes    Path
  1.45      +15 -4     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.44
  retrieving revision 1.45
  diff -u -b -r1.44 -r1.45
  --- AbstractSeamPhaseListener.java	12 Mar 2007 22:30:15 -0000	1.44
  +++ AbstractSeamPhaseListener.java	27 Mar 2007 02:24:20 -0000	1.45
  @@ -66,6 +66,16 @@
         {
            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);
  +      }
      }
     
      /**
  @@ -148,11 +158,12 @@
         }
      }
      
  -   protected void beforeUpdateModelValues(PhaseEvent event)
  +   /*protected void beforeUpdateModelValues(PhaseEvent event)
      {
         Pages.instance().applyViewRootValues( event.getFacesContext() );
         Manager.instance().setUpdateModelValuesCalled(true);
  -   }
  +   }*/
  +   
      /**
       * Give the subclasses an opportunity to do stuff
       */
  @@ -181,10 +192,10 @@
      {  
         
         FacesContext facesContext = event.getFacesContext();
  -      if ( !Manager.instance().isUpdateModelValuesCalled() )
  +      /*if ( !Manager.instance().isUpdateModelValuesCalled() )
         {
            Pages.instance().applyRequestParameterValues(facesContext);
  -      }
  +      }*/
         
         if ( Contexts.isPageContextActive() )
         {
  
  
  
  1.99      +2 -3      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.98
  retrieving revision 1.99
  diff -u -b -r1.98 -r1.99
  --- SeamPhaseListener.java	18 Mar 2007 01:44:05 -0000	1.98
  +++ SeamPhaseListener.java	27 Mar 2007 02:24:20 -0000	1.99
  @@ -10,7 +10,6 @@
   import static javax.faces.event.PhaseId.PROCESS_VALIDATIONS;
   import static javax.faces.event.PhaseId.RENDER_RESPONSE;
   import static javax.faces.event.PhaseId.RESTORE_VIEW;
  -import static javax.faces.event.PhaseId.UPDATE_MODEL_VALUES;
   
   import javax.faces.context.FacesContext;
   import javax.faces.event.PhaseEvent;
  @@ -56,10 +55,10 @@
            {
               beforeRender(event);
            }
  -         else if ( event.getPhaseId() == UPDATE_MODEL_VALUES )
  +         /*else if ( event.getPhaseId() == UPDATE_MODEL_VALUE )
            {
               beforeUpdateModelValues(event);
  -         }
  +         }*/
            
            super.beforePhase(event);
            
  
  
  
  1.21      +2 -3      jboss-seam/src/main/org/jboss/seam/jsf/SeamPortletPhaseListener.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SeamPortletPhaseListener.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/jsf/SeamPortletPhaseListener.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -b -r1.20 -r1.21
  --- SeamPortletPhaseListener.java	18 Mar 2007 01:44:05 -0000	1.20
  +++ SeamPortletPhaseListener.java	27 Mar 2007 02:24:20 -0000	1.21
  @@ -10,7 +10,6 @@
   import static javax.faces.event.PhaseId.PROCESS_VALIDATIONS;
   import static javax.faces.event.PhaseId.RENDER_RESPONSE;
   import static javax.faces.event.PhaseId.RESTORE_VIEW;
  -import static javax.faces.event.PhaseId.UPDATE_MODEL_VALUES;
   
   import javax.faces.context.FacesContext;
   import javax.faces.event.PhaseEvent;
  @@ -59,10 +58,10 @@
            afterRestoreView( facesContext );         
            beforeRender(event);
         }
  -      else if ( event.getPhaseId()== UPDATE_MODEL_VALUES )
  +      /*else if ( event.getPhaseId()== UPDATE_MODEL_VALUE )
         {
            beforeUpdateModelValues(event);
  -      }
  +      }*/
         
         super.beforePhase(event);