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

[Gavin King]

  User: gavin   
  Date: 06/10/08 19:12:24

  Modified:    src/main/org/jboss/seam/jsf   AbstractSeamPhaseListener.java
                        SeamStateManager.java
  Log:
  minor refactor
  
  Revision  Changes    Path
  1.16      +0 -16     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.15
  retrieving revision 1.16
  diff -u -b -r1.15 -r1.16
  --- AbstractSeamPhaseListener.java	7 Oct 2006 18:06:58 -0000	1.15
  +++ AbstractSeamPhaseListener.java	8 Oct 2006 23:12:24 -0000	1.16
  @@ -59,22 +59,6 @@
      }
      
      /**
  -    * 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)
  
  
  
  1.5       +3 -1      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.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- SeamStateManager.java	7 Oct 2006 18:06:58 -0000	1.4
  +++ SeamStateManager.java	8 Oct 2006 23:12:24 -0000	1.5
  @@ -6,6 +6,8 @@
   import javax.faces.component.UIViewRoot;
   import javax.faces.context.FacesContext;
   
  +import org.jboss.seam.core.Pages;
  +
   /**
    * A wrapper for the JSF implementation's StateManager that allows
    * us to intercept saving of the serialized component tree. This
  @@ -42,7 +44,7 @@
      }
   
      public SerializedView saveSerializedView(FacesContext facesContext) {
  -      AbstractSeamPhaseListener.storePageParameters(facesContext);
  +      Pages.instance().storePageParameters(facesContext);
         AbstractSeamPhaseListener.storeAnyConversationContext(facesContext);
         return stateManager.saveSerializedView(facesContext);
      }