svn commit: r1701198 - /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

[lo...@apache.org]

Author: lofwyr
Date: Fri Sep  4 09:51:53 2015
New Revision: 1701198

URL: http://svn.apache.org/r1701198
Log:
TOBAGO-1368: Create a new theme which uses Bootstrap 
- separator implementation

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/SeparatorRenderer.java

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/SeparatorRenderer.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/SeparatorRenderer.java?rev=1701198&r1=1701197&r2=1701198&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/SeparatorRenderer.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/SeparatorRenderer.java Fri Sep  4 09:51:53 2015
@@ -23,9 +23,7 @@ import org.apache.myfaces.tobago.compone
 import org.apache.myfaces.tobago.component.UILabel;
 import org.apache.myfaces.tobago.component.UISeparator;
 import org.apache.myfaces.tobago.config.Configurable;
-import org.apache.myfaces.tobago.context.ClientProperties;
 import org.apache.myfaces.tobago.internal.util.Deprecation;
-import org.apache.myfaces.tobago.internal.util.StringUtils;
 import org.apache.myfaces.tobago.layout.Measure;
 import org.apache.myfaces.tobago.renderkit.LayoutComponentRendererBase;
 import org.apache.myfaces.tobago.renderkit.css.Classes;
@@ -50,41 +48,18 @@ public class SeparatorRenderer extends L
     String label = getLabel(separator);
 
     if (label != null) {
-      if (ClientProperties.getInstance(facesContext).getUserAgent().isMsie()) {
-        label = StringUtils.replace(label, " ", HtmlRendererUtils.CHAR_NON_BEAKING_SPACE);
-      }
-
-      writer.startElement(HtmlElements.TABLE, component);
+      writer.startElement(HtmlElements.FIELDSET, component);
       writer.writeAttribute(HtmlAttributes.ROLE, HtmlRoleValues.PRESENTATION.toString(), false);
       writer.writeIdAttribute(separator.getClientId(facesContext));
       writer.writeClassAttribute(Classes.create(component));
       HtmlRendererUtils.writeDataAttributes(facesContext, writer, component);
-      final Style style = new Style(facesContext, separator);
-      writer.writeStyleAttribute(style);
-
-      writer.writeAttribute(HtmlAttributes.CELLPADDING, "0", false);
-      writer.writeAttribute(HtmlAttributes.CELLSPACING, "0", false);
-      writer.startElement(HtmlElements.TR, component);
-
-      writer.startElement(HtmlElements.TD, component);
-      writer.writeClassAttribute(Classes.create(component, "start"));
-      writer.startElement(HtmlElements.HR , component);
-      writer.endElement(HtmlElements.HR);
-      writer.endElement(HtmlElements.TD);
 
-      writer.startElement(HtmlElements.TD, component);
+      writer.startElement(HtmlElements.LEGEND, component);
       writer.writeClassAttribute(Classes.create(component, "label"));
       writer.writeText(label);
-      writer.endElement(HtmlElements.TD);
-
-      writer.startElement(HtmlElements.TD, component);
-      writer.writeClassAttribute(Classes.create(component, "end"));
-      writer.startElement(HtmlElements.HR , component);
-      writer.endElement(HtmlElements.HR);
-      writer.endElement(HtmlElements.TD);
+      writer.endElement(HtmlElements.LEGEND);
 
-      writer.endElement(HtmlElements.TR);
-      writer.endElement(HtmlElements.TABLE);
+      writer.endElement(HtmlElements.FIELDSET);
     } else {
       writer.startElement(HtmlElements.HR , component);
       writer.writeIdAttribute(separator.getClientId(facesContext));