myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hno...@apache.org
Subject svn commit: r1795602 - /myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/
Date Fri, 19 May 2017 10:00:30 GMT
Author: hnoeth
Date: Fri May 19 10:00:29 2017
New Revision: 1795602

URL: http://svn.apache.org/viewvc?rev=1795602&view=rev
Log:
TOBAGO-1721 Optimize HTML output when two renderer are involved
* add automatic markup for disabled, readonly, required, maximum severity

Modified:
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BoxRenderer.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ButtonsRenderer.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/CommandRendererBase.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FigureRenderer.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRenderer.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FlowLayoutRenderer.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FooterRenderer.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/GridLayoutRenderer.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/HeaderRenderer.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ImageRenderer.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/MessagesRenderer.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ObjectRenderer.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/OutRenderer.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PageRenderer.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PanelRenderer.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PopupRenderer.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ProgressRenderer.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SectionRenderer.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SegmentLayoutRenderer.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanCheckboxRenderer.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyCheckboxRenderer.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyListboxRenderer.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyShuttleRenderer.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneChoiceRenderer.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneListboxRenderer.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRadioRenderer.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SeparatorRenderer.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TabGroupRenderer.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TextareaRenderer.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeLabelRenderer.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeListboxRenderer.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeRenderer.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeSelectRenderer.java

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BoxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BoxRenderer.java?rev=1795602&r1=1795601&r2=1795602&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BoxRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/BoxRenderer.java Fri May 19 10:00:29 2017
@@ -56,9 +56,8 @@ public class BoxRenderer extends PanelRe
     // TODO: optimize class attribute writing
     final List<CssItem> classAttributes = new ArrayList<CssItem>();
     classAttributes.add(TobagoClass.BOX);
-    if (box.getMarkup() != null) {
-      classAttributes.addAll(Arrays.asList(TobagoClass.BOX.createMarkup(box.getMarkup())));
-    }
+    classAttributes.addAll(Arrays.asList(
+        TobagoClass.BOX.createMarkup(ComponentUtils.updateMarkup(box, box.getMarkup()))));
     classAttributes.add(collapsed ? TobagoClass.COLLAPSED : null);
     classAttributes.add(BootstrapClass.CARD);
     classAttributes.add(box.getCustomClass());

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ButtonsRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ButtonsRenderer.java?rev=1795602&r1=1795601&r2=1795602&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ButtonsRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ButtonsRenderer.java Fri May 19 10:00:29 2017
@@ -28,6 +28,7 @@ import org.apache.myfaces.tobago.renderk
 import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
 import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
 import org.apache.myfaces.tobago.renderkit.html.HtmlRoleValues;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
 
 import javax.faces.component.UIComponent;
@@ -51,9 +52,8 @@ public class ButtonsRenderer extends Ren
     // TODO: optimize class attribute writing
     final List<CssItem> classAttributes = new ArrayList<CssItem>();
     classAttributes.add(TobagoClass.BUTTONS);
-    if (buttons.getMarkup() != null) {
-      classAttributes.addAll(Arrays.asList(TobagoClass.BUTTONS.createMarkup(buttons.getMarkup())));
-    }
+    classAttributes.addAll(Arrays.asList(
+        TobagoClass.BUTTONS.createMarkup(ComponentUtils.updateMarkup(buttons, buttons.getMarkup()))));
     classAttributes.add(buttons.getCustomClass());
     classAttributes.add(BootstrapClass.BTN_GROUP);
     writer.writeClassAttribute(null, null, classAttributes.toArray(new CssItem[classAttributes.size()]));

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/CommandRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/CommandRendererBase.java?rev=1795602&r1=1795601&r2=1795602&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/CommandRendererBase.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/CommandRendererBase.java Fri May 19 10:00:29 2017
@@ -127,9 +127,8 @@ public abstract class CommandRendererBas
     // TODO: optimize class attribute writing
     final List<CssItem> classAttributes = new ArrayList<CssItem>();
     classAttributes.add(getRendererCssClass());
-    if (command.getMarkup() != null) {
-      classAttributes.addAll(Arrays.asList(getRendererCssClass().createMarkup(command.getMarkup())));
-    }
+    classAttributes.addAll(Arrays.asList(
+        getRendererCssClass().createMarkup(ComponentUtils.updateMarkup(command, command.getMarkup()))));
     classAttributes.addAll(cssItems);
     writer.writeClassAttribute(null, null, classAttributes.toArray(new CssItem[classAttributes.size()]));
 

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FigureRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FigureRenderer.java?rev=1795602&r1=1795601&r2=1795602&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FigureRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FigureRenderer.java Fri May 19 10:00:29 2017
@@ -49,9 +49,8 @@ public class FigureRenderer extends Rend
     // TODO: optimize class attribute writing
     final List<CssItem> classAttributes = new ArrayList<CssItem>();
     classAttributes.add(TobagoClass.FIGURE);
