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

[Gavin King]

  User: gavin   
  Date: 06/10/07 14:06:58

  Modified:    src/main/org/jboss/seam/jsf   AbstractSeamPhaseListener.java
                        SeamStateManager.java
  Log:
  propagate page parameters via form submission
  
  Revision  Changes    Path
  1.15      +20 -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.14
  retrieving revision 1.15
  diff -u -b -r1.14 -r1.15
  --- AbstractSeamPhaseListener.java	30 Sep 2006 17:09:02 -0000	1.14
  +++ AbstractSeamPhaseListener.java	7 Oct 2006 18:06:58 -0000	1.15
  @@ -59,6 +59,22 @@
      }
   
      /**
  +    * Store the page parameters during a JSF request
  +    */
  +   public static void storePageParameters(FacesContext facesContext)
  +   {
  +      String viewId = facesContext.getViewRoot().getViewId();
  +      if (viewId!=null)
  +      {
  +         Map<String, Object> parameters = Pages.instance().getParameters(viewId);
  +         if ( !parameters.isEmpty() )
  +         {
  +            Contexts.getPageContext().set( "pageParameters", parameters );
  +         }
  +      }
  +   }
  +   
  +   /**
       * Store the page and conversation contexts during a JSF request
       */
      public static void storeAnyConversationContext(FacesContext facesContext)
  @@ -107,7 +123,7 @@
   
      protected void beforeUpdateModelValues(PhaseEvent event)
      {
  -      Pages.instance().applyParameterValues( event.getFacesContext().getViewRoot().getViewId() );
  +      Pages.instance().applyViewRootValues( event.getFacesContext().getViewRoot().getViewId() );
         Manager.instance().setUpdateModelValuesCalled(true);
      }
   
  @@ -134,7 +150,7 @@
   
         if ( !Manager.instance().isUpdateModelValuesCalled() )
         {
  -         Pages.instance().applyParameterValues( facesContext.getViewRoot().getViewId() );
  +         Pages.instance().applyRequestParameterValues( facesContext.getViewRoot().getViewId() );
         }
   
         selectDataModelRow( facesContext.getExternalContext().getRequestParameterMap() );
  
  
  
  1.4       +4 -3      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.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- SeamStateManager.java	15 May 2006 00:31:22 -0000	1.3
  +++ SeamStateManager.java	7 Oct 2006 18:06:58 -0000	1.4
  @@ -41,9 +41,10 @@
         return stateManager.restoreView(ctx, str1, str2);
      }
   
  -   public SerializedView saveSerializedView(FacesContext ctx) {
  -      AbstractSeamPhaseListener.storeAnyConversationContext(ctx);
  -      return stateManager.saveSerializedView(ctx);
  +   public SerializedView saveSerializedView(FacesContext facesContext) {
  +      AbstractSeamPhaseListener.storePageParameters(facesContext);
  +      AbstractSeamPhaseListener.storeAnyConversationContext(facesContext);
  +      return stateManager.saveSerializedView(facesContext);
      }
   
      public void writeState(FacesContext ctx, SerializedView sv) throws IOException {