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

[Gavin King]

  User: gavin   
  Date: 06/12/14 03:52:18

  Modified:    src/ui/org/jboss/seam/ui   HtmlButton.java HtmlLink.java
  Log:
  fix JBSEAM-592
  
  Revision  Changes    Path
  1.4       +13 -2     jboss-seam/src/ui/org/jboss/seam/ui/HtmlButton.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: HtmlButton.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/HtmlButton.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- HtmlButton.java	1 Dec 2006 23:28:25 -0000	1.3
  +++ HtmlButton.java	14 Dec 2006 08:52:18 -0000	1.4
  @@ -30,6 +30,7 @@
      private String pageflow;
      private String propagation = "default";
      private String fragment;
  +   private String outcome;
   
      private UISelection getSelection()
      {
  @@ -128,10 +129,10 @@
            }
         }
         
  -      if (action!=null)
  +      if ( action!=null || outcome!=null )
         {
            UIAction uiAction = new UIAction();
  -         uiAction.setAction( action.getExpressionString() );
  +         uiAction.setAction( action==null ? outcome : action.getExpressionString() );
            encodedUrl += getParameterString(characterEncoding, uiAction, first);
            first = false;
         }
  @@ -330,4 +331,14 @@
         // TODO Auto-generated method stub
      }
   
  +   public String getOutcome()
  +   {
  +      return outcome;
  +   }
  +
  +   public void setOutcome(String outcome)
  +   {
  +      this.outcome = outcome;
  +   }
  +
   }
  
  
  
  1.24      +14 -2     jboss-seam/src/ui/org/jboss/seam/ui/HtmlLink.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: HtmlLink.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/HtmlLink.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -b -r1.23 -r1.24
  --- HtmlLink.java	19 Nov 2006 17:36:11 -0000	1.23
  +++ HtmlLink.java	14 Dec 2006 08:52:18 -0000	1.24
  @@ -32,6 +32,7 @@
      private String propagation = "default";
      private String fragment;
      private boolean disabled;
  +   private String outcome;
   
      private UISelection getSelection()
      {
  @@ -128,10 +129,10 @@
            }
         }
         
  -      if (action!=null)
  +      if ( action!=null || outcome!=null )
         {
            UIAction uiAction = new UIAction();
  -         uiAction.setAction( action.getExpressionString() );
  +         uiAction.setAction( action==null ? outcome : action.getExpressionString() );
            encodedUrl += getParameterString(characterEncoding, uiAction, first);
            first = false;
         }
  @@ -340,4 +341,15 @@
         // TODO Auto-generated method stub
      }
   
  +   public String getOutcome()
  +   {
  +      return outcome;
  +   }
  +
  +   public void setOutcome(String outcome)
  +   {
  +      this.outcome = outcome;
  +   }
  +
  +
   }