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

[Gavin King]

  User: gavin   
  Date: 06/09/27 19:14:41

  Modified:    src/main/org/jboss/seam/core  Manager.java
  Log:
  propagate page parameters across navigation rule redirects
  improvements to framework
  
  Revision  Changes    Path
  1.85      +4 -4      jboss-seam/src/main/org/jboss/seam/core/Manager.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: Manager.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/core/Manager.java,v
  retrieving revision 1.84
  retrieving revision 1.85
  diff -u -b -r1.84 -r1.85
  --- Manager.java	27 Sep 2006 03:53:49 -0000	1.84
  +++ Manager.java	27 Sep 2006 23:14:41 -0000	1.85
  @@ -44,7 +44,7 @@
    *
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.84 $
  + * @version $Revision: 1.85 $
    */
   @Scope(ScopeType.EVENT)
   @Name("org.jboss.seam.core.manager")
  @@ -859,7 +859,7 @@
         redirect(url, parameters, true);
      }
      
  -   private String encodeParameters(String url, Map<String, Object> parameters)
  +   public String encodeParameters(String url, Map<String, Object> parameters)
      {
         if ( parameters.isEmpty() ) return url;
         
  @@ -914,11 +914,11 @@
         {
            url = encodeParameters(url, renderParameters);
         }
  -      Map<String, Object> pageParameters = Pages.instance().getParameters(viewId);
  +      /*Map<String, Object> pageParameters = Pages.instance().getParameters(viewId);
         if (pageParameters!=null)
         {
            url = encodeParameters(url, pageParameters);
  -      }
  +      }*/
         if (includeConversationId)
         {
            url = encodeConversationId(url);