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/01/09 12:26:05 UTC
svn commit: r367273 - in
/myfaces/tomahawk/trunk/tomahawk/src/main/java/org/apache/myfaces:
component/html/ext/HtmlSelectManyCheckbox.java
custom/navmenu/htmlnavmenu/HtmlNavigationMenuRenderer.java
Author: mmarinschek
Date: Mon Jan 9 03:25:53 2006
New Revision: 367273
URL: http://svn.apache.org/viewcvs?rev=367273&view=rev
Log:
optimized navigationmenurenderer, got rid of system.out.print in HtmlSelectManyCheckbox
Modified:
myfaces/tomahawk/trunk/tomahawk/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectManyCheckbox.java
myfaces/tomahawk/trunk/tomahawk/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlNavigationMenuRenderer.java
Modified: myfaces/tomahawk/trunk/tomahawk/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectManyCheckbox.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/tomahawk/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectManyCheckbox.java?rev=367273&r1=367272&r2=367273&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/tomahawk/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectManyCheckbox.java (original)
+++ myfaces/tomahawk/trunk/tomahawk/src/main/java/org/apache/myfaces/component/html/ext/HtmlSelectManyCheckbox.java Mon Jan 9 03:25:53 2006
@@ -41,7 +41,6 @@
String clientId = HtmlComponentUtils.getClientId(this, getRenderer(context), context);
if (clientId == null)
{
- System.out.println("Getting new id for " + this.getId() + " NOT FORCED");
clientId = super.getClientId(context);
}
Modified: myfaces/tomahawk/trunk/tomahawk/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlNavigationMenuRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/tomahawk/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlNavigationMenuRenderer.java?rev=367273&r1=367272&r2=367273&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/tomahawk/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlNavigationMenuRenderer.java (original)
+++ myfaces/tomahawk/trunk/tomahawk/src/main/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlNavigationMenuRenderer.java Mon Jan 9 03:25:53 2006
@@ -132,7 +132,7 @@
HtmlPanelNavigationMenu panelNavPrev = findPreviousPanelNav(facesContext, panelNav);
if (panelNavPrev != null)
{
- restoreOpenActiveStates(facesContext, panelNavPrev, panelNav, panelNavPrev.getChildren());
+ restoreOpenActiveStates(facesContext, panelNav, panelNavPrev.getChildren());
}
}
}
@@ -147,7 +147,7 @@
}
}
- private void restoreOpenActiveStates(FacesContext facesContext, HtmlPanelNavigationMenu panelNavPrev,
+ private void restoreOpenActiveStates(FacesContext facesContext,
HtmlPanelNavigationMenu panelNav, List children)
{
for (int i = 0, size = children.size(); i < size; i++)
@@ -167,7 +167,7 @@
item.setOpen(prevItem.isOpen());
item.toggleOpen();
if (prevItem.isOpen())
- restoreOpenActiveStates(facesContext, panelNavPrev, panelNav, prevItem.getChildren());
+ restoreOpenActiveStates(facesContext, panelNav, prevItem.getChildren());
}
}
}
@@ -209,15 +209,14 @@
}
}
- private void renderTableLayout(FacesContext facesContext, HtmlPanelNavigationMenu component) throws IOException
+ private void renderTableLayout(FacesContext facesContext, HtmlPanelNavigationMenu panelNav) throws IOException
{
ResponseWriter writer = facesContext.getResponseWriter();
- HtmlPanelNavigationMenu panelNav = (HtmlPanelNavigationMenu)component;
if (panelNav.getChildCount() > 0)
{
HtmlRendererUtils.writePrettyLineSeparator(facesContext);
- writer.startElement(HTML.TABLE_ELEM, component);
+ writer.startElement(HTML.TABLE_ELEM, panelNav);
HtmlRendererUtils.renderHTMLAttributes(writer, panelNav, HTML.TABLE_PASSTHROUGH_ATTRIBUTES);
if (panelNav.getStyle() == null && panelNav.getStyleClass() == null)
{