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

[Gavin King]

  User: gavin   
  Date: 06/09/26 23:53:49

  Modified:    src/main/org/jboss/seam/jsf   
                        SeamExtendedManagedPersistencePhaseListener.java
                        SeamExtendedManagedPersistencePortletPhaseListener.java
                        SeamPhaseListener.java
  Log:
  stateful seam interceptors
  page parameters
  crud framework prototype
  bugfixes to PC passivation stuff
  
  Revision  Changes    Path
  1.22      +3 -3      jboss-seam/src/main/org/jboss/seam/jsf/SeamExtendedManagedPersistencePhaseListener.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SeamExtendedManagedPersistencePhaseListener.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/jsf/SeamExtendedManagedPersistencePhaseListener.java,v
  retrieving revision 1.21
  retrieving revision 1.22
  diff -u -b -r1.21 -r1.22
  --- SeamExtendedManagedPersistencePhaseListener.java	1 Jul 2006 10:50:09 -0000	1.21
  +++ SeamExtendedManagedPersistencePhaseListener.java	27 Sep 2006 03:53:49 -0000	1.22
  @@ -1,4 +1,4 @@
  -//$Id: SeamExtendedManagedPersistencePhaseListener.java,v 1.21 2006/07/01 10:50:09 gavin Exp $
  +//$Id: SeamExtendedManagedPersistencePhaseListener.java,v 1.22 2006/09/27 03:53:49 gavin Exp $
   package org.jboss.seam.jsf;
   
   import javax.faces.event.PhaseEvent;
  @@ -25,7 +25,7 @@
         boolean beginTran = phaseId==PhaseId.RESTORE_VIEW || 
               ( phaseId==PhaseId.RENDER_RESPONSE && !Init.instance().isClientSideConversations() );
         
  -      if ( beginTran ) 
  +      if (beginTran) 
         {
            begin(phaseId);
         }
  @@ -36,7 +36,7 @@
      {
         PhaseId phaseId = event.getPhaseId();
         boolean commitTran = phaseId==PhaseId.INVOKE_APPLICATION || 
  -            event.getFacesContext().getRenderResponse() ||
  +            event.getFacesContext().getRenderResponse() || //TODO: no need to commit the tx if we failed to restore the view
               event.getFacesContext().getResponseComplete() ||
               ( phaseId==PhaseId.RENDER_RESPONSE && !Init.instance().isClientSideConversations() );
         
  
  
  
  1.6       +2 -2      jboss-seam/src/main/org/jboss/seam/jsf/SeamExtendedManagedPersistencePortletPhaseListener.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SeamExtendedManagedPersistencePortletPhaseListener.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/jsf/SeamExtendedManagedPersistencePortletPhaseListener.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -b -r1.5 -r1.6
  --- SeamExtendedManagedPersistencePortletPhaseListener.java	1 Jul 2006 10:50:09 -0000	1.5
  +++ SeamExtendedManagedPersistencePortletPhaseListener.java	27 Sep 2006 03:53:49 -0000	1.6
  @@ -1,4 +1,4 @@
  -//$Id: SeamExtendedManagedPersistencePortletPhaseListener.java,v 1.5 2006/07/01 10:50:09 gavin Exp $
  +//$Id: SeamExtendedManagedPersistencePortletPhaseListener.java,v 1.6 2006/09/27 03:53:49 gavin Exp $
   package org.jboss.seam.jsf;
   
   import javax.faces.event.PhaseEvent;
  @@ -35,7 +35,7 @@
      {
         PhaseId phaseId = event.getPhaseId();
         boolean commitTran = phaseId==PhaseId.INVOKE_APPLICATION || 
  -            event.getFacesContext().getRenderResponse() ||
  +            event.getFacesContext().getRenderResponse() || //TODO: no need to commit the tx if we failed to restore the view
               event.getFacesContext().getResponseComplete() || //TODO: unnecessary for portlet?
               phaseId==PhaseId.RENDER_RESPONSE;
         
  
  
  
  1.84      +7 -0      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.83
  retrieving revision 1.84
  diff -u -b -r1.83 -r1.84
  --- SeamPhaseListener.java	12 Jul 2006 23:02:31 -0000	1.83
  +++ SeamPhaseListener.java	27 Sep 2006 03:53:49 -0000	1.84
  @@ -7,6 +7,7 @@
   package org.jboss.seam.jsf;
   
   import static javax.faces.event.PhaseId.INVOKE_APPLICATION;
  +import static javax.faces.event.PhaseId.APPLY_REQUEST_VALUES;
   import static javax.faces.event.PhaseId.RENDER_RESPONSE;
   import static javax.faces.event.PhaseId.RESTORE_VIEW;
   
  @@ -20,6 +21,7 @@
   import org.jboss.seam.core.FacesMessages;
   import org.jboss.seam.core.Init;
   import org.jboss.seam.core.Manager;
  +import org.jboss.seam.core.Pages;
   import org.jboss.seam.util.Transactions;
   
   /**
  @@ -50,6 +52,7 @@
         }
         else if ( event.getPhaseId() == RENDER_RESPONSE )
         {
  +         Pages.instance().applyParameterValues( event.getFacesContext().getViewRoot().getViewId() );
            beforeRender(event);
         }
   
  @@ -84,6 +87,10 @@
            }
            catch (Exception e) {} //swallow silently, not important
         }
  +      else if ( event.getPhaseId()== APPLY_REQUEST_VALUES )
  +      {
  +         Pages.instance().applyParameterValues( facesContext.getViewRoot().getViewId() );
  +      }
               
         //has to happen after, since restoreAnyConversationContext() 
         //can add messages