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

[Gavin King]

  User: gavin   
  Date: 06/10/02 14:20:36

  Modified:    src/ui/org/jboss/seam/ui      UIStyleDecoration.java
  Added:       src/ui/org/jboss/seam/ui      HtmlDiv.java
                        HtmlMessageDecoration.java HtmlSpan.java
  Removed:     src/ui/org/jboss/seam/ui      UIMessageDecoration.java
  Log:
  make stuff work in JSP
  add s:div
  
  Revision  Changes    Path
  1.3       +25 -6     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.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- UIStyleDecoration.java	2 Oct 2006 16:35:19 -0000	1.2
  +++ UIStyleDecoration.java	2 Oct 2006 18:20:36 -0000	1.3
  @@ -7,12 +7,12 @@
   import javax.faces.context.ResponseWriter;
   import javax.faces.el.ValueBinding;
   
  -public class UIStyleDecoration extends UIComponentBase
  +public abstract class UIStyleDecoration extends UIComponentBase
   {
      public static final String COMPONENT_FAMILY = "org.jboss.seam.ui.StyleDecoration";
  -   public static final String COMPONENT_TYPE = "org.jboss.seam.ui.UIStyleDecoration";
      
      private String styleClass;
  +   private String style;
   
      @Override
      public String getFamily()
  @@ -35,13 +35,15 @@
         Object[] values = (Object[]) state;
         super.restoreState(context, values[0]);
         styleClass = (String) values[1];
  +      style = (String) values[2];
      }
   
      @Override
      public Object saveState(FacesContext context) {
  -      Object[] values = new Object[2];
  +      Object[] values = new Object[3];
         values[0] = super.saveState(context);
         values[1] = styleClass;
  +      values[2] = style;
         return values;
      }
   
  @@ -50,7 +52,7 @@
      {
         super.encodeBegin(context);
         ResponseWriter response = context.getResponseWriter();
  -      response.startElement("span", this);
  +      response.startElement( getElement(), this );
   
         ValueBinding classBinding = getValueBinding("styleClass");
         String styleClass = classBinding==null ? this.styleClass : (String) classBinding.getValue(context);
  @@ -58,17 +60,34 @@
         {
            response.writeAttribute("class", styleClass, "styleClass");
         }
  +
  +      ValueBinding styleBinding = getValueBinding("style");
  +      String style = styleBinding==null ? this.style : (String) styleBinding.getValue(context);
  +      if (style!=null) 
  +      {
  +         response.writeAttribute("style", style, "style");
  +      }
      }
   
      @Override
      public void encodeEnd(FacesContext context) throws IOException
      {
         ResponseWriter response = context.getResponseWriter();
  -      response.endElement("span");
  +      response.endElement( getElement() );
         response.flush();
         super.encodeEnd(context);
      }
   
  +   public abstract String getElement();
  +
  +   public String getStyle()
  +   {
  +      return style;
  +   }
      
  +   public void setStyle(String style)
  +   {
  +      this.style = style;
  +   }
      
   }
  
  
  
  1.1      date: 2006/10/02 18:20:36;  author: gavin;  state: Exp;jboss-seam/src/ui/org/jboss/seam/ui/HtmlDiv.java
  
  Index: HtmlDiv.java
  ===================================================================
  package org.jboss.seam.ui;
  
  public class HtmlDiv extends UIStyleDecoration
  {
  
     public static final String COMPONENT_TYPE = "org.jboss.seam.ui.HtmlDiv";
  
     @Override
     public String getElement()
     {
        return "div";
     }
  
  }
  
  
  
  1.1      date: 2006/10/02 18:20:36;  author: gavin;  state: Exp;jboss-seam/src/ui/org/jboss/seam/ui/HtmlMessageDecoration.java
  
  Index: HtmlMessageDecoration.java
  ===================================================================
  package org.jboss.seam.ui;
  
  import javax.faces.component.UIComponent;
  import javax.faces.component.html.HtmlMessage;
  
  
  public class HtmlMessageDecoration extends HtmlMessage
  {
     public static final String COMPONENT_TYPE = "org.jboss.seam.ui.HtmlMessageDecoration";
  
     private UIDecorate getParentDecorate(UIComponent component)
     {
        if (component instanceof UIDecorate) 
        {
           return (UIDecorate) component;
        }
        else if ( component.getParent()==null )
        {
           return null;
        }
        else
        {
           return getParentDecorate( component.getParent() );
        }
     }
  
     @Override
     public String getFor()
     {
        UIDecorate decorate = getParentDecorate(this);
        return decorate==null ? null : decorate.getInputId();
     }
  
  }
  
  
  
  1.1      date: 2006/10/02 18:20:36;  author: gavin;  state: Exp;jboss-seam/src/ui/org/jboss/seam/ui/HtmlSpan.java
  
  Index: HtmlSpan.java
  ===================================================================
  package org.jboss.seam.ui;
  
  public class HtmlSpan extends UIStyleDecoration
  {
  
     public static final String COMPONENT_TYPE = "org.jboss.seam.ui.HtmlSpan";
  
     @Override
     public String getElement()
     {
        return "span";
     }
  
  }