[jboss-cvs] jboss-seam/ui/src/main/java/org/jboss/seam/ui/component ...

[Gavin King]

  User: gavin   
  Date: 07/06/19 23:12:53

  Modified:    ui/src/main/java/org/jboss/seam/ui/component 
                        UISeamCommandBase.java
  Log:
  fix bug with non-el action string
  
  Revision  Changes    Path
  1.3       +4 -6      jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UISeamCommandBase.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UISeamCommandBase.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/ui/src/main/java/org/jboss/seam/ui/component/UISeamCommandBase.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- UISeamCommandBase.java	19 Jun 2007 21:57:45 -0000	1.2
  +++ UISeamCommandBase.java	20 Jun 2007 03:12:53 -0000	1.3
  @@ -12,6 +12,7 @@
   import javax.faces.component.UIOutput;
   import javax.faces.component.UIParameter;
   import javax.faces.context.FacesContext;
  +import javax.faces.el.MethodBinding;
   import javax.faces.event.ActionListener;
   import javax.faces.model.DataModel;
   
  @@ -61,11 +62,12 @@
               }
            }
   
  -         if (getAction() != null || getOutcome() != null)
  +         MethodBinding action = getAction();
  +         if (action != null)
            {
   
               UIAction uiAction = new UIAction();
  -            uiAction.setAction(getAction().getExpressionString() == null ? getOutcome() : getAction().getExpressionString());
  +            uiAction.setAction( action.getExpressionString() );
               url.addParameter(uiAction);
            }
   
  @@ -106,10 +108,6 @@
   
      public abstract void setView(String view);
   
  -   public abstract String getOutcome();
  -
  -   public abstract void setOutcome(String outcome);
  -
      public abstract String getPropagation();
   
      public abstract void setPropagation(String propagtion);