You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2015/09/17 12:58:47 UTC
svn commit: r1703567 [1/2] - in /myfaces/tobago/branches/tobago-3.0.x:
tobago-core/src/main/java/org/apache/myfaces/tobago/component/
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/
tobago-core/src/main/java/org/apache/my...
Author: lofwyr
Date: Thu Sep 17 10:58:44 2015
New Revision: 1703567
URL: http://svn.apache.org/r1703567
Log:
TOBAGO-1492: Possibility to add a CSS class to a component
Added:
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/CustomClass.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/CustomClassEditor.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/java/org/apache/myfaces/tobago/renderkit/css/CustomClassUnitTest.java
Modified:
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/component/SupportsStyle.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BoxTagDeclaration.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MediatorTagDeclaration.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuBarTagDeclaration.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PanelTagDeclaration.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SectionTagDeclaration.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCheckboxTagDeclaration.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetTagDeclaration.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/StyleTagDeclaration.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasStyle.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/InputTagDeclaration.java
myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java
myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClassGenerator.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/BoxRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ButtonRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/CalendarRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/CommandRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FileRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FlexLayoutRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FlowLayoutRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FooterRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ImageRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/InRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/LabelRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/LinkRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MediatorRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MenuBarRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MenuRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MessagesRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ObjectRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/OutRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/PageRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/PanelRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ProgressRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SectionRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SegmentLayoutRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectBooleanCheckboxRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyCheckboxRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyListboxRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyShuttleRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneChoiceRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneListboxRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneRadioRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SeparatorRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SheetRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/StyleRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TabGroupRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TextareaRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/TreeRenderer.java
myfaces/tobago/branches/tobago-3.0.x/tobago-tool/tobago-tool-apt/src/main/resources/org/apache/myfaces/tobago/apt/component.stg
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/component/SupportsStyle.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/component/SupportsStyle.java?rev=1703567&r1=1703566&r2=1703567&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/component/SupportsStyle.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/component/SupportsStyle.java Thu Sep 17 10:58:44 2015
@@ -19,6 +19,7 @@
package org.apache.myfaces.tobago.component;
+import org.apache.myfaces.tobago.renderkit.css.CustomClass;
import org.apache.myfaces.tobago.renderkit.css.Style;
public interface SupportsStyle {
@@ -26,4 +27,8 @@ public interface SupportsStyle {
Style getStyle();
void setStyle(Style style);
+
+ CustomClass getCustomClass();
+
+ void setCustomClass(CustomClass customClass);
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BoxTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BoxTagDeclaration.java?rev=1703567&r1=1703566&r2=1703567&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BoxTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/BoxTagDeclaration.java Thu Sep 17 10:58:44 2015
@@ -55,7 +55,7 @@ import javax.faces.component.UIPanel;
allowedChildComponenents = "org.apache.myfaces.tobago.GridLayout")})
public interface BoxTagDeclaration
- extends HasIdBindingAndRendered, IsGridLayoutComponent, HasStyle, IsGridLayoutContainer, HasMarkup, HasCurrentMarkup,
- HasLabel, HasTip, IsCollapsible, HasCss, HasCurrentCss {
+ extends HasIdBindingAndRendered, IsGridLayoutComponent, HasStyle, IsGridLayoutContainer, HasMarkup,
+ HasCurrentMarkup, HasLabel, HasTip, IsCollapsible, HasCss, HasCurrentCss {
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MediatorTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MediatorTagDeclaration.java?rev=1703567&r1=1703566&r2=1703567&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MediatorTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MediatorTagDeclaration.java Thu Sep 17 10:58:44 2015
@@ -46,7 +46,8 @@ import javax.faces.component.UIPanel;
rendererType = RendererTypes.MEDIATOR,
interfaces = {"org.apache.myfaces.tobago.component.SupportsMarkup"})
public interface MediatorTagDeclaration
- extends HasIdBindingAndRendered, IsGridLayoutComponent, HasStyle, IsGridLayoutContainer, HasMarkup, HasCurrentMarkup {
+ extends HasIdBindingAndRendered, IsGridLayoutComponent, HasStyle, IsGridLayoutContainer, HasMarkup,
+ HasCurrentMarkup {
/**
* Name of a request-scope attribute under which this component is accessible.
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuBarTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuBarTagDeclaration.java?rev=1703567&r1=1703566&r2=1703567&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuBarTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/MenuBarTagDeclaration.java Thu Sep 17 10:58:44 2015
@@ -60,5 +60,6 @@ import javax.faces.component.UIPanel;
"org.apache.myfaces.tobago.MenuSeparator"
})
public interface MenuBarTagDeclaration
- extends HasIdBindingAndRendered, IsGridLayoutComponent, HasStyle, HasMarkup, HasCurrentMarkup, HasCss, HasCurrentCss {
+ extends HasIdBindingAndRendered, IsGridLayoutComponent, HasStyle, HasMarkup, HasCurrentMarkup,
+ HasCss, HasCurrentCss {
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PanelTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PanelTagDeclaration.java?rev=1703567&r1=1703566&r2=1703567&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PanelTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/PanelTagDeclaration.java Thu Sep 17 10:58:44 2015
@@ -52,5 +52,6 @@ import javax.faces.component.UIPanel;
@Facet(name=Facets.LAYOUT, description = "Contains an instance of AbstractUILayoutBase",
allowedChildComponenents = "org.apache.myfaces.tobago.GridLayout")})
public interface PanelTagDeclaration
- extends HasIdBindingAndRendered, IsGridLayoutComponent, HasStyle, IsGridLayoutContainer, HasMarkup, HasCurrentMarkup, HasTip {
+ extends HasIdBindingAndRendered, IsGridLayoutComponent, HasStyle, IsGridLayoutContainer,
+ HasMarkup, HasCurrentMarkup, HasTip {
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SectionTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SectionTagDeclaration.java?rev=1703567&r1=1703566&r2=1703567&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SectionTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SectionTagDeclaration.java Thu Sep 17 10:58:44 2015
@@ -37,16 +37,17 @@ import org.apache.myfaces.tobago.interna
*/
@Tag(name = "section")
@UIComponentTag(
- uiComponent = "org.apache.myfaces.tobago.component.UISection",
- uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUISection",
- uiComponentFacesClass = "javax.faces.component.UIComponentBase",
- componentFamily = "org.apache.myfaces.tobago.Section",
- rendererType = RendererTypes.SECTION,
- facets = {
- @Facet(name = Facets.LABEL,
- description = "This facet contains a UILabel",
- allowedChildComponenents = "org.apache.myfaces.tobago.Label")})
+ uiComponent = "org.apache.myfaces.tobago.component.UISection",
+ uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUISection",
+ uiComponentFacesClass = "javax.faces.component.UIComponentBase",
+ componentFamily = "org.apache.myfaces.tobago.Section",
+ rendererType = RendererTypes.SECTION,
+ facets = {
+ @Facet(name = Facets.LABEL,
+ description = "This facet contains a UILabel",
+ allowedChildComponenents = "org.apache.myfaces.tobago.Label")})
public interface SectionTagDeclaration
- extends HasIdBindingAndRendered, HasLabel, IsGridLayoutComponent, HasStyle, HasImage, HasMarkup, HasCurrentMarkup {
+ extends HasIdBindingAndRendered, HasLabel, IsGridLayoutComponent, HasStyle, HasImage,
+ HasMarkup, HasCurrentMarkup {
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCheckboxTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCheckboxTagDeclaration.java?rev=1703567&r1=1703566&r2=1703567&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCheckboxTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SelectBooleanCheckboxTagDeclaration.java Thu Sep 17 10:58:44 2015
@@ -62,20 +62,20 @@ import javax.faces.component.UISelectBoo
rendererType = RendererTypes.SELECT_BOOLEAN_CHECKBOX,
allowedChildComponenents = "NONE",
facets = {
- @Facet(name= Facets.CLICK,
+ @Facet(name = Facets.CLICK,
description =
"This facet can contain a UICommand that is invoked in case of a click event from the component",
allowedChildComponenents = "org.apache.myfaces.tobago.Command"),
- @Facet(name=Facets.CHANGE,
+ @Facet(name = Facets.CHANGE,
description =
"This facet can contain a UICommand that is invoked in case of a change event from the component",
- allowedChildComponenents = "org.apache.myfaces.tobago.Command")
- })
+ allowedChildComponenents = "org.apache.myfaces.tobago.Command")
+ })
public interface SelectBooleanCheckboxTagDeclaration extends HasValidator,
HasValueChangeListener, HasIdBindingAndRendered, HasLabelAndAccessKey, HasValue, IsDisabled,
HasTip, IsReadonly, HasMarkup, HasCurrentMarkup, HasTabIndex,
IsRequiredForSelect, HasConverter, IsFocus,
- HasValidatorMessage, HasRequiredMessageForSelect, HasConverterMessage, IsGridLayoutComponent, HasStyle, HasItemLabel {
- // IsImmediateComponent
+ HasValidatorMessage, HasRequiredMessageForSelect, HasConverterMessage,
+ IsGridLayoutComponent, HasStyle, HasItemLabel {
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetTagDeclaration.java?rev=1703567&r1=1703566&r2=1703567&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/SheetTagDeclaration.java Thu Sep 17 10:58:44 2015
@@ -61,8 +61,8 @@ import javax.faces.component.UIData;
facets = {@Facet(name = Facets.RELOAD, description = "Contains an instance of UIReload",
allowedChildComponenents = "org.apache.myfaces.tobago.Reload")})
public interface SheetTagDeclaration
- extends HasIdBindingAndRendered, IsGridLayoutComponent, HasStyle, IsGridLayoutContainer, HasMarkup, HasCurrentMarkup,
- HasCss, HasCurrentCss, HasRenderedPartially, IsShowRoot, IsShowRootJunction, HasVar {
+ extends HasIdBindingAndRendered, IsGridLayoutComponent, HasStyle, IsGridLayoutContainer,
+ HasMarkup, HasCurrentMarkup, HasCss, HasCurrentCss, HasRenderedPartially, IsShowRoot, IsShowRootJunction, HasVar {
/**
* LayoutConstraints for column layout.
* Semicolon separated list of layout tokens ('<x>*', '<x>px' or '<x>%').
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/StyleTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/StyleTagDeclaration.java?rev=1703567&r1=1703566&r2=1703567&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/StyleTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/component/StyleTagDeclaration.java Thu Sep 17 10:58:44 2015
@@ -55,7 +55,16 @@ public interface StyleTagDeclaration ext
void setFile(String file);
/**
+ * @param customClass A custom CSS class for this component.
+ * @since 3.0.0
+ */
+ @TagAttribute()
+ @UIComponentTagAttribute(type = "org.apache.myfaces.tobago.renderkit.css.CustomClass")
+ void setCustomClass(String customClass);
+
+ /**
* @param width The width for this component.
+ * @since 3.0.0
*/
@TagAttribute()
@UIComponentTagAttribute(type = "org.apache.myfaces.tobago.layout.Measure")
@@ -63,6 +72,7 @@ public interface StyleTagDeclaration ext
/**
* @param height The height for this component.
+ * @since 3.0.0
*/
@TagAttribute()
@UIComponentTagAttribute(type = "org.apache.myfaces.tobago.layout.Measure")
@@ -70,6 +80,7 @@ public interface StyleTagDeclaration ext
/**
* @param minWidth The minimum width for this component.
+ * @since 3.0.0
*/
@TagAttribute()
@UIComponentTagAttribute(type = "org.apache.myfaces.tobago.layout.Measure")
@@ -77,6 +88,7 @@ public interface StyleTagDeclaration ext
/**
* @param minHeight The minimum height for this component.
+ * @since 3.0.0
*/
@TagAttribute()
@UIComponentTagAttribute(type = "org.apache.myfaces.tobago.layout.Measure")
@@ -84,6 +96,7 @@ public interface StyleTagDeclaration ext
/**
* @param maxWidth The maximum width for this component.
+ * @since 3.0.0
*/
@TagAttribute()
@UIComponentTagAttribute(type = "org.apache.myfaces.tobago.layout.Measure")
@@ -91,6 +104,7 @@ public interface StyleTagDeclaration ext
/**
* @param maxHeight The maximum height for this component.
+ * @since 3.0.0
*/
@TagAttribute()
@UIComponentTagAttribute(type = "org.apache.myfaces.tobago.layout.Measure")
@@ -98,6 +112,7 @@ public interface StyleTagDeclaration ext
/**
* @param left The left position value for this component.
+ * @since 3.0.0
*/
@TagAttribute()
@UIComponentTagAttribute(type = "org.apache.myfaces.tobago.layout.Measure")
@@ -105,6 +120,7 @@ public interface StyleTagDeclaration ext
/**
* @param right The left position value for this component.
+ * @since 3.0.0
*/
@TagAttribute()
@UIComponentTagAttribute(type = "org.apache.myfaces.tobago.layout.Measure")
@@ -112,6 +128,7 @@ public interface StyleTagDeclaration ext
/**
* @param top The top position value for this component.
+ * @since 3.0.0
*/
@TagAttribute()
@UIComponentTagAttribute(type = "org.apache.myfaces.tobago.layout.Measure")
@@ -119,6 +136,7 @@ public interface StyleTagDeclaration ext
/**
* @param bottom The top position value for this component.
+ * @since 3.0.0
*/
@TagAttribute()
@UIComponentTagAttribute(type = "org.apache.myfaces.tobago.layout.Measure")
@@ -126,6 +144,7 @@ public interface StyleTagDeclaration ext
/**
* @param paddingLeft The left padding.
+ * @since 3.0.0
*/
@TagAttribute()
@UIComponentTagAttribute(type = "org.apache.myfaces.tobago.layout.Measure")
@@ -133,6 +152,7 @@ public interface StyleTagDeclaration ext
/**
* @param paddingRight The right padding.
+ * @since 3.0.0
*/
@TagAttribute()
@UIComponentTagAttribute(type = "org.apache.myfaces.tobago.layout.Measure")
@@ -140,6 +160,7 @@ public interface StyleTagDeclaration ext
/**
* @param paddingTop The top padding.
+ * @since 3.0.0
*/
@TagAttribute()
@UIComponentTagAttribute(type = "org.apache.myfaces.tobago.layout.Measure")
@@ -147,6 +168,7 @@ public interface StyleTagDeclaration ext
/**
* @param paddingBottom The bottom padding.
+ * @since 3.0.0
*/
@TagAttribute()
@UIComponentTagAttribute(type = "org.apache.myfaces.tobago.layout.Measure")
@@ -154,6 +176,7 @@ public interface StyleTagDeclaration ext
/**
* @param marginLeft The margin at the left of this component.
+ * @since 3.0.0
*/
@TagAttribute()
@UIComponentTagAttribute(type = "org.apache.myfaces.tobago.layout.Measure")
@@ -161,6 +184,7 @@ public interface StyleTagDeclaration ext
/**
* @param marginRight The margin at the right of this component.
+ * @since 3.0.0
*/
@TagAttribute()
@UIComponentTagAttribute(type = "org.apache.myfaces.tobago.layout.Measure")
@@ -168,6 +192,7 @@ public interface StyleTagDeclaration ext
/**
* @param marginTop The margin at the top of this component.
+ * @since 3.0.0
*/
@TagAttribute()
@UIComponentTagAttribute(type = "org.apache.myfaces.tobago.layout.Measure")
@@ -175,6 +200,7 @@ public interface StyleTagDeclaration ext
/**
* @param marginBottom The margin at the bottom of this component.
+ * @since 3.0.0
*/
@TagAttribute()
@UIComponentTagAttribute(type = "org.apache.myfaces.tobago.layout.Measure")
@@ -182,6 +208,7 @@ public interface StyleTagDeclaration ext
/**
* @param overflowX Does the component need a horizontal scollbar.
+ * @since 3.0.0
*/
@TagAttribute()
@UIComponentTagAttribute(
@@ -191,6 +218,7 @@ public interface StyleTagDeclaration ext
/**
* @param overflowY Does the component need a vertical scollbar.
+ * @since 3.0.0
*/
@TagAttribute()
@UIComponentTagAttribute(
@@ -201,6 +229,7 @@ public interface StyleTagDeclaration ext
/**
* @param display Indicates the renderer to render the element as
* {@link Display#block}, {@link Display#inline} or {@link Display#none}.
+ * @since 3.0.0
*/
@TagAttribute()
@UIComponentTagAttribute(
@@ -210,6 +239,7 @@ public interface StyleTagDeclaration ext
/**
* @param position Values for the position used with CSS.
+ * @since 3.0.0
*/
@TagAttribute()
@UIComponentTagAttribute(
@@ -223,6 +253,7 @@ public interface StyleTagDeclaration ext
* {@link TextAlign#right},
* {@link TextAlign#center} and
* {@link TextAlign#justify}.
+ * @since 3.0.0
*/
@TagAttribute()
@UIComponentTagAttribute(
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasStyle.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasStyle.java?rev=1703567&r1=1703566&r2=1703567&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasStyle.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/HasStyle.java Thu Sep 17 10:58:44 2015
@@ -28,4 +28,23 @@ public interface HasStyle {
*/
@UIComponentTagAttribute(type = "org.apache.myfaces.tobago.renderkit.css.Style")
void setStyle(String style);
+
+ /**
+ * Sets a CSS class in its parent, if the parent supports it.
+ *
+ * Which this feature it is possible to put a CSS class name into a component with the <tc:style> tag. Example:
+ *
+ * <pre>
+ * <tc:in>
+ * <tc:style customClass="my-emphasized"/>
+ * </tc:in>
+ * </pre>
+ *
+ * One capability is, to used external CSS libs.
+ * <br/>
+ * This feature should not be used imprudent.
+ * Because it might be unstable against changes in the renderered HTML code.
+ */
+ @UIComponentTagAttribute(type = "org.apache.myfaces.tobago.renderkit.css.CustomClass")
+ void setCustomClass(String customClass);
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/InputTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/InputTagDeclaration.java?rev=1703567&r1=1703566&r2=1703567&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/InputTagDeclaration.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/taglib/declaration/InputTagDeclaration.java Thu Sep 17 10:58:44 2015
@@ -19,6 +19,8 @@
package org.apache.myfaces.tobago.internal.taglib.declaration;
-public interface InputTagDeclaration extends HasValidator, HasValue, HasValueChangeListener,
- HasValidatorMessage, HasConverterMessage, HasRequiredMessage, HasTabIndex, IsFocus, IsGridLayoutComponent, HasStyle {
+public interface InputTagDeclaration
+ extends HasValidator, HasValue, HasValueChangeListener,
+ HasValidatorMessage, HasConverterMessage, HasRequiredMessage,
+ HasTabIndex, IsFocus, IsGridLayoutComponent, HasStyle {
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java?rev=1703567&r1=1703566&r2=1703567&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/RendererBase.java Thu Sep 17 10:58:44 2015
@@ -202,14 +202,4 @@ public class RendererBase extends Render
}
return resourceManager;
}
-
- /**
- * The return value of this method will be cached, so it's not possible to return state information.
- * This method will not called often.
- * @since Tobago 3.0.0
- * @return Additional CSS classes.
- */
- public String[] getAdditionalClasses() {
- return new String[0];
- }
}
Added: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/CustomClass.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/CustomClass.java?rev=1703567&view=auto
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/CustomClass.java (added)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/CustomClass.java Thu Sep 17 10:58:44 2015
@@ -0,0 +1,87 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.myfaces.tobago.renderkit.css;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.StringTokenizer;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * XXX preliminary
+ */
+public class CustomClass implements CssItem {
+
+ private static final Logger LOG = LoggerFactory.getLogger(CustomClass.class);
+
+ private static final Pattern CSS_CLASS_PATTERN = Pattern.compile("[\\w-]+");
+
+ private final String[] classes;
+
+ private CustomClass(List<String> list) {
+ classes = list.toArray(new String[list.size()]);
+ }
+
+ public static CustomClass valueOf(String text) {
+
+ final StringTokenizer tokenizer = new StringTokenizer(text, " ");
+ final List<String> result = new ArrayList<String>(tokenizer.countTokens());
+ while (tokenizer.hasMoreTokens()) {
+ final String token = tokenizer.nextToken();
+ final Matcher matcher = CSS_CLASS_PATTERN.matcher(token);
+ if (matcher.matches()) {
+ if (!result.contains(token)) {
+ result.add(token);
+ } else {
+ LOG.warn("Duplicate CSS class name: '{}' which is part of '{}'", token, text);
+ }
+ } else {
+ LOG.error("Invalid CSS class name: '{}' which is part of '{}'", token, text);
+ }
+ }
+ if (result.size() > 0) {
+ return new CustomClass(result);
+ } else {
+ return null;
+ }
+
+ }
+
+ @Override
+ public String getName() {
+ switch (classes.length) {
+ case 0:
+ return "";
+ case 1:
+ return classes[0];
+ default:
+ final StringBuilder builder = new StringBuilder(classes[0]);
+ for (int i = 1; i < classes.length; i++) {
+ builder.append(' ');
+ builder.append(classes[i]);
+ }
+ return builder.toString();
+ }
+ }
+}
Added: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/CustomClassEditor.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/CustomClassEditor.java?rev=1703567&view=auto
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/CustomClassEditor.java (added)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/CustomClassEditor.java Thu Sep 17 10:58:44 2015
@@ -0,0 +1,38 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.myfaces.tobago.renderkit.css;
+
+import java.beans.PropertyEditorSupport;
+
+/**
+ * Converter for {@link org.apache.myfaces.tobago.renderkit.css.CustomClass}
+ *
+ * XXX preliminary
+ *
+ * @since 3.0.0
+ */
+public class CustomClassEditor extends PropertyEditorSupport {
+
+ @Override
+ public void setAsText(final String text) throws IllegalArgumentException {
+ setValue(CustomClass.valueOf(text));
+ }
+
+}
Added: myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/java/org/apache/myfaces/tobago/renderkit/css/CustomClassUnitTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/java/org/apache/myfaces/tobago/renderkit/css/CustomClassUnitTest.java?rev=1703567&view=auto
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/java/org/apache/myfaces/tobago/renderkit/css/CustomClassUnitTest.java (added)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-core/src/test/java/org/apache/myfaces/tobago/renderkit/css/CustomClassUnitTest.java Thu Sep 17 10:58:44 2015
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.myfaces.tobago.renderkit.css;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class CustomClassUnitTest {
+
+ @Test
+ public void test() {
+ Assert.assertEquals("simple", "test", CustomClass.valueOf("test").getName());
+ Assert.assertEquals("number", "test2", CustomClass.valueOf("test2").getName());
+ Assert.assertEquals("list", "test3 and test4", CustomClass.valueOf("test3 and test4").getName());
+ Assert.assertEquals("space", "test5 test6", CustomClass.valueOf(" test5 test6 ").getName());
+ Assert.assertEquals("double", "test7", CustomClass.valueOf("test7 test7").getName());
+ Assert.assertEquals("-", "test-8", CustomClass.valueOf("test-8").getName());
+ Assert.assertEquals("_", "__t_e_s_t-9 _d", CustomClass.valueOf("__t_e_s_t-9 _d").getName());
+
+ Assert.assertEquals(".", null, CustomClass.valueOf("test.10"));
+ Assert.assertEquals("tab", null, CustomClass.valueOf("test\t11"));
+ Assert.assertEquals(":", null, CustomClass.valueOf("test:12"));
+
+ }
+
+}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java?rev=1703567&r1=1703566&r2=1703567&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java Thu Sep 17 10:58:44 2015
@@ -85,7 +85,7 @@ public class NumberSliderRenderer extend
writer.startElement(HtmlElements.TABLE, slider);
writer.writeAttribute(HtmlAttributes.ROLE, HtmlRoleValues.PRESENTATION.toString(), false);
writer.writeIdAttribute(id);
- writer.writeClassAttribute(Classes.create(slider));
+ writer.writeClassAttribute(Classes.create(slider), slider.getCustomClass());
HtmlRendererUtils.writeDataAttributes(facesContext, writer, slider);
writer.writeStyleAttribute(slider.getStyle());
//writer.writeAttribute(HtmlAttributes.BORDER,"1",false);
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClassGenerator.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClassGenerator.java?rev=1703567&r1=1703566&r2=1703567&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClassGenerator.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/css/BootstrapClassGenerator.java Thu Sep 17 10:58:44 2015
@@ -29,22 +29,22 @@ import java.util.List;
*/
public class BootstrapClassGenerator {
- private BootstrapClass[] EXTRA_SMALL = new BootstrapClass[]{
+ private static final BootstrapClass[] EXTRA_SMALL = new BootstrapClass[]{
BootstrapClass.COL_XS_1, BootstrapClass.COL_XS_2, BootstrapClass.COL_XS_3, BootstrapClass.COL_XS_4,
BootstrapClass.COL_XS_5, BootstrapClass.COL_XS_6, BootstrapClass.COL_XS_7, BootstrapClass.COL_XS_8,
BootstrapClass.COL_XS_9, BootstrapClass.COL_XS_10, BootstrapClass.COL_XS_11, BootstrapClass.COL_XS_12,
};
- private BootstrapClass[] SMALL = new BootstrapClass[]{
+ private static final BootstrapClass[] SMALL = new BootstrapClass[]{
BootstrapClass.COL_SM_1, BootstrapClass.COL_SM_2, BootstrapClass.COL_SM_3, BootstrapClass.COL_SM_4,
BootstrapClass.COL_SM_5, BootstrapClass.COL_SM_6, BootstrapClass.COL_SM_7, BootstrapClass.COL_SM_8,
BootstrapClass.COL_SM_9, BootstrapClass.COL_SM_10, BootstrapClass.COL_SM_11, BootstrapClass.COL_SM_12,
};
- private BootstrapClass[] MEDIUM = new BootstrapClass[]{
+ private static final BootstrapClass[] MEDIUM = new BootstrapClass[]{
BootstrapClass.COL_MD_1, BootstrapClass.COL_MD_2, BootstrapClass.COL_MD_3, BootstrapClass.COL_MD_4,
BootstrapClass.COL_MD_5, BootstrapClass.COL_MD_6, BootstrapClass.COL_MD_7, BootstrapClass.COL_MD_8,
BootstrapClass.COL_MD_9, BootstrapClass.COL_MD_10, BootstrapClass.COL_MD_11, BootstrapClass.COL_MD_12,
};
- private BootstrapClass[] LARGE = new BootstrapClass[]{
+ private static final BootstrapClass[] LARGE = new BootstrapClass[]{
BootstrapClass.COL_LG_1, BootstrapClass.COL_LG_2, BootstrapClass.COL_LG_3, BootstrapClass.COL_LG_4,
BootstrapClass.COL_LG_5, BootstrapClass.COL_LG_6, BootstrapClass.COL_LG_7, BootstrapClass.COL_LG_8,
BootstrapClass.COL_LG_9, BootstrapClass.COL_LG_10, BootstrapClass.COL_LG_11, BootstrapClass.COL_LG_12,
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/BoxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/BoxRenderer.java?rev=1703567&r1=1703566&r2=1703567&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/BoxRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/BoxRenderer.java Thu Sep 17 10:58:44 2015
@@ -58,7 +58,8 @@ public class BoxRenderer extends BoxRend
}
writer.startElement(HtmlElements.DIV, box);
- writer.writeClassAttribute(Classes.create(box), BootstrapClass.PANEL, BootstrapClass.PANEL_DEFAULT);
+ writer.writeClassAttribute(
+ Classes.create(box), BootstrapClass.PANEL, BootstrapClass.PANEL_DEFAULT, box.getCustomClass());
writer.writeIdAttribute(box.getClientId(facesContext));
final String title = HtmlRendererUtils.getTitleFromTipAndMessages(facesContext, box);
if (title != null) {
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ButtonRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ButtonRenderer.java?rev=1703567&r1=1703566&r2=1703567&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ButtonRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ButtonRenderer.java Thu Sep 17 10:58:44 2015
@@ -100,7 +100,8 @@ public class ButtonRenderer extends Comm
Classes.create(button),
BootstrapClass.BTN,
defaultCommand ? BootstrapClass.BTN_PRIMARY : BootstrapClass.BTN_DEFAULT,
- insideToolbar ? BootstrapClass.NAVBAR_BTN : null);
+ insideToolbar ? BootstrapClass.NAVBAR_BTN : null,
+ button.getCustomClass());
if (button instanceof UIButton && ((UIButton) component).isDefaultCommand()) {
final AbstractUIForm form = ComponentUtils.findAncestor(component, AbstractUIForm.class);
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/CalendarRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/CalendarRenderer.java?rev=1703567&r1=1703566&r2=1703567&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/CalendarRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/CalendarRenderer.java Thu Sep 17 10:58:44 2015
@@ -70,7 +70,7 @@ public class CalendarRenderer extends La
writer.startElement(HtmlElements.DIV, component);
writer.writeIdAttribute(id);
- writer.writeClassAttribute(Classes.create(output));
+ writer.writeClassAttribute(Classes.create(output), output.getCustomClass());
HtmlRendererUtils.writeDataAttributes(facesContext, writer, component);
final Style style = output.getStyle();
writer.writeStyleAttribute(style);
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/CommandRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/CommandRenderer.java?rev=1703567&r1=1703566&r2=1703567&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/CommandRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/CommandRenderer.java Thu Sep 17 10:58:44 2015
@@ -92,7 +92,7 @@ public class CommandRenderer extends Com
writer.writeClassAttribute(BootstrapClass.DROPDOWN_TOGGLE); // todo: CSS classes
writer.writeAttribute(DataAttributes.TOGGLE, "dropdown", false);
} else {
- writer.writeClassAttribute(Classes.create(link));
+ writer.writeClassAttribute(Classes.create(link), link.getCustomClass());
}
writer.writeIdAttribute(clientId);
writer.writeNameAttribute(clientId);
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FileRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FileRenderer.java?rev=1703567&r1=1703566&r2=1703567&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FileRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FileRenderer.java Thu Sep 17 10:58:44 2015
@@ -99,7 +99,7 @@ public class FileRenderer extends InputR
writer.startElement(HtmlElements.DIV, file);
writer.writeIdAttribute(clientId);
- writer.writeClassAttribute(Classes.create(file));
+ writer.writeClassAttribute(Classes.create(file), file.getCustomClass());
HtmlRendererUtils.writeDataAttributes(facesContext, writer, file);
writer.writeStyleAttribute(file.getStyle());
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FlexLayoutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FlexLayoutRenderer.java?rev=1703567&r1=1703566&r2=1703567&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FlexLayoutRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FlexLayoutRenderer.java Thu Sep 17 10:58:44 2015
@@ -83,7 +83,8 @@ public class FlexLayoutRenderer extends
b.append("]}");
}
boolean vertically = rows.contains(";");
- writer.writeClassAttribute(Classes.create(flexLayout, vertically ? Markup.VERTICALLY : Markup.NULL));
+ writer.writeClassAttribute(
+ Classes.create(flexLayout, vertically ? Markup.VERTICALLY : Markup.NULL));
// todo: const, utils, etc.
writer.writeAttribute("data-tobago-layout", b.toString(), true);
// writer.writeAttribute("data-tobago-layout", "{\"columns\":[\"auto\",1]}", true);
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FlowLayoutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FlowLayoutRenderer.java?rev=1703567&r1=1703566&r2=1703567&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FlowLayoutRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FlowLayoutRenderer.java Thu Sep 17 10:58:44 2015
@@ -39,7 +39,7 @@ public class FlowLayoutRenderer extends
final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
final UIFlowLayout layout = (UIFlowLayout) component;
writer.startElement(HtmlElements.DIV, layout);
- writer.writeClassAttribute(Classes.create(layout));
+ writer.writeClassAttribute(Classes.create(layout), layout.getCustomClass());
writer.writeStyleAttribute(layout.getStyle());
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FooterRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FooterRenderer.java?rev=1703567&r1=1703566&r2=1703567&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FooterRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/FooterRenderer.java Thu Sep 17 10:58:44 2015
@@ -39,11 +39,10 @@ public class FooterRenderer extends Rend
final UIFooter footer = (UIFooter) component;
writer.startElement(HtmlElements.FOOTER, component);
writer.writeIdAttribute(component.getClientId(facesContext));
- if (footer.isFixed()) {
- writer.writeClassAttribute(Classes.create(footer), BootstrapClass.NAVBAR_FIXED_BOTTOM);
- } else {
- writer.writeClassAttribute(Classes.create(footer));
- }
+ writer.writeClassAttribute(
+ Classes.create(footer),
+ footer.isFixed() ? BootstrapClass.NAVBAR_FIXED_BOTTOM : null,
+ footer.getCustomClass());
}
@Override
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ImageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ImageRenderer.java?rev=1703567&r1=1703566&r2=1703567&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ImageRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ImageRenderer.java Thu Sep 17 10:58:44 2015
@@ -93,12 +93,12 @@ public class ImageRenderer extends Layou
style.setWidth(image.getWidth());
style.setHeight(image.getHeight());
writer.writeStyleAttribute(style);
- if (ComponentUtils.findAncestor(image, UINav.class) != null) { // todo: may set a marker in the context in the
- // todo: NavRenderer, or the additional class, to avoid tree traversing
- writer.writeClassAttribute(Classes.create(image), BootstrapClass.NAVBAR_BRAND);
- } else {
- writer.writeClassAttribute(Classes.create(image));
- }
+ // todo: may set a marker in the context in the
+ // todo: NavRenderer, or the additional class, to avoid tree traversing
+ writer.writeClassAttribute(
+ Classes.create(image),
+ ComponentUtils.findAncestor(image, UINav.class) != null ? BootstrapClass.NAVBAR_BRAND : null,
+ image.getCustomClass());
writer.endElement(HtmlElements.IMG);
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/InRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/InRenderer.java?rev=1703567&r1=1703566&r2=1703567&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/InRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/InRenderer.java Thu Sep 17 10:58:44 2015
@@ -113,7 +113,7 @@ public class InRenderer extends InputRen
writer.writeAttribute(HtmlAttributes.PLACEHOLDER, placeholder, true);
}
- writer.writeClassAttribute(Classes.create(input), BootstrapClass.FORM_CONTROL);
+ writer.writeClassAttribute(Classes.create(input), BootstrapClass.FORM_CONTROL, input.getCustomClass());
writer.writeAttribute(HtmlAttributes.REQUIRED, required);
HtmlRendererUtils.renderFocus(id, input.isFocus(), ComponentUtils.isError(input), facesContext, writer);
writeAdditionalAttributes(facesContext, writer, input);
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/LabelRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/LabelRenderer.java?rev=1703567&r1=1703566&r2=1703567&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/LabelRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/LabelRenderer.java Thu Sep 17 10:58:44 2015
@@ -69,7 +69,7 @@ public class LabelRenderer extends Layou
final String clientId = label.getClientId(facesContext);
writer.startElement(HtmlElements.LABEL, label);
HtmlRendererUtils.writeDataAttributes(facesContext, writer, label);
- writer.writeClassAttribute(Classes.create(label), BootstrapClass.CONTROL_LABEL);
+ writer.writeClassAttribute(Classes.create(label), BootstrapClass.CONTROL_LABEL, label.getCustomClass());
writer.writeStyleAttribute(label.getStyle());
writer.writeIdAttribute(clientId);
if (forValue != null) {
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/LinkRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/LinkRenderer.java?rev=1703567&r1=1703566&r2=1703567&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/LinkRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/LinkRenderer.java Thu Sep 17 10:58:44 2015
@@ -79,7 +79,7 @@ public class LinkRenderer extends Comman
}
HtmlRendererUtils.writeDataAttributes(facesContext, writer, link);
writer.writeStyleAttribute(link.getStyle());
- writer.writeClassAttribute(Classes.create(link));
+ writer.writeClassAttribute(Classes.create(link), link.getCustomClass());
writer.writeIdAttribute(clientId);
writer.writeNameAttribute(clientId);
final String title = HtmlRendererUtils.getTitleFromTipAndMessages(facesContext, link);
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MediatorRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MediatorRenderer.java?rev=1703567&r1=1703566&r2=1703567&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MediatorRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MediatorRenderer.java Thu Sep 17 10:58:44 2015
@@ -43,6 +43,7 @@ public class MediatorRenderer extends La
writer.startElement(HtmlElements.DIV, mediator);
HtmlRendererUtils.writeDataAttributes(facesContext, writer, mediator);
writer.writeStyleAttribute(mediator.getStyle());
+ writer.writeClassAttribute(mediator.getCustomClass());
}
@Override
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MenuBarRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MenuBarRenderer.java?rev=1703567&r1=1703566&r2=1703567&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MenuBarRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MenuBarRenderer.java Thu Sep 17 10:58:44 2015
@@ -42,7 +42,11 @@ public class MenuBarRenderer extends Lay
writer.startElement(HtmlElements.OL, menuBar);
writer.writeIdAttribute(menuBar.getClientId(facesContext));
- writer.writeClassAttribute(Classes.create(menuBar), BootstrapClass.NAV, BootstrapClass.NAVBAR_NAV);
+ writer.writeClassAttribute(
+ Classes.create(menuBar),
+ BootstrapClass.NAV,
+ BootstrapClass.NAVBAR_NAV,
+ menuBar.getCustomClass());
HtmlRendererUtils.writeDataAttributes(facesContext, writer, menuBar);
final Style style = menuBar.getStyle();
writer.writeStyleAttribute(style);
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MenuRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MenuRenderer.java?rev=1703567&r1=1703566&r2=1703567&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MenuRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MenuRenderer.java Thu Sep 17 10:58:44 2015
@@ -64,7 +64,7 @@ public class MenuRenderer extends Layout
final boolean isParentMenu = menu.getChildCount() > 0; // todo: may be not correct
writer.startElement(HtmlElements.LI, menu);
- writer.writeClassAttribute(Classes.create(menu), BootstrapClass.DROPDOWN);
+ writer.writeClassAttribute(Classes.create(menu), BootstrapClass.DROPDOWN, menu.getCustomClass());
StringBuilder backgroundImage = null;
StringBuilder backgroundPosition = null;
if (menu.getImage() != null) {
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MessagesRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MessagesRenderer.java?rev=1703567&r1=1703566&r2=1703567&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MessagesRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/MessagesRenderer.java Thu Sep 17 10:58:44 2015
@@ -250,7 +250,7 @@ public class MessagesRenderer extends La
}
writer.writeAttribute(HtmlAttributes.TITLE, detail, true);
final Markup markup = ComponentUtils.markupOfSeverity(message.getSeverity());
- writer.writeClassAttribute(Classes.create(messages, "item", markup));
+ writer.writeClassAttribute(Classes.create(messages, "item", markup), messages.getCustomClass());
boolean writeEmptyText = true;
if (summary != null && messages.isShowSummary()) {
writer.writeText(summary);
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ObjectRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ObjectRenderer.java?rev=1703567&r1=1703566&r2=1703567&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ObjectRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ObjectRenderer.java Thu Sep 17 10:58:44 2015
@@ -53,7 +53,7 @@ public class ObjectRenderer extends Layo
} else {
writer.writeAttribute(HtmlAttributes.SRC, ResourceManagerUtils.getBlankPage(facesContext), false);
}
- writer.writeClassAttribute(Classes.create(object));
+ writer.writeClassAttribute(Classes.create(object), object.getCustomClass());
writer.writeStyleAttribute(object.getStyle());
String noframes = ResourceManagerUtils.getPropertyNotNull(
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/OutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/OutRenderer.java?rev=1703567&r1=1703566&r2=1703567&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/OutRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/OutRenderer.java Thu Sep 17 10:58:44 2015
@@ -58,7 +58,7 @@ public class OutRenderer extends LabelLa
writer.writeIdAttribute(id);
HtmlRendererUtils.writeDataAttributes(facesContext, writer, out);
writer.writeStyleAttribute(out.getStyle());
- writer.writeClassAttribute(Classes.create(out), BootstrapClass.FORM_CONTROL_STATIC);
+ writer.writeClassAttribute(Classes.create(out), BootstrapClass.FORM_CONTROL_STATIC, out.getCustomClass());
final String title = HtmlRendererUtils.getTitleFromTipAndMessages(facesContext, out);
if (title != null) {
writer.writeAttribute(HtmlAttributes.TITLE, title, true);
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/PageRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/PageRenderer.java?rev=1703567&r1=1703566&r2=1703567&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/PageRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/PageRenderer.java Thu Sep 17 10:58:44 2015
@@ -225,13 +225,11 @@ public class PageRenderer extends Layout
writer.endElement(HtmlElements.HEAD);
}
- if (portlet) {
- writer.startElement(HtmlElements.DIV, page);
- writer.writeClassAttribute(Classes.create(page, Markup.PORTLET), BootstrapClass.CONTAINER_FLUID);
- } else {
- writer.startElement(HtmlElements.BODY, page);
- writer.writeClassAttribute(Classes.create(page), BootstrapClass.CONTAINER_FLUID);
- }
+ writer.startElement(portlet ? HtmlElements.DIV : HtmlElements.BODY, page);
+ writer.writeClassAttribute(
+ portlet ? Classes.create(page, Markup.PORTLET) : Classes.create(page),
+ BootstrapClass.CONTAINER_FLUID,
+ page.getCustomClass());
writer.writeIdAttribute(clientId);
HtmlRendererUtils.writeDataAttributes(facesContext, writer, page);
HtmlRendererUtils.renderCommandFacet(page, facesContext, writer);
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/PanelRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/PanelRenderer.java?rev=1703567&r1=1703566&r2=1703567&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/PanelRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/PanelRenderer.java Thu Sep 17 10:58:44 2015
@@ -22,13 +22,11 @@ package org.apache.myfaces.tobago.render
import org.apache.myfaces.tobago.component.Facets;
import org.apache.myfaces.tobago.component.UIPanel;
import org.apache.myfaces.tobago.component.UIReload;
-import org.apache.myfaces.tobago.internal.component.AbstractUISegmentLayout;
import org.apache.myfaces.tobago.internal.component.AbstractUIPanel;
import org.apache.myfaces.tobago.internal.util.FacesContextUtils;
import org.apache.myfaces.tobago.layout.Measure;
import org.apache.myfaces.tobago.renderkit.LayoutComponentRendererBase;
import org.apache.myfaces.tobago.renderkit.css.Classes;
-import org.apache.myfaces.tobago.renderkit.css.BootstrapClass;
import org.apache.myfaces.tobago.renderkit.html.DataAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
@@ -70,12 +68,7 @@ public class PanelRenderer extends Layou
writer.startElement(HtmlElements.DIV, panel);
writer.writeIdAttribute(clientId);
- if (panel.getLayoutManager() instanceof AbstractUISegmentLayout) {
- // TBD: this might be nicer, wen using the layout not as a facet
- writer.writeClassAttribute(Classes.create(panel), BootstrapClass.ROW);
- } else {
- writer.writeClassAttribute(Classes.create(panel));
- }
+ writer.writeClassAttribute(Classes.create(panel), panel.getCustomClass());
HtmlRendererUtils.writeDataAttributes(facesContext, writer, panel);
if (panel instanceof UIPanel && ((UIPanel) panel).getTip() != null) {
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ProgressRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ProgressRenderer.java?rev=1703567&r1=1703566&r2=1703567&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ProgressRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/ProgressRenderer.java Thu Sep 17 10:58:44 2015
@@ -62,7 +62,7 @@ public class ProgressRenderer extends La
final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
writer.startElement(HtmlElements.DIV, progress);
- writer.writeClassAttribute(Classes.create(progress));
+ writer.writeClassAttribute(Classes.create(progress), progress.getCustomClass());
HtmlRendererUtils.writeDataAttributes(facesContext, writer, progress);
writer.writeStyleAttribute(progress.getStyle());
if (title != null) {
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SectionRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SectionRenderer.java?rev=1703567&r1=1703566&r2=1703567&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SectionRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SectionRenderer.java Thu Sep 17 10:58:44 2015
@@ -39,10 +39,10 @@ public class SectionRenderer extends Lay
final UISection section = (UISection) component;
final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
- writer.startElement(HtmlElements.DIV, component);
+ writer.startElement(HtmlElements.DIV, section);
writer.writeIdAttribute(section.getClientId(facesContext));
- writer.writeClassAttribute(Classes.create(component));
- HtmlRendererUtils.writeDataAttributes(facesContext, writer, component);
+ writer.writeClassAttribute(Classes.create(section), section.getCustomClass());
+ HtmlRendererUtils.writeDataAttributes(facesContext, writer, section);
String label = section.getLabelToRender();
CssItem clazz = null;
@@ -68,7 +68,7 @@ public class SectionRenderer extends Lay
tag = HtmlElements.H6;
}
- writer.startElement(tag, component);
+ writer.startElement(tag, section);
if (clazz != null) {
writer.writeClassAttribute(clazz);
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SegmentLayoutRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SegmentLayoutRenderer.java?rev=1703567&r1=1703566&r2=1703567&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SegmentLayoutRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SegmentLayoutRenderer.java Thu Sep 17 10:58:44 2015
@@ -131,7 +131,7 @@ public class SegmentLayoutRenderer exten
FacesContext facesContext, TobagoResponseWriter writer, BootstrapClassGenerator generator, UIComponent child)
throws IOException {
writer.startElement(HtmlElements.DIV, null);
- writer.writeClassAttribute((CssItem)null, generator.generate());
+ writer.writeClassAttribute((CssItem) null, generator.generate());
RenderUtils.encode(facesContext, child);
writer.endElement(HtmlElements.DIV);
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectBooleanCheckboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectBooleanCheckboxRenderer.java?rev=1703567&r1=1703566&r2=1703567&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectBooleanCheckboxRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectBooleanCheckboxRenderer.java Thu Sep 17 10:58:44 2015
@@ -86,7 +86,8 @@ public class SelectBooleanCheckboxRender
writer.writeClassAttribute(
Classes.create(select),
BootstrapClass.CHECKBOX,
- disabled ? BootstrapClass.DISABLED : null);
+ disabled ? BootstrapClass.DISABLED : null,
+ select.getCustomClass());
HtmlRendererUtils.writeDataAttributes(facesContext, writer, select);
if (title != null) {
writer.writeAttribute(HtmlAttributes.TITLE, title, true);
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyCheckboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyCheckboxRenderer.java?rev=1703567&r1=1703566&r2=1703567&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyCheckboxRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyCheckboxRenderer.java Thu Sep 17 10:58:44 2015
@@ -65,7 +65,7 @@ public class SelectManyCheckboxRenderer
writer.startElement(HtmlElements.OL, select);
writer.writeIdAttribute(id);
writer.writeStyleAttribute(select.getStyle());
- writer.writeClassAttribute(Classes.create(select));
+ writer.writeClassAttribute(Classes.create(select), select.getCustomClass());
HtmlRendererUtils.writeDataAttributes(facesContext, writer, select);
if (title != null) {
writer.writeAttribute(HtmlAttributes.TITLE, title, true);
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyListboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyListboxRenderer.java?rev=1703567&r1=1703566&r2=1703567&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyListboxRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyListboxRenderer.java Thu Sep 17 10:58:44 2015
@@ -65,7 +65,7 @@ public class SelectManyListboxRenderer e
writer.writeAttribute(HtmlAttributes.TABINDEX, tabIndex);
}
writer.writeStyleAttribute(select.getStyle());
- writer.writeClassAttribute(Classes.create(select), BootstrapClass.FORM_CONTROL);
+ writer.writeClassAttribute(Classes.create(select), BootstrapClass.FORM_CONTROL, select.getCustomClass());
writer.writeAttribute(HtmlAttributes.MULTIPLE, HtmlAttributes.MULTIPLE, false);
if (title != null) {
writer.writeAttribute(HtmlAttributes.TITLE, title, true);
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyShuttleRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyShuttleRenderer.java?rev=1703567&r1=1703566&r2=1703567&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyShuttleRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectManyShuttleRenderer.java Thu Sep 17 10:58:44 2015
@@ -43,7 +43,7 @@ public class SelectManyShuttleRenderer e
final UISelectManyShuttle select = (UISelectManyShuttle) component;
final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);
writer.startElement(HtmlElements.DIV, select);
- writer.writeClassAttribute(Classes.create(select));
+ writer.writeClassAttribute(Classes.create(select), select.getCustomClass());
final String clientId = select.getClientId(facesContext);
writer.writeIdAttribute(clientId);
HtmlRendererUtils.writeDataAttributes(facesContext, writer, select);
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneChoiceRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneChoiceRenderer.java?rev=1703567&r1=1703566&r2=1703567&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneChoiceRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneChoiceRenderer.java Thu Sep 17 10:58:44 2015
@@ -59,7 +59,7 @@ public class SelectOneChoiceRenderer ext
writer.writeAttribute(HtmlAttributes.TABINDEX, tabIndex);
}
writer.writeStyleAttribute(select.getStyle());
- writer.writeClassAttribute(Classes.create(select), BootstrapClass.FORM_CONTROL);
+ writer.writeClassAttribute(Classes.create(select), BootstrapClass.FORM_CONTROL, select.getCustomClass());
if (title != null) {
writer.writeAttribute(HtmlAttributes.TITLE, title, true);
}
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneListboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneListboxRenderer.java?rev=1703567&r1=1703566&r2=1703567&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneListboxRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneListboxRenderer.java Thu Sep 17 10:58:44 2015
@@ -62,7 +62,7 @@ public class SelectOneListboxRenderer ex
writer.writeAttribute(HtmlAttributes.TABINDEX, tabIndex);
}
writer.writeStyleAttribute(select.getStyle());
- writer.writeClassAttribute(Classes.create(select), BootstrapClass.FORM_CONTROL);
+ writer.writeClassAttribute(Classes.create(select), BootstrapClass.FORM_CONTROL, select.getCustomClass());
final String title = HtmlRendererUtils.getTitleFromTipAndMessages(facesContext, select);
if (title != null) {
writer.writeAttribute(HtmlAttributes.TITLE, title, true);
Modified: myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneRadioRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneRadioRenderer.java?rev=1703567&r1=1703566&r2=1703567&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneRadioRenderer.java (original)
+++ myfaces/tobago/branches/tobago-3.0.x/tobago-theme/tobago-theme-standard/src/main/java/org/apache/myfaces/tobago/renderkit/html/standard/standard/tag/SelectOneRadioRenderer.java Thu Sep 17 10:58:44 2015
@@ -66,7 +66,7 @@ public class SelectOneRadioRenderer exte
writer.startElement(HtmlElements.OL, select);
writer.writeIdAttribute(id);
writer.writeStyleAttribute(select.getStyle());
- writer.writeClassAttribute(Classes.create(select));
+ writer.writeClassAttribute(Classes.create(select), select.getCustomClass());
HtmlRendererUtils.writeDataAttributes(facesContext, writer, select);
if (title != null) {
writer.writeAttribute(HtmlAttributes.TITLE, title, true);