-    if (figure.getMarkup() != null) {
-      classAttributes.addAll(Arrays.asList(TobagoClass.FIGURE.createMarkup(figure.getMarkup())));
-    }
+    classAttributes.addAll(Arrays.asList(
+        TobagoClass.FIGURE.createMarkup(ComponentUtils.updateMarkup(figure, figure.getMarkup()))));
     classAttributes.add(BootstrapClass.FIGURE);
     classAttributes.add(figure.getCustomClass());
     writer.writeClassAttribute(null, null, classAttributes.toArray(new CssItem[classAttributes.size()]));

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRenderer.java?rev=1795602&r1=1795601&r2=1795602&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRenderer.java Fri May 19 10:00:29 2017
@@ -124,7 +124,7 @@ public class FileRenderer extends Messag
     writer.writeClassAttribute(
         TobagoClass.FILE,
         file.getCustomClass(),
-        TobagoClass.FILE.createMarkup(file.getMarkup()));
+        TobagoClass.FILE.createMarkup(ComponentUtils.updateMarkup(file, file.getMarkup())));
     HtmlRendererUtils.writeDataAttributes(facesContext, writer, file);
     writer.writeStyleAttribute(file.getStyle());
 

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FlowLayoutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FlowLayoutRenderer.java?rev=1795602&r1=1795601&r2=1795602&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FlowLayoutRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FlowLayoutRenderer.java Fri May 19 10:00:29 2017
@@ -26,6 +26,7 @@ import org.apache.myfaces.tobago.renderk
 import org.apache.myfaces.tobago.renderkit.css.Style;
 import org.apache.myfaces.tobago.renderkit.css.TobagoClass;
 import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
 
 import javax.faces.component.UIComponent;
@@ -45,7 +46,7 @@ public class FlowLayoutRenderer extends
     writer.writeClassAttribute(
         TobagoClass.FLOW_LAYOUT,
         layout.getCustomClass(),
-        TobagoClass.FLOW_LAYOUT.createMarkup(layout.getMarkup()));
+        TobagoClass.FLOW_LAYOUT.createMarkup(ComponentUtils.updateMarkup(layout, layout.getMarkup())));
     Style style = layout.getStyle();
     final TextAlign textAlign = layout.getTextAlign();
     if (style == null && textAlign != null) {

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FooterRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FooterRenderer.java?rev=1795602&r1=1795601&r2=1795602&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FooterRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FooterRenderer.java Fri May 19 10:00:29 2017
@@ -27,6 +27,7 @@ import org.apache.myfaces.tobago.renderk
 import org.apache.myfaces.tobago.renderkit.css.TobagoClass;
 import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
 import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
 
 import javax.faces.component.UIComponent;
@@ -48,9 +49,8 @@ public class FooterRenderer extends Rend
     // TODO: optimize class attribute writing
     final List<CssItem> classAttributes = new ArrayList<CssItem>();
     classAttributes.add(TobagoClass.FOOTER);
-    if (footer.getMarkup() != null) {
-      classAttributes.addAll(Arrays.asList(TobagoClass.FOOTER.createMarkup(footer.getMarkup())));
-    }
+    classAttributes.addAll(Arrays.asList(
+        TobagoClass.FOOTER.createMarkup(ComponentUtils.updateMarkup(footer, footer.getMarkup()))));
     classAttributes.add(footer.isFixed() ? BootstrapClass.FIXED_BOTTOM : null);
     classAttributes.add(footer.getCustomClass());
     writer.writeClassAttribute(null, null, classAttributes.toArray(new CssItem[classAttributes.size()]));

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/GridLayoutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/GridLayoutRenderer.java?rev=1795602&r1=1795601&r2=1795602&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/GridLayoutRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/GridLayoutRenderer.java Fri May 19 10:00:29 2017
@@ -60,7 +60,7 @@ public class GridLayoutRenderer extends
     writer.writeClassAttribute(
         TobagoClass.GRID_LAYOUT,
         null,
-        TobagoClass.GRID_LAYOUT.createMarkup(gridLayout.getMarkup()));
+        TobagoClass.GRID_LAYOUT.createMarkup(ComponentUtils.updateMarkup(gridLayout, gridLayout.getMarkup())));
 
     final StringBuilder builder = new StringBuilder();
 

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/HeaderRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/HeaderRenderer.java?rev=1795602&r1=1795601&r2=1795602&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/HeaderRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/HeaderRenderer.java Fri May 19 10:00:29 2017
@@ -27,6 +27,7 @@ import org.apache.myfaces.tobago.renderk
 import org.apache.myfaces.tobago.renderkit.css.TobagoClass;
 import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
 import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
 
 import javax.faces.component.UIComponent;
