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/02/17 08:37:16 UTC
svn commit: r1660310 - in /myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main: java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/ resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/

Author: lofwyr
Date: Tue Feb 17 07:37:16 2015
New Revision: 1660310

URL: http://svn.apache.org/r1660310
Log:
TOBAGO-1442: Backward compatibility BoxRenderer
(and minor cleanup)

Modified:
    myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java
    myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java?rev=1660310&r1=1660309&r2=1660310&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/java/org/apache/myfaces/tobago/renderkit/html/speyside/standard/tag/BoxRenderer.java Tue Feb 17 07:37:16 2015
@@ -116,16 +116,7 @@ without shadow
       writer.writeStyleAttribute(border);
     }
 
-    final UIComponent label = box.getFacet(Facets.LABEL);
-    writer.startElement(HtmlElements.DIV, null);
-    writer.writeClassAttribute(Classes.create(box, "header"));
-    final String labelString = (String) box.getAttributes().get(Attributes.LABEL);
-    if (label != null) {
-      RenderUtils.encode(facesContext, label);
-    } else if (labelString != null) {
-      writer.writeText(labelString);
-    }
-    writer.endElement(HtmlElements.DIV);
+    renderBoxHeader(facesContext, writer, box);
 
     final UIMenuBar menuBar = ComponentUtils.findFacetDescendant(box, Facets.MENUBAR, UIMenuBar.class);
     if (menuBar != null) {
@@ -158,6 +149,20 @@ without shadow
     writer.writeStyleAttribute(style);
   }
 
+  protected void renderBoxHeader(FacesContext facesContext, TobagoResponseWriter writer, UIComponent box)
+      throws IOException {
+    final UIComponent label = box.getFacet(Facets.LABEL);
+    writer.startElement(HtmlElements.DIV, null);
+    writer.writeClassAttribute(Classes.create(box, "header"));
+    final String labelString = (String) box.getAttributes().get(Attributes.LABEL);
+    if (label != null) {
+      RenderUtils.encode(facesContext, label);
+    } else if (labelString != null) {
+      writer.writeText(labelString);
+    }
+    writer.endElement(HtmlElements.DIV);
+  }
+
   @Override
   public void encodeEnd(final FacesContext facesContext, final UIComponent component) throws IOException {
     final TobagoResponseWriter writer = HtmlRendererUtils.getTobagoResponseWriter(facesContext);

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties?rev=1660310&r1=1660309&r2=1660310&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-speyside/src/main/resources/org/apache/myfaces/tobago/renderkit/html/speyside/standard/property/tobago-theme-config.properties Tue Feb 17 07:37:16 2015
@@ -22,7 +22,6 @@ Tobago.labelWidth=120
 Tobago.labelSpace=5
 Tobago.fixedHeight=20
 
-Box.headerHeight=20
 Box.componentExtraWidth=0
 Box.componentExtraHeight=0
 Box.borderLeft=1