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

[Gavin King]

  User: gavin   
  Date: 06/09/30 13:09:02

  Modified:    src/main/org/jboss/seam/jsf   
                        AbstractSeamPhaseListener.java
                        SeamPhaseListener.java
                        SeamPortletPhaseListener.java
  Log:
  form values should override request params
  
  Revision  Changes    Path
  1.14      +2 -2      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.13
  retrieving revision 1.14
  diff -u -b -r1.13 -r1.14
  --- AbstractSeamPhaseListener.java	30 Sep 2006 16:36:32 -0000	1.13
  +++ AbstractSeamPhaseListener.java	30 Sep 2006 17:09:02 -0000	1.14
  @@ -105,7 +105,7 @@
         }
      }
   
  -   protected void afterUpdateModelValues(PhaseEvent event)
  +   protected void beforeUpdateModelValues(PhaseEvent event)
      {
         Pages.instance().applyParameterValues( event.getFacesContext().getViewRoot().getViewId() );
         Manager.instance().setUpdateModelValuesCalled(true);
  @@ -161,7 +161,7 @@
         }
      }
      
  -   public boolean callPageActions(PhaseEvent event)
  +   private boolean callPageActions(PhaseEvent event)
      {
         Lifecycle.setPhaseId( PhaseId.INVOKE_APPLICATION );
         boolean actionsWereCalled = false;
  
  
  
  1.87      +4 -4      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.86
  retrieving revision 1.87
  diff -u -b -r1.86 -r1.87
  --- SeamPhaseListener.java	30 Sep 2006 16:36:32 -0000	1.86
  +++ SeamPhaseListener.java	30 Sep 2006 17:09:02 -0000	1.87
  @@ -59,6 +59,10 @@
         {
            beforeRender(event);
         }
  +      else if ( event.getPhaseId()== UPDATE_MODEL_VALUES )
  +      {
  +         beforeUpdateModelValues(event);
  +      }
   
      }
      
  @@ -76,10 +80,6 @@
         {
            afterInvokeApplication();
         }
  -      else if ( event.getPhaseId()== UPDATE_MODEL_VALUES )
  -      {
  -         afterUpdateModelValues(event);
  -      }
               
         //has to happen after, since restoreAnyConversationContext() 
         //can add messages
  
  
  
  1.11      +5 -0      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.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- SeamPortletPhaseListener.java	30 Sep 2006 16:36:32 -0000	1.10
  +++ SeamPortletPhaseListener.java	30 Sep 2006 17:09:02 -0000	1.11
  @@ -9,6 +9,7 @@
   import static javax.faces.event.PhaseId.INVOKE_APPLICATION;
   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;
  @@ -54,6 +55,10 @@
            restoreAnyConversationContext( facesContext );         
            beforeRender(event);
         }
  +      else if ( event.getPhaseId()== UPDATE_MODEL_VALUES )
  +      {
  +         beforeUpdateModelValues(event);
  +      }
   
      }