@@ -50,9 +51,8 @@ public class HeaderRenderer extends Rend
     // TODO: optimize class attribute writing
     final List<CssItem> classAttributes = new ArrayList<CssItem>();
     classAttributes.add(TobagoClass.HEADER);
-    if (header.getMarkup() != null) {
-      classAttributes.addAll(Arrays.asList(TobagoClass.HEADER.createMarkup(header.getMarkup())));
-    }
+    classAttributes.addAll(Arrays.asList(
+        TobagoClass.HEADER.createMarkup(ComponentUtils.updateMarkup(header, header.getMarkup()))));
     classAttributes.add(header.isFixed() ? BootstrapClass.FIXED_TOP : null);
     classAttributes.add(header.getCustomClass());
     writer.writeClassAttribute(null, null, classAttributes.toArray(new CssItem[classAttributes.size()]));

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ImageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ImageRenderer.java?rev=1795602&r1=1795601&r2=1795602&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ImageRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ImageRenderer.java Fri May 19 10:00:29 2017
@@ -30,6 +30,7 @@ import org.apache.myfaces.tobago.renderk
 import org.apache.myfaces.tobago.renderkit.css.TobagoClass;
 import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
 import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
 
 import javax.faces.component.UIComponent;
@@ -67,9 +68,8 @@ public class ImageRenderer extends Rende
       // TODO: optimize class attribute writing
       final List<CssItem> classAttributes = new ArrayList<CssItem>();
       classAttributes.add(TobagoClass.IMAGE);
-      if (image.getMarkup() != null) {
-        classAttributes.addAll(Arrays.asList(TobagoClass.IMAGE.createMarkup(image.getMarkup())));
-      }
+      classAttributes.addAll(Arrays.asList(
+          TobagoClass.IMAGE.createMarkup(ComponentUtils.updateMarkup(image, image.getMarkup()))));
       classAttributes.add(isDisabled(image) ? BootstrapClass.DISABLED : null);
       classAttributes.add(image.getCustomClass());
       writer.writeClassAttribute(null, null, classAttributes.toArray(new CssItem[classAttributes.size()]));

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java?rev=1795602&r1=1795601&r2=1795602&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java Fri May 19 10:00:29 2017
@@ -134,9 +134,8 @@ public class InRenderer extends MessageL
     // TODO: optimize class attribute writing
     final List<CssItem> classAttributes = new ArrayList<CssItem>();
     classAttributes.add(getRendererCssClass());
-    if (input.getMarkup() != null) {
-      classAttributes.addAll(Arrays.asList(getRendererCssClass().createMarkup(input.getMarkup())));
-    }
+    classAttributes.addAll(Arrays.asList(
+        getRendererCssClass().createMarkup(ComponentUtils.updateMarkup(input, input.getMarkup()))));
     classAttributes.add(BootstrapClass.FORM_CONTROL);
     classAttributes.add(input.getCustomClass());
     writer.writeClassAttribute(null, null, classAttributes.toArray(new CssItem[classAttributes.size()]));

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/MessagesRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/MessagesRenderer.java?rev=1795602&r1=1795601&r2=1795602&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/MessagesRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/MessagesRenderer.java Fri May 19 10:00:29 2017
@@ -80,7 +80,7 @@ public class MessagesRenderer extends Re
     writer.writeClassAttribute(
         TobagoClass.MESSAGES,
         messages.getCustomClass(),
-        TobagoClass.MESSAGES.createMarkup(messages.getMarkup()));
+        TobagoClass.MESSAGES.createMarkup(ComponentUtils.updateMarkup(messages, messages.getMarkup())));
 
     FacesMessage.Severity lastSeverity = null;
     boolean first = true;

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ObjectRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ObjectRenderer.java?rev=1795602&r1=1795601&r2=1795602&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ObjectRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ObjectRenderer.java Fri May 19 10:00:29 2017
@@ -26,6 +26,7 @@ import org.apache.myfaces.tobago.renderk
 import org.apache.myfaces.tobago.renderkit.css.TobagoClass;
 import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
 import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
 
 import javax.faces.component.UIComponent;
