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

[Gavin King]

  User: gavin   
  Date: 06/10/02 12:35:19

  Modified:    src/ui/org/jboss/seam/ui   HtmlLink.java
                        UIStyleDecoration.java
  Log:
  JBSEAM-316, support a valuebinding in s:link view=
  
  Revision  Changes    Path
  1.14      +2 -0      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.13
  retrieving revision 1.14
  diff -u -b -r1.13 -r1.14
  --- HtmlLink.java	28 Sep 2006 17:03:52 -0000	1.13
  +++ HtmlLink.java	2 Oct 2006 16:35:19 -0000	1.14
  @@ -110,6 +110,8 @@
            }
         }
         
  +      ValueBinding viewBinding = getValueBinding("view");
  +      String view = viewBinding==null ? this.view : (String) viewBinding.getValue(context);
         if (view!=null)
         {
            Map<String, Object> pageParameters = Pages.instance().getParameters(view, usedParameters);
  
  
  
  1.2       +8 -1      jboss-seam/src/ui/org/jboss/seam/ui/UIStyleDecoration.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: UIStyleDecoration.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/UIStyleDecoration.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- UIStyleDecoration.java	2 Oct 2006 01:01:37 -0000	1.1
  +++ UIStyleDecoration.java	2 Oct 2006 16:35:19 -0000	1.2
  @@ -5,6 +5,7 @@
   import javax.faces.component.UIComponentBase;
   import javax.faces.context.FacesContext;
   import javax.faces.context.ResponseWriter;
  +import javax.faces.el.ValueBinding;
   
   public class UIStyleDecoration extends UIComponentBase
   {
  @@ -50,8 +51,14 @@
         super.encodeBegin(context);
         ResponseWriter response = context.getResponseWriter();
         response.startElement("span", this);
  +
  +      ValueBinding classBinding = getValueBinding("styleClass");
  +      String styleClass = classBinding==null ? this.styleClass : (String) classBinding.getValue(context);
  +      if (styleClass!=null) 
  +      {
         response.writeAttribute("class", styleClass, "styleClass");
      }
  +   }
   
      @Override
      public void encodeEnd(FacesContext context) throws IOException