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

[Gavin King]

  User: gavin   
  Date: 06/12/17 20:46:24

  Modified:    src/main/org/jboss/seam/jsf   
                        AbstractSeamPhaseListener.java
                        SeamPhaseListener.java
                        SeamPortletPhaseListener.java
  Log:
  add s:forceModelUpdate
  
  Revision  Changes    Path
  1.32      +8 -0      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.31
  retrieving revision 1.32
  diff -u -b -r1.31 -r1.32
  --- AbstractSeamPhaseListener.java	17 Dec 2006 17:45:37 -0000	1.31
  +++ AbstractSeamPhaseListener.java	18 Dec 2006 01:46:24 -0000	1.32
  @@ -322,4 +322,12 @@
         }
      }
   
  +   protected void afterProcessValidations(FacesContext facesContext)
  +   {
  +      if ( facesContext.getRenderResponse() )
  +      {
  +         Manager.instance().afterValidationFailure(facesContext);
  +      }
  +   }
  +
   }
  
  
  
  1.95      +6 -1      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.94
  retrieving revision 1.95
  diff -u -b -r1.94 -r1.95
  --- SeamPhaseListener.java	16 Dec 2006 02:58:11 -0000	1.94
  +++ SeamPhaseListener.java	18 Dec 2006 01:46:24 -0000	1.95
  @@ -10,6 +10,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.PROCESS_VALIDATIONS;
   
   import javax.faces.context.FacesContext;
   import javax.faces.event.PhaseEvent;
  @@ -50,7 +51,7 @@
         {
            beforeRender(event);
         }
  -      else if ( event.getPhaseId()== APPLY_REQUEST_VALUES )
  +      else if ( event.getPhaseId() == APPLY_REQUEST_VALUES )
         {
            beforeUpdateModelValues(event);
         }
  @@ -76,6 +77,10 @@
         {
            afterInvokeApplication();
         }
  +      else if ( event.getPhaseId() == PROCESS_VALIDATIONS )
  +      {
  +         afterProcessValidations( event.getFacesContext() );
  +      }
               
         //has to happen after, since restoreAnyConversationContext() 
         //can add messages
  
  
  
  1.18      +5 -26     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.17
  retrieving revision 1.18
  diff -u -b -r1.17 -r1.18
  --- SeamPortletPhaseListener.java	16 Dec 2006 02:58:11 -0000	1.17
  +++ SeamPortletPhaseListener.java	18 Dec 2006 01:46:24 -0000	1.18
  @@ -8,6 +8,7 @@
   
   import static javax.faces.event.PhaseId.APPLY_REQUEST_VALUES;
   import static javax.faces.event.PhaseId.INVOKE_APPLICATION;
  +import static javax.faces.event.PhaseId.PROCESS_VALIDATIONS;
   import static javax.faces.event.PhaseId.RENDER_RESPONSE;
   import static javax.faces.event.PhaseId.RESTORE_VIEW;
   
  @@ -83,6 +84,10 @@
         {
            afterInvokeApplication();
         }
  +      else if ( event.getPhaseId() == PROCESS_VALIDATIONS )
  +      {
  +         afterProcessValidations( event.getFacesContext() );
  +      }
         
         FacesMessages.afterPhase();
         
  @@ -109,32 +114,6 @@
       * Write out the conversation id as a servlet response header or portlet
       * render parameter.
       */
  -   /*private static void writeConversationIdToResponse(Object response)
  -   {
  -      Manager manager = Manager.instance();
  -      String conversationIdParameter = manager.getConversationIdParameter();
  -      String conversationId;
  -      if ( manager.isLongRunningConversation() )
  -      {
  -         conversationId = manager.getCurrentConversationId();
  -      }
  -      else if ( manager.isNestedConversation() )
  -      {
  -         conversationId = manager.getParentConversationId();
  -      }
  -      else
  -      {
  -         //nothing to set
  -         return;
  -      }
  -      //setResponseHeader(response, conversationIdParameter, conversationId);
  -      setPortletRenderParameter(response, conversationIdParameter, conversationId);
  -   }*/
  -
  -   /**
  -    * Write out the conversation id as a servlet response header or portlet
  -    * render parameter.
  -    */
      private static void writeConversationIdToResponse(Object response)
      {
         Manager manager = Manager.instance();