@@ -52,7 +53,7 @@ public class ObjectRenderer extends Rend
     writer.writeClassAttribute(
         TobagoClass.OBJECT,
         object.getCustomClass(),
-        TobagoClass.OBJECT.createMarkup(object.getMarkup()));
+        TobagoClass.OBJECT.createMarkup(ComponentUtils.updateMarkup(object, object.getMarkup())));
     writer.writeStyleAttribute(object.getStyle());
 
     String noframes = TobagoResourceBundle.getString(facesContext, "browser.noframe.message.prefix");

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/OutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/OutRenderer.java?rev=1795602&r1=1795601&r2=1795602&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/OutRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/OutRenderer.java Fri May 19 10:00:29 2017
@@ -30,6 +30,7 @@ import org.apache.myfaces.tobago.renderk
 import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
 import org.apache.myfaces.tobago.sanitizer.SanitizeMode;
 import org.apache.myfaces.tobago.sanitizer.Sanitizer;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
 
 import javax.faces.component.UIComponent;
@@ -65,9 +66,8 @@ public class OutRenderer extends Message
       // TODO: optimize class attribute writing
       final List<CssItem> classAttributes = new ArrayList<CssItem>();
       classAttributes.add(TobagoClass.OUT);
-      if (out.getMarkup() != null) {
-        classAttributes.addAll(Arrays.asList(TobagoClass.OUT.createMarkup(out.getMarkup())));
-      }
+      classAttributes.addAll(Arrays.asList(
+          TobagoClass.OUT.createMarkup(ComponentUtils.updateMarkup(out, out.getMarkup()))));
       classAttributes.add(BootstrapClass.FORM_CONTROL_STATIC);
       classAttributes.add(out.getCustomClass());
       writer.writeClassAttribute(null, null, classAttributes.toArray(new CssItem[classAttributes.size()]));

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PageRenderer.java?rev=1795602&r1=1795601&r2=1795602&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PageRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PageRenderer.java Fri May 19 10:00:29 2017
@@ -255,9 +255,8 @@ public class PageRenderer extends Render
     // TODO: optimize class attribute writing
     final List<CssItem> classAttributes = new ArrayList<CssItem>();
     classAttributes.add(TobagoClass.PAGE);
-    if (page.getMarkup() != null) {
-      classAttributes.addAll(Arrays.asList(TobagoClass.PAGE.createMarkup(page.getMarkup())));
-    }
+    classAttributes.addAll(Arrays.asList(
+        TobagoClass.PAGE.createMarkup(ComponentUtils.updateMarkup(page, page.getMarkup()))));
     if (portlet) {
       classAttributes.addAll(Arrays.asList(TobagoClass.PAGE.createMarkup(Markup.PORTLET)));
     }

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PanelRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PanelRenderer.java?rev=1795602&r1=1795601&r2=1795602&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PanelRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PanelRenderer.java Fri May 19 10:00:29 2017
@@ -57,9 +57,8 @@ public class PanelRenderer extends Panel
     // TODO: optimize class attribute writing
     final List<CssItem> classAttributes = new ArrayList<CssItem>();
     classAttributes.add(TobagoClass.PANEL);
-    if (panel.getMarkup() != null) {
-      classAttributes.addAll(Arrays.asList(TobagoClass.PANEL.createMarkup(panel.getMarkup())));
-    }
+    classAttributes.addAll(Arrays.asList(
+        TobagoClass.PANEL.createMarkup(ComponentUtils.updateMarkup(panel, panel.getMarkup()))));
     classAttributes.add(panel.getCustomClass());
     classAttributes.add(collapsed ? TobagoClass.COLLAPSED : null);
     writer.writeClassAttribute(null, null, classAttributes.toArray(new CssItem[classAttributes.size()]));

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PopupRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PopupRenderer.java?rev=1795602&r1=1795601&r2=1795602&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PopupRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/PopupRenderer.java Fri May 19 10:00:29 2017
@@ -57,9 +57,8 @@ public class PopupRenderer extends Panel
     // TODO: optimize class attribute writing
     final List<CssItem> classAttributes = new ArrayList<CssItem>();
     classAttributes.add(TobagoClass.POPUP);
