svn commit: r462953 - in /myfaces: core/branches/jsf12/impl/src/main/java/org/apache/myfaces/taglib/core/VerbatimTag.java shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/JSFAttr.java

[ba...@apache.org]

Author: baranda
Date: Wed Oct 11 14:24:44 2006
New Revision: 462953

URL: http://svn.apache.org/viewvc?view=rev&rev=462953
Log:
MYFACES-1463 (Implement JSR-252 core tag: VerbatimTag)

Modified:
    myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/taglib/core/VerbatimTag.java
    myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/JSFAttr.java

Modified: myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/taglib/core/VerbatimTag.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/taglib/core/VerbatimTag.java?view=diff&rev=462953&r1=462952&r2=462953
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/taglib/core/VerbatimTag.java (original)
+++ myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/taglib/core/VerbatimTag.java Wed Oct 11 14:24:44 2006
@@ -16,19 +16,20 @@
 package org.apache.myfaces.taglib.core;
 
 import org.apache.myfaces.shared_impl.renderkit.JSFAttr;
-import org.apache.myfaces.shared_impl.taglib.UIComponentBodyTagBase;
+import org.apache.myfaces.shared_impl.taglib.UIComponentELTagBase;
 
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIOutput;
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.BodyContent;
+import javax.el.ValueExpression;
 
 /**
  * @author Manfred Geiler (latest modification by $Author$)
  * @version $Revision$ $Date$
  */
 public class VerbatimTag
-        extends UIComponentBodyTagBase
+        extends UIComponentELTagBase
 {
     //private static final Log log = LogFactory.getLog(VerbatimTag.class);
 
@@ -43,30 +44,29 @@
     }
 
     // HtmlOutputText attributes
-    private String _escape;
+    private ValueExpression _escape;
+    private ValueExpression _rendered;
 
     protected void setProperties(UIComponent component)
     {
         super.setProperties(component);
-        if (_escape != null)
-        {
-            setBooleanProperty(component, JSFAttr.ESCAPE_ATTR, _escape);
-        }
-        else
-        {
-            //Default escape value for component is true, but for this tag it is false,
-            //so we must set it to false explicitly, if no attribute is given
-            component.getAttributes().put(JSFAttr.ESCAPE_ATTR, Boolean.FALSE);
-        }
+
+        setBooleanProperty(component, JSFAttr.ESCAPE_ATTR, _escape, Boolean.FALSE);
+        setBooleanProperty(component, JSFAttr.RENDERED, _rendered, Boolean.TRUE);
 
         //No need to save component state
         component.setTransient(true);
     }
 
-    public void setEscape(String escape)
+    public void setEscape(ValueExpression escape)
     {
         _escape = escape;
     }
+
+    public void setRendered(ValueExpression rendered)
+    {
+        _rendered = rendered;
+    }
     
     public int doAfterBody() throws JspException
     {
@@ -75,6 +75,7 @@
         {
             UIOutput component = (UIOutput)getComponentInstance();
             component.setValue(bodyContent.getString());
+            bodyContent.clearBody();
         }
         return super.doAfterBody();
     }

Modified: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/JSFAttr.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/JSFAttr.java?view=diff&rev=462953&r1=462952&r2=462953
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/JSFAttr.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/JSFAttr.java Wed Oct 11 14:24:44 2006
@@ -33,6 +33,7 @@
     String   ESCAPE_ATTR                    = "escape";
     String   FORCE_ID_ATTR                  = "forceId";
     String   FORCE_ID_INDEX_ATTR            = "forceIdIndex";
+    String   RENDERED                       = "rendered";
 
     // Common Output Attributes
     String   FOR_ATTR                       = "for";