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

[Gavin King]

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

  Modified:    src/main/org/jboss/seam/core   Pages.java
                        RenderParameters.java
  Log:
  minor refactor
  
  Revision  Changes    Path
  1.28      +31 -1     jboss-seam/src/main/org/jboss/seam/core/Pages.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Pages.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Pages.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -b -r1.27 -r1.28
  --- Pages.java	8 Oct 2006 20:58:03 -0000	1.27
  +++ Pages.java	8 Oct 2006 23:12:24 -0000	1.28
  @@ -46,6 +46,7 @@
   @Name("org.jboss.seam.core.pages")
   public class Pages 
   {
  +   public static final String PAGE_PARAMETERS = "org.jboss.seam.core.pageParameters";
      
      private static final Log log = LogFactory.getLog(Pages.class);
      
  @@ -376,7 +377,7 @@
   
      public void applyViewRootValues(String viewId)
      {
  -      Map<String, Object> pageParameters = (Map<String, Object>) Contexts.getPageContext().get("pageParameters");
  +      Map<String, Object> pageParameters = (Map<String, Object>) Contexts.getPageContext().get(PAGE_PARAMETERS);
         if (pageParameters!=null)
         {
         
  @@ -402,4 +403,33 @@
         this.noConversationViewId = noConversationViewId;
      }
   
  +   /**
  +    * Encode page parameters into a URL
  +    * 
  +    * @param url the base URL
  +    * @param viewId the JSF view id of the page
  +    * @return the URL with parameters appended
  +    */
  +   public String encodePageParameters(String url, String viewId)
  +   {
  +      Map<String, Object> parameters = getParameters(viewId);
  +      return Manager.instance().encodeParameters(url, parameters);
  +   }
  +
  +   /**
  +    * Store the page parameters to the JSF view root
  +    */
  +   public void storePageParameters(FacesContext facesContext)
  +   {
  +      String viewId = facesContext.getViewRoot().getViewId();
  +      if (viewId!=null)
  +      {
  +         Map<String, Object> parameters = getParameters(viewId);
  +         if ( !parameters.isEmpty() )
  +         {
  +            Contexts.getPageContext().set(PAGE_PARAMETERS, parameters);
  +         }
  +      }
  +   }
  +
   }
  
  
  
  1.4       +1 -1      jboss-seam/src/main/org/jboss/seam/core/RenderParameters.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: RenderParameters.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/RenderParameters.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- RenderParameters.java	7 Oct 2006 18:06:58 -0000	1.3
  +++ RenderParameters.java	8 Oct 2006 23:12:24 -0000	1.4
  @@ -47,7 +47,7 @@
               }
               else
               {
  -               Map<String, Object> pageParameters = (Map<String, Object>) Contexts.getPageContext().get("pageParameters");
  +               Map<String, Object> pageParameters = (Map<String, Object>) Contexts.getPageContext().get(Pages.PAGE_PARAMETERS);
                  return pageParameters==null ? null : pageParameters.get(key);
               }
            }