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

[Gavin King]

  User: gavin   
  Date: 06/10/07 14:06:58

  Modified:    src/main/org/jboss/seam/core   Pages.java
                        RenderParameters.java
  Log:
  propagate page parameters via form submission
  
  Revision  Changes    Path
  1.25      +22 -4     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.24
  retrieving revision 1.25
  diff -u -b -r1.24 -r1.25
  --- Pages.java	6 Oct 2006 00:34:20 -0000	1.24
  +++ Pages.java	7 Oct 2006 18:06:58 -0000	1.25
  @@ -307,9 +307,9 @@
         return parameters;
      }
      
  -   public void applyParameterValues(String viewId)
  +   public void applyRequestParameterValues(String viewId)
      {
  -      Map<String, String[]> parameters = Parameters.getRequestParameters();
  +      Map<String, String[]> requestParameters = Parameters.getRequestParameters();
         for (Map.Entry<String, ValueBinding> me: getParameterValueBindings(viewId))
         {
            Class type;
  @@ -324,7 +324,7 @@
            
            if (type!=null)
            {
  -            Object value = Parameters.convertMultiValueRequestParameter( parameters, me.getKey(), type );
  +            Object value = Parameters.convertMultiValueRequestParameter( requestParameters, me.getKey(), type );
               if (value!=null) 
               {
                  me.getValue().setValue(value);
  @@ -333,6 +333,24 @@
         }
      }
   
  +   public void applyViewRootValues(String viewId)
  +   {
  +      Map<String, Object> pageParameters = (Map<String, Object>) Contexts.getPageContext().get("pageParameters");
  +      if (pageParameters!=null)
  +      {
  +      
  +         for (Map.Entry<String, ValueBinding> me: getParameterValueBindings(viewId))
  +         {         
  +            Object object = pageParameters.get( me.getKey() );
  +            if (object!=null)
  +            {
  +               me.getValue().setValue(object);
  +            }
  +         }
  +      
  +      }
  +   }
  +
      public String getNoConversationViewId()
      {
         return noConversationViewId;
  
  
  
  1.3       +8 -2      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.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- RenderParameters.java	25 Jul 2006 04:40:43 -0000	1.2
  +++ RenderParameters.java	7 Oct 2006 18:06:58 -0000	1.3
  @@ -12,8 +12,9 @@
   import org.jboss.seam.annotations.Intercept;
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Unwrap;
  +import org.jboss.seam.contexts.Contexts;
   
  - at Name("renderParameters")
  + at Name("param")
   @Intercept(InterceptionType.NEVER)
   public class RenderParameters
   {
  @@ -40,10 +41,15 @@
               {
                  return parameters.get(key);
               }
  -            else
  +            else if ( requestParameters.containsKey(key) )
               {
                  return requestParameters.get(key);
               }
  +            else
  +            {
  +               Map<String, Object> pageParameters = (Map<String, Object>) Contexts.getPageContext().get("pageParameters");
  +               return pageParameters==null ? null : pageParameters.get(key);
  +            }
            }
   
            @Override