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

[Gavin King]

  User: gavin   
  Date: 06/09/29 21:36:14

  Modified:    src/main/org/jboss/seam/core  Pages.java
  Log:
  get rid of funny tags when using method bindings with params
  
  Revision  Changes    Path
  1.22      +11 -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.21
  retrieving revision 1.22
  diff -u -b -r1.21 -r1.22
  --- Pages.java	27 Sep 2006 03:53:49 -0000	1.21
  +++ Pages.java	30 Sep 2006 01:36:14 -0000	1.22
  @@ -125,7 +125,9 @@
               {
                  if ( action.startsWith("#{") )
                  {
  -                  MethodBinding methodBinding = new ActionParamMethodBinding(FacesContext.getCurrentInstance(), action);
  +                  MethodBinding methodBinding = FacesContext.getCurrentInstance()
  +                        .getApplication()
  +                        .createMethodBinding(action, null);
                     entry.action = methodBinding;
                  }
                  else
  @@ -238,18 +240,23 @@
         
         boolean result = false;
         
  -      String outcome = (String) facesContext.getExternalContext().getRequestParameterMap().get("actionOutcome");
  +      String outcome = (String) facesContext.getExternalContext()
  +            .getRequestParameterMap()
  +            .get("actionOutcome");
         String fromAction = outcome;
         
         if (outcome==null)
         {
  -         String action = (String) facesContext.getExternalContext().getRequestParameterMap().get("actionMethod");
  +         String action = (String) facesContext.getExternalContext()
  +               .getRequestParameterMap()
  +               .get("actionMethod");
            if (action!=null)
            {
               String expression = "#{" + action + "}";
               if ( !isActionAllowed(facesContext, expression) ) return result;
               result = true;
  -            MethodBinding actionBinding = new ActionParamMethodBinding(facesContext, expression);
  +            MethodBinding actionBinding = facesContext.getApplication()
  +                  .createMethodBinding(expression, null);
               outcome = toString( actionBinding.invoke(facesContext, null) );
               fromAction = expression;
            }