You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@myfaces.apache.org by ba...@apache.org on 2005/09/22 11:25:34 UTC

svn commit: r290917 - /myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/navigation/HtmlNavigationRenderer.java

Author: baranda
Date: Thu Sep 22 02:25:28 2005
New Revision: 290917

URL: http://svn.apache.org/viewcvs?rev=290917&view=rev
Log:
Fixes MYFACES-600

Modified:
    myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/navigation/HtmlNavigationRenderer.java

Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/navigation/HtmlNavigationRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/navigation/HtmlNavigationRenderer.java?rev=290917&r1=290916&r2=290917&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/navigation/HtmlNavigationRenderer.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/navigation/HtmlNavigationRenderer.java Thu Sep 22 02:25:28 2005
@@ -91,7 +91,10 @@
             HtmlRendererUtils.writePrettyLineSeparator(facesContext);
             writer.startElement(HTML.TABLE_ELEM, component);
             HtmlRendererUtils.renderHTMLAttributes(writer, panelNav, HTML.TABLE_PASSTHROUGH_ATTRIBUTES);
-            if (panelNav.getStyle() == null && panelNav.getStyleClass() == null)
+            
+            boolean isBorderAlreadyDefined = component.getAttributes().containsKey(HTML.BORDER_ATTR);
+            
+            if (panelNav.getStyle() == null && panelNav.getStyleClass() == null && !isBorderAlreadyDefined)
             {
                 writer.writeAttribute(HTML.BORDER_ATTR, ZERO_INTEGER, null);
             }