-    if (popup.getMarkup() != null) {
-      classAttributes.addAll(Arrays.asList(TobagoClass.POPUP.createMarkup(popup.getMarkup())));
-    }
+    classAttributes.addAll(Arrays.asList(
+        TobagoClass.POPUP.createMarkup(ComponentUtils.updateMarkup(popup, popup.getMarkup()))));
     classAttributes.add(BootstrapClass.MODAL);
     //XXX fade class removed due to a bug in bootstrap-alpha6
     //https://github.com/twbs/bootstrap/issues/21607

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ProgressRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ProgressRenderer.java?rev=1795602&r1=1795601&r2=1795602&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ProgressRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/ProgressRenderer.java Fri May 19 10:00:29 2017
@@ -33,6 +33,7 @@ import org.apache.myfaces.tobago.renderk
 import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
 import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
 import org.apache.myfaces.tobago.renderkit.html.HtmlRoleValues;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -64,9 +65,8 @@ public class ProgressRenderer extends Re
     // TODO: optimize class attribute writing
     final List<CssItem> classAttributes = new ArrayList<CssItem>();
     classAttributes.add(TobagoClass.PROGRESS);
-    if (progress.getMarkup() != null) {
-      classAttributes.addAll(Arrays.asList(TobagoClass.PROGRESS.createMarkup(progress.getMarkup())));
-    }
+    classAttributes.addAll(Arrays.asList(
+        TobagoClass.PROGRESS.createMarkup(ComponentUtils.updateMarkup(progress, progress.getMarkup()))));
     classAttributes.add(progress.getCustomClass());
     classAttributes.add(BootstrapClass.PROGRESS);
     writer.writeClassAttribute(null, null, classAttributes.toArray(new CssItem[classAttributes.size()]));

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SectionRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SectionRenderer.java?rev=1795602&r1=1795601&r2=1795602&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SectionRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SectionRenderer.java Fri May 19 10:00:29 2017
@@ -53,9 +53,8 @@ public class SectionRenderer extends Pan
     // TODO: optimize class attribute writing
     final List<CssItem> classAttributes = new ArrayList<CssItem>();
     classAttributes.add(TobagoClass.SECTION);
-    if (section.getMarkup() != null) {
-      classAttributes.addAll(Arrays.asList(TobagoClass.SECTION.createMarkup(section.getMarkup())));
-    }
+    classAttributes.addAll(Arrays.asList(
+        TobagoClass.SECTION.createMarkup(ComponentUtils.updateMarkup(section, section.getMarkup()))));
     classAttributes.add(collapsed ? TobagoClass.COLLAPSED : null);
     classAttributes.add(section.getCustomClass());
     writer.writeClassAttribute(null, null, classAttributes.toArray(new CssItem[classAttributes.size()]));

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SegmentLayoutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SegmentLayoutRenderer.java?rev=1795602&r1=1795601&r2=1795602&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SegmentLayoutRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SegmentLayoutRenderer.java Fri May 19 10:00:29 2017
@@ -28,6 +28,7 @@ import org.apache.myfaces.tobago.renderk
 import org.apache.myfaces.tobago.renderkit.css.BootstrapClass;
 import org.apache.myfaces.tobago.renderkit.css.TobagoClass;
 import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
+import org.apache.myfaces.tobago.util.ComponentUtils;
 import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -59,7 +60,7 @@ public class SegmentLayoutRenderer exten
     writer.writeClassAttribute(
         TobagoClass.SEGMENT_LAYOUT,
         BootstrapClass.ROW,
-        TobagoClass.SEGMENT_LAYOUT.createMarkup(layout.getMarkup()));
+        TobagoClass.SEGMENT_LAYOUT.createMarkup(ComponentUtils.updateMarkup(layout, layout.getMarkup())));
 //    writer.writeClassAttribute(Classes.create(layout), BootstrapClass.FORM_GROUP);
     writer.writeIdAttribute(layout.getClientId(facesContext));
   }

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanCheckboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanCheckboxRenderer.java?rev=1795602&r1=1795601&r2=1795602&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanCheckboxRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectBooleanCheckboxRenderer.java Fri May 19 10:00:29 2017
@@ -95,9 +95,8 @@ public class SelectBooleanCheckboxRender
     // TODO: optimize class attribute writing
     final List<CssItem> classAttributes = new ArrayList<CssItem>();
     classAttributes.add(TobagoClass.SELECT_BOOLEAN_CHECKBOX);
