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

[Gavin King]

  User: gavin   
  Date: 07/06/12 12:12:32

  Modified:    src/ui/org/jboss/seam/ui    HtmlButton.java HtmlLink.java
                        JSF.java
  Log:
  JBSEAM-1437
  
  Revision  Changes    Path
  1.15      +12 -5     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.14
  retrieving revision 1.15
  diff -u -b -r1.14 -r1.15
  --- HtmlButton.java	3 Jun 2007 20:54:23 -0000	1.14
  +++ HtmlButton.java	12 Jun 2007 16:12:32 -0000	1.15
  @@ -83,9 +83,12 @@
         writer.startElement("input", this);
   
         String image = getImage();
  -      if (image == null) {
  +      if (image == null) 
  +      {
             writer.writeAttribute("type", "button", null);
  -      } else {
  +      } 
  +      else 
  +      {
             writer.writeAttribute("type", "image", null);
             writer.writeAttribute("src", image, null);
         }
  @@ -180,7 +183,9 @@
         {
            UIConversationPropagation uiPropagation = new UIConversationPropagation();
            uiPropagation.setType(propagation);
  -         uiPropagation.setPageflow(pageflow);
  +         ValueExpression pageflowBinding = getValueExpression("pageflow");
  +         String pf = pageflowBinding==null ? pageflow : (String) pageflowBinding.getValue( context.getELContext() );
  +         uiPropagation.setPageflow(pf);
            encodedUrl  += getParameterString(characterEncoding, uiPropagation, first);
            first = false;
         }
  @@ -201,9 +206,11 @@
            first = false;
         }
               
  -      if (fragment!=null)
  +      ValueExpression fragmentBinding = getValueExpression("fragment");
  +      String frag = fragmentBinding==null ? fragment : (String) fragmentBinding.getValue( context.getELContext() );
  +      if (frag!=null)
         {
  -         encodedUrl += '#' + fragment;
  +         encodedUrl += '#' + frag;
         }
         
         String onclick = getOnclick();
  
  
  
  1.37      +7 -3      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.36
  retrieving revision 1.37
  diff -u -b -r1.36 -r1.37
  --- HtmlLink.java	3 Jun 2007 20:54:23 -0000	1.36
  +++ HtmlLink.java	12 Jun 2007 16:12:32 -0000	1.37
  @@ -172,7 +172,9 @@
         {
            UIConversationPropagation uiPropagation = new UIConversationPropagation();
            uiPropagation.setType(propagation);
  -         uiPropagation.setPageflow(pageflow);
  +         ValueExpression pageflowBinding = getValueExpression("pageflow");
  +         String pf = pageflowBinding==null ? pageflow : (String) pageflowBinding.getValue( context.getELContext() );
  +         uiPropagation.setPageflow(pf);
            encodedUrl  += getParameterString(characterEncoding, uiPropagation, first);
            first = false;
         }
  @@ -193,9 +195,11 @@
            first = false;
         }
               
  -      if (fragment!=null)
  +      ValueExpression fragmentBinding = getValueExpression("fragment");
  +      String frag = fragmentBinding==null ? fragment : (String) fragmentBinding.getValue( context.getELContext() );
  +      if (frag!=null)
         {
  -         encodedUrl += '#' + fragment;
  +         encodedUrl += '#' + frag;
         }
         
         if ( !isDisabled(context) )
  
  
  
  1.9       +3 -2      jboss-seam/src/ui/org/jboss/seam/ui/JSF.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: JSF.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/JSF.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- JSF.java	13 May 2007 08:33:36 -0000	1.8
  +++ JSF.java	12 Jun 2007 16:12:32 -0000	1.9
  @@ -25,8 +25,9 @@
   /**
    * Constant declarations for JSF tags
    * 
  - * @author Anton Koinov (latest modification by $Author: gavin $)
  - * @version $Revision: 1.8 $ $Date: 2007/05/13 08:33:36 $
  + * @author Anton Koinov 
  + * @author Manfred Geiler
  + * 
    */
   public class JSF
   {