You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mm...@apache.org on 2006/09/20 21:02:49 UTC

svn commit: r448302 - /myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tabbedpane/HtmlTabbedPaneRenderer.java

Author: mmarinschek
Date: Wed Sep 20 12:02:49 2006
New Revision: 448302

URL: http://svn.apache.org/viewvc?view=rev&rev=448302
Log:
fix for [TOMAHAWK-592] panelTabbedPane: Duplicate class attributes. Thanks to John Singleton.

Modified:
    myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tabbedpane/HtmlTabbedPaneRenderer.java

Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tabbedpane/HtmlTabbedPaneRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tabbedpane/HtmlTabbedPaneRenderer.java?view=diff&rev=448302&r1=448301&r2=448302
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tabbedpane/HtmlTabbedPaneRenderer.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/custom/tabbedpane/HtmlTabbedPaneRenderer.java Wed Sep 20 12:02:49 2006
@@ -341,12 +341,14 @@
 
         writer.startElement(HTML.TABLE_ELEM, tabbedPane);
         writer.writeAttribute(HTML.ID_ATTR, getTableStylableId(tabbedPane,facesContext), null);
-        writer.writeAttribute(HTML.CLASS_ATTR, "myFaces_panelTabbedPane", null);
+        String oldTabbedStyleClass = tabbedPane.getStyleClass();
+        tabbedPane.setStyleClass ((oldTabbedStyleClass == null) ? "myFaces_panelTabbedPane" : "myFaces_panelTabbedPane " + oldTabbedStyleClass);
         writer.writeAttribute(HTML.CELLSPACING_ATTR, "0", null);
         HtmlRendererUtils.renderHTMLAttributes(writer, tabbedPane, HTML.TABLE_PASSTHROUGH_ATTRIBUTES);
         writer.flush();
 
         tabbedPane.setBgcolor(oldBgColor);
+        tabbedPane.setStyleClass(oldTabbedStyleClass);
     }
 
     /**