svn commit: r1101453 - in /myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets: AttributeHandler.java extension/TobagoLabelExtensionHandler.java

[bo...@apache.org]

Author: bommel
Date: Tue May 10 13:10:57 2011
New Revision: 1101453

URL: http://svn.apache.org/viewvc?rev=1101453&view=rev
Log:
simplify SupportsMarkup

Modified:
    myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/AttributeHandler.java
    myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java

Modified: myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/AttributeHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/AttributeHandler.java?rev=1101453&r1=1101452&r2=1101453&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/AttributeHandler.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/AttributeHandler.java Tue May 10 13:10:57 2011
@@ -30,6 +30,7 @@ import org.apache.commons.lang.StringUti
 import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.component.SupportsMarkup;
 import org.apache.myfaces.tobago.component.SupportsRenderedPartially;
+import org.apache.myfaces.tobago.context.Markup;
 import org.apache.myfaces.tobago.el.ConstantMethodBinding;
 import org.apache.myfaces.tobago.util.ComponentUtils;
 import org.slf4j.Logger;
@@ -230,7 +231,7 @@ public final class AttributeHandler exte
         } else if (Attributes.MARKUP.equals(nameValue)) {
           if (parent instanceof SupportsMarkup) {
             if (value.isLiteral()) {
-              ComponentUtils.setMarkup(parent, value.getValue());
+              ((SupportsMarkup) parent).setMarkup(Markup.valueOf(value.getValue()));
             } else {
               ValueExpression expression = value.getValueExpression(faceletContext, Object.class);
               ELAdaptor.setExpression(parent, nameValue, expression);

Modified: myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java?rev=1101453&r1=1101452&r2=1101453&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-facelets/src/main/java/org/apache/myfaces/tobago/facelets/extension/TobagoLabelExtensionHandler.java Tue May 10 13:10:57 2011
@@ -25,6 +25,7 @@ import com.sun.facelets.tag.TagAttribute
 import com.sun.facelets.tag.jsf.ComponentConfig;
 import com.sun.facelets.tag.jsf.ComponentHandler;
 import com.sun.facelets.tag.jsf.ComponentSupport;
+import org.apache.myfaces.tobago.context.Markup;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.apache.myfaces.tobago.component.Attributes;
@@ -166,7 +167,7 @@ public abstract class TobagoLabelExtensi
     }
     if (markupAttribute != null) {
       if (markupAttribute.isLiteral()) {
-        ComponentUtils.setMarkup(label, markupAttribute.getValue());
+        label.setMarkup(Markup.valueOf(markupAttribute.getValue()));
       } else {
         ValueExpression expression = markupAttribute.getValueExpression(faceletContext, Object.class);
         ELAdaptor.setExpression(label, Attributes.MARKUP, expression);