-    if (select.getMarkup() != null) {
-      classAttributes.addAll(Arrays.asList(TobagoClass.SELECT_BOOLEAN_CHECKBOX.createMarkup(select.getMarkup())));
-    }
+    classAttributes.addAll(Arrays.asList(
+        TobagoClass.SELECT_BOOLEAN_CHECKBOX.createMarkup(ComponentUtils.updateMarkup(select, select.getMarkup()))));
     classAttributes.add(disabled ? BootstrapClass.DISABLED : null);
     classAttributes.add(select.getCustomClass());
     classAttributes.addAll(outerCssItems);

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyCheckboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyCheckboxRenderer.java?rev=1795602&r1=1795601&r2=1795602&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyCheckboxRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyCheckboxRenderer.java Fri May 19 10:00:29 2017
@@ -64,9 +64,8 @@ public class SelectManyCheckboxRenderer
     // TODO: optimize class attribute writing
     final List<CssItem> classAttributes = new ArrayList<CssItem>();
     classAttributes.add(TobagoClass.SELECT_MANY_CHECKBOX);
-    if (select.getMarkup() != null) {
-      classAttributes.addAll(Arrays.asList(TobagoClass.SELECT_MANY_CHECKBOX.createMarkup(select.getMarkup())));
-    }
+    classAttributes.addAll(Arrays.asList(
+        TobagoClass.SELECT_MANY_CHECKBOX.createMarkup(ComponentUtils.updateMarkup(select, select.getMarkup()))));
     classAttributes.add(inline ? TobagoClass.SELECT_MANY_CHECKBOX__INLINE : null);
     classAttributes.add(select.getCustomClass());
     writer.writeClassAttribute(null, null, classAttributes.toArray(new CssItem[classAttributes.size()]));

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyListboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyListboxRenderer.java?rev=1795602&r1=1795601&r2=1795602&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyListboxRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyListboxRenderer.java Fri May 19 10:00:29 2017
@@ -75,9 +75,8 @@ public class SelectManyListboxRenderer e
     // TODO: optimize class attribute writing
     final List<CssItem> classAttributes = new ArrayList<CssItem>();
     classAttributes.add(TobagoClass.SELECT_MANY_LISTBOX);
