[jboss-cvs] jboss-seam/src/ui/org/jboss/seam/ui/tag ...

[Gavin King]

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

  Modified:    src/ui/org/jboss/seam/ui/tag   LinkTag.java
                        UIComponentTagBase.java
  Log:
  get rid of funny tags when using method bindings with params
  
  Revision  Changes    Path
  1.7       +1 -19     jboss-seam/src/ui/org/jboss/seam/ui/tag/LinkTag.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: LinkTag.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/tag/LinkTag.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -b -r1.6 -r1.7
  --- LinkTag.java	28 Sep 2006 01:21:22 -0000	1.6
  +++ LinkTag.java	30 Sep 2006 01:36:14 -0000	1.7
  @@ -23,10 +23,7 @@
   package org.jboss.seam.ui.tag;
   
   import javax.faces.component.UIComponent;
  -import javax.faces.context.FacesContext;
  -import javax.faces.el.ValueBinding;
   
  -import org.jboss.seam.actionparam.ActionParamValueBinding;
   import org.jboss.seam.ui.HtmlLink;
   
   
  @@ -55,7 +52,7 @@
       {
           super.setProperties(component);
           setStringProperty(component, "view", view);
  -        setActionOnComponent(component);
  +        setStringProperty(component, "action", action);
           setValueBinding(component, "taskInstance", taskInstance);
           setStringProperty(component, "buttonClass", buttonClass);
           setStringProperty(component, "linkStyle", linkStyle);
  @@ -64,21 +61,6 @@
           setStringProperty(component, "fragment", fragment);
       }
   
  -    private void setActionOnComponent(UIComponent component)
  -    {
  -      if (action == null) return;
  -      
  -      if (isValueReference(action))
  -      {
  -         ValueBinding vb = new ActionParamValueBinding(FacesContext.getCurrentInstance(), action);
  -         component.setValueBinding("action", vb);
  -      } 
  -      else
  -      {
  -         component.getAttributes().put("action", action);
  -      }
  -    }
  -
       public void setAction(String action)
       {
           this.action = action;
  
  
  
  1.4       +3 -4      jboss-seam/src/ui/org/jboss/seam/ui/tag/UIComponentTagBase.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UIComponentTagBase.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/tag/UIComponentTagBase.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- UIComponentTagBase.java	28 Sep 2006 01:21:22 -0000	1.3
  +++ UIComponentTagBase.java	30 Sep 2006 01:36:14 -0000	1.4
  @@ -33,12 +33,11 @@
   
   import org.apache.commons.logging.Log;
   import org.apache.commons.logging.LogFactory;
  -import org.jboss.seam.actionparam.ActionParamMethodBinding;
   import org.jboss.seam.ui.JSF;
   
   /**
    * @author Manfred Geiler (latest modification by $Author: gavin $)
  - * @version $Revision: 1.3 $ $Date: 2005-05-11 12:45:06 -0400 (Wed, 11 May
  + * @version $Revision: 1.4 $ $Date: 2005-05-11 12:45:06 -0400 (Wed, 11 May
    *          2005) $
    */
   public abstract class UIComponentTagBase extends UIComponentTag
  @@ -322,7 +321,7 @@
            MethodBinding mb;
            if (isValueReference(action))
            {
  -            mb = new ActionParamMethodBinding(context, action);
  +            mb = context.getApplication().createMethodBinding(action, null);
            } else
            {
               mb = new SimpleActionMethodBinding(action);