-    if (select.getMarkup() != null) {
-      classAttributes.addAll(Arrays.asList(TobagoClass.SELECT_MANY_LISTBOX.createMarkup(select.getMarkup())));
-    }
+    classAttributes.addAll(Arrays.asList(
+        TobagoClass.SELECT_MANY_LISTBOX.createMarkup(ComponentUtils.updateMarkup(select, select.getMarkup()))));
     classAttributes.add(BootstrapClass.FORM_CONTROL);
     classAttributes.add(select.getCustomClass());
     writer.writeClassAttribute(null, null, classAttributes.toArray(new CssItem[classAttributes.size()]));

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyShuttleRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyShuttleRenderer.java?rev=1795602&r1=1795601&r2=1795602&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyShuttleRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyShuttleRenderer.java Fri May 19 10:00:29 2017
@@ -50,7 +50,7 @@ public class SelectManyShuttleRenderer e
     writer.writeClassAttribute(
         TobagoClass.SELECT_MANY_SHUTTLE,
         select.getCustomClass(),
-        TobagoClass.SELECT_MANY_SHUTTLE.createMarkup(select.getMarkup()));
+        TobagoClass.SELECT_MANY_SHUTTLE.createMarkup(ComponentUtils.updateMarkup(select, select.getMarkup())));
     HtmlRendererUtils.writeDataAttributes(facesContext, writer, select);
     final String title = HtmlRendererUtils.getTitleFromTipAndMessages(facesContext, select);
     if (title != null) {

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneChoiceRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneChoiceRenderer.java?rev=1795602&r1=1795601&r2=1795602&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneChoiceRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneChoiceRenderer.java Fri May 19 10:00:29 2017
@@ -69,9 +69,8 @@ public class SelectOneChoiceRenderer ext
     // TODO: optimize class attribute writing
     final List<CssItem> classAttributes = new ArrayList<CssItem>();
     classAttributes.add(TobagoClass.SELECT_ONE_CHOICE);
-    if (select.getMarkup() != null) {
-      classAttributes.addAll(Arrays.asList(TobagoClass.SELECT_ONE_CHOICE.createMarkup(select.getMarkup())));
-    }
+    classAttributes.addAll(Arrays.asList(
+        TobagoClass.SELECT_ONE_CHOICE.createMarkup(ComponentUtils.updateMarkup(select, select.getMarkup()))));
     classAttributes.add(BootstrapClass.FORM_CONTROL);
     classAttributes.add(select.getCustomClass());
     writer.writeClassAttribute(null, null, classAttributes.toArray(new CssItem[classAttributes.size()]));

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneListboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneListboxRenderer.java?rev=1795602&r1=1795601&r2=1795602&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneListboxRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneListboxRenderer.java Fri May 19 10:00:29 2017
@@ -74,9 +74,8 @@ public class SelectOneListboxRenderer ex
     // TODO: optimize class attribute writing
     final List<CssItem> classAttributes = new ArrayList<CssItem>();
     classAttributes.add(TobagoClass.SELECT_ONE_LISTBOX);
-    if (select.getMarkup() != null) {
-      classAttributes.addAll(Arrays.asList(TobagoClass.SELECT_ONE_LISTBOX.createMarkup(select.getMarkup())));
-    }
+    classAttributes.addAll(Arrays.asList(
+        TobagoClass.SELECT_ONE_LISTBOX.createMarkup(ComponentUtils.updateMarkup(select, select.getMarkup()))));
     classAttributes.add(BootstrapClass.FORM_CONTROL);
     classAttributes.add(select.getCustomClass());
     writer.writeClassAttribute(null, null, classAttributes.toArray(new CssItem[classAttributes.size()]));

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRadioRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRadioRenderer.java?rev=1795602&r1=1795601&r2=1795602&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRadioRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectOneRadioRenderer.java Fri May 19 10:00:29 2017
@@ -66,9 +66,8 @@ public class SelectOneRadioRenderer exte
     // TODO: optimize class attribute writing
     final List<CssItem> classAttributes = new ArrayList<CssItem>();
     classAttributes.add(TobagoClass.SELECT_ONE_RADIO);
-    if (select.getMarkup() != null) {
-      classAttributes.addAll(Arrays.asList(TobagoClass.SELECT_ONE_RADIO.createMarkup(select.getMarkup())));
-    }
+    classAttributes.addAll(Arrays.asList(
+        TobagoClass.SELECT_ONE_RADIO.createMarkup(ComponentUtils.updateMarkup(select, select.getMarkup()))));
     classAttributes.add(inline ? TobagoClass.SELECT_ONE_RADIO__INLINE : null);
     classAttributes.add(select.getCustomClass());
     writer.writeClassAttribute(null, null, classAttributes.toArray(new CssItem[classAttributes.size()]));

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SeparatorRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SeparatorRenderer.java?rev=1795602&r1=1795601&r2=1795602&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SeparatorRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SeparatorRenderer.java Fri May 19 10:00:29 2017
@@ -48,7 +48,7 @@ public class SeparatorRenderer extends R
       writer.writeClassAttribute(
           TobagoClass.SEPARATOR,
           separator.getCustomClass(),
-          TobagoClass.SEPARATOR.createMarkup(separator.getMarkup()));
+          TobagoClass.SEPARATOR.createMarkup(ComponentUtils.updateMarkup(separator, separator.getMarkup())));
       writer.writeText(label);
       writer.endElement(HtmlElements.P);
     } else {
@@ -57,7 +57,7 @@ public class SeparatorRenderer extends R
       writer.writeClassAttribute(
           TobagoClass.SEPARATOR,
           separator.getCustomClass(),
-          TobagoClass.SEPARATOR.createMarkup(separator.getMarkup()));
+          TobagoClass.SEPARATOR.createMarkup(ComponentUtils.updateMarkup(separator, separator.getMarkup())));
       writer.endElement(HtmlElements.HR);
     }
   }

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java?rev=1795602&r1=1795601&r2=1795602&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SheetRenderer.java Fri May 19 10:00:29 2017
@@ -188,7 +188,7 @@ public class SheetRenderer extends Rende
     writer.writeClassAttribute(
         TobagoClass.SHEET,
         sheet.getCustomClass(),
-        TobagoClass.SHEET.createMarkup(sheet.getMarkup()));
+        TobagoClass.SHEET.createMarkup(ComponentUtils.updateMarkup(sheet, sheet.getMarkup())));
     writer.writeStyleAttribute(sheet.getStyle());
     final UIComponent facetReload = ComponentUtils.getFacet(sheet, Facets.reload);
     if (facetReload != null && facetReload instanceof UIReload && facetReload.isRendered()) {

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TabGroupRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TabGroupRenderer.java?rev=1795602&r1=1795601&r2=1795602&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TabGroupRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TabGroupRenderer.java Fri May 19 10:00:29 2017
@@ -153,7 +153,7 @@ public class TabGroupRenderer extends Re
     writer.writeClassAttribute(
         TobagoClass.TAB_GROUP,
         tabGroup.getCustomClass(),
-        TobagoClass.TAB_GROUP.createMarkup(tabGroup.getMarkup()));
+        TobagoClass.TAB_GROUP.createMarkup(ComponentUtils.updateMarkup(tabGroup, tabGroup.getMarkup())));
     HtmlRendererUtils.writeDataAttributes(facesContext, writer, tabGroup);
     writer.writeStyleAttribute(tabGroup.getStyle());
     writer.writeAttribute(HtmlAttributes.SWITCHTYPE, switchType.name(), false);

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TextareaRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TextareaRenderer.java?rev=1795602&r1=1795601&r2=1795602&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TextareaRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TextareaRenderer.java Fri May 19 10:00:29 2017
@@ -83,9 +83,8 @@ public class TextareaRenderer extends Me
     // TODO: optimize class attribute writing
     final List<CssItem> classAttributes = new ArrayList<CssItem>();
     classAttributes.add(TobagoClass.TEXTAREA);
-    if (input.getMarkup() != null) {
-      classAttributes.addAll(Arrays.asList(TobagoClass.TEXTAREA.createMarkup(input.getMarkup())));
-    }
+    classAttributes.addAll(Arrays.asList(
+        TobagoClass.TEXTAREA.createMarkup(ComponentUtils.updateMarkup(input, input.getMarkup()))));
     classAttributes.add(BootstrapClass.FORM_CONTROL);
     classAttributes.add(input.getCustomClass());
     writer.writeClassAttribute(null, null, classAttributes.toArray(new CssItem[classAttributes.size()]));

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeLabelRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeLabelRenderer.java?rev=1795602&r1=1795601&r2=1795602&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeLabelRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeLabelRenderer.java Fri May 19 10:00:29 2017
@@ -58,7 +58,7 @@ public class TreeLabelRenderer extends R
       writer.writeClassAttribute(
           TobagoClass.TREE_LABEL,
           null,
-          TobagoClass.TREE_LABEL.createMarkup(label.getMarkup()));
+          TobagoClass.TREE_LABEL.createMarkup(ComponentUtils.updateMarkup(label, label.getMarkup())));
       HtmlRendererUtils.writeDataAttributes(facesContext, writer, label);
       writer.writeStyleAttribute(label.getStyle());
       final String title = HtmlRendererUtils.getTitleFromTipAndMessages(facesContext, label);

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeListboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeListboxRenderer.java?rev=1795602&r1=1795601&r2=1795602&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeListboxRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeListboxRenderer.java Fri May 19 10:00:29 2017
@@ -68,7 +68,7 @@ public class TreeListboxRenderer extends
     writer.writeClassAttribute(
         TobagoClass.TREE_LISTBOX,
         null,
-        TobagoClass.TREE_LISTBOX.createMarkup(tree.getMarkup()));
+        TobagoClass.TREE_LISTBOX.createMarkup(ComponentUtils.updateMarkup(tree, tree.getMarkup())));
     HtmlRendererUtils.writeDataAttributes(facesContext, writer, tree);
     writer.writeStyleAttribute(tree.getStyle());
 

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeRenderer.java?rev=1795602&r1=1795601&r2=1795602&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeRenderer.java Fri May 19 10:00:29 2017
@@ -89,7 +89,7 @@ public class TreeRenderer extends Render
     writer.writeClassAttribute(
         TobagoClass.TREE,
         tree.getCustomClass(),
-        TobagoClass.TREE.createMarkup(tree.getMarkup()));
+        TobagoClass.TREE.createMarkup(ComponentUtils.updateMarkup(tree, tree.getMarkup())));
     writer.writeStyleAttribute(tree.getStyle());
     writer.writeIdAttribute(clientId);
     HtmlRendererUtils.writeDataAttributes(facesContext, writer, tree);

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeSelectRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeSelectRenderer.java?rev=1795602&r1=1795601&r2=1795602&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeSelectRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/TreeSelectRenderer.java Fri May 19 10:00:29 2017
@@ -109,7 +109,7 @@ public class TreeSelectRenderer extends
     writer.writeClassAttribute(
         TobagoClass.TREE_SELECT,
         null,
-        TobagoClass.TREE_SELECT.createMarkup(select.getMarkup()));
+        TobagoClass.TREE_SELECT.createMarkup(ComponentUtils.updateMarkup(select, select.getMarkup())));
     HtmlRendererUtils.writeDataAttributes(facesContext, writer, select);
 
     if (select.isShowCheckbox()



Mime
View raw message