You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by to...@apache.org on 2005/09/26 02:25:44 UTC
svn commit: r291500 - in
/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/navmenu/htmlnavmenu:
HtmlNavigationMenuRenderer.java HtmlNavigationMenuRendererUtils.java
Author: tomsp
Date: Sun Sep 25 17:25:40 2005
New Revision: 291500
URL: http://svn.apache.org/viewcvs?rev=291500&view=rev
Log:
new features for panelNavigation
Modified:
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlNavigationMenuRenderer.java
myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlNavigationMenuRendererUtils.java
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlNavigationMenuRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlNavigationMenuRenderer.java?rev=291500&r1=291499&r2=291500&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlNavigationMenuRenderer.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlNavigationMenuRenderer.java Sun Sep 25 17:25:40 2005
@@ -108,6 +108,57 @@
}
}
+ protected void renderListLayout(FacesContext facesContext, HtmlPanelNavigationMenu component) throws IOException
+ {
+ ResponseWriter writer = facesContext.getResponseWriter();
+ HtmlPanelNavigationMenu panelNav = (HtmlPanelNavigationMenu)component;
+
+ if (panelNav.getChildCount() > 0)
+ {
+ HtmlRendererUtils.writePrettyLineSeparator(facesContext);
+ writer.startElement(HTML.UL_ELEM, component);
+ HtmlRendererUtils.renderHTMLAttributes(writer, panelNav, HTML.UL_PASSTHROUGH_ATTRIBUTES);
+
+ HtmlNavigationMenuRendererUtils.renderChildrenListLayout(facesContext, writer, panelNav, panelNav.getChildren(), 0);
+
+ HtmlRendererUtils.writePrettyLineSeparator(facesContext);
+ writer.endElement(HTML.UL_ELEM);
+ }
+ else
+ {
+ if (log.isWarnEnabled()) log.warn("PangelNavaigationMenu without children.");
+ }
+ }
+
+ private void renderTableLayout(FacesContext facesContext, HtmlPanelNavigationMenu component) throws IOException
+ {
+ ResponseWriter writer = facesContext.getResponseWriter();
+ HtmlPanelNavigationMenu panelNav = (HtmlPanelNavigationMenu)component;
+
+ if (panelNav.getChildCount() > 0)
+ {
+ HtmlRendererUtils.writePrettyLineSeparator(facesContext);
+ writer.startElement(HTML.TABLE_ELEM, component);
+ HtmlRendererUtils.renderHTMLAttributes(writer, panelNav, HTML.TABLE_PASSTHROUGH_ATTRIBUTES);
+ if (panelNav.getStyle() == null && panelNav.getStyleClass() == null)
+ {
+ writer.writeAttribute(HTML.BORDER_ATTR, ZERO_INTEGER, null);
+ }
+
+ HtmlNavigationMenuRendererUtils.renderChildrenTableLayout(facesContext, writer, panelNav, panelNav.getChildren(), 0);
+
+ HtmlRendererUtils.writePrettyLineSeparator(facesContext);
+ writer.endElement(HTML.TABLE_ELEM);
+ }
+ else
+ {
+ if (log.isWarnEnabled()) log.warn("PangelNavaigationMenu without children.");
+ }
+ }
+
+ /**
+ * look for UINavigationMenuItem && UISelectItems & create components
+ */
private void preprocessNavigationItems(FacesContext facesContext, UIComponent parent,
UIViewRoot previousViewRoot, List children)
{
@@ -199,58 +250,20 @@
}
else
{
- uiOutput.setValue(HtmlNavigationMenuRendererUtils.getValue(facesContext, "value", uiNavMenuItem.getValue()));
+ Object value = uiNavMenuItem.getValue();
+ if (value != null &&
+ HtmlNavigationMenuRendererUtils.isValueReference(value.toString()))
+ {
+ uiOutput.setValueBinding("value",
+ facesContext.getApplication().createValueBinding(value.toString()));
+ }
+ else
+ {
+ uiOutput.setValue(uiNavMenuItem.getValue());
+ }
}
// process next level
preprocessNavigationItems(facesContext, newItem, previousViewRoot, uiNavMenuItem.getChildren());
- }
- }
-
- protected void renderListLayout(FacesContext facesContext, HtmlPanelNavigationMenu component) throws IOException
- {
- ResponseWriter writer = facesContext.getResponseWriter();
- HtmlPanelNavigationMenu panelNav = (HtmlPanelNavigationMenu)component;
-
- if (panelNav.getChildCount() > 0)
- {
- HtmlRendererUtils.writePrettyLineSeparator(facesContext);
- writer.startElement(HTML.UL_ELEM, component);
- HtmlRendererUtils.renderHTMLAttributes(writer, panelNav, HTML.UL_PASSTHROUGH_ATTRIBUTES);
-
- HtmlNavigationMenuRendererUtils.renderChildrenListLayout(facesContext, writer, panelNav, panelNav.getChildren(), 0);
-
- HtmlRendererUtils.writePrettyLineSeparator(facesContext);
- writer.endElement(HTML.UL_ELEM);
- }
- else
- {
- if (log.isWarnEnabled()) log.warn("PangelNavaigationMenu without children.");
- }
- }
-
- private void renderTableLayout(FacesContext facesContext, HtmlPanelNavigationMenu component) throws IOException
- {
- ResponseWriter writer = facesContext.getResponseWriter();
- HtmlPanelNavigationMenu panelNav = (HtmlPanelNavigationMenu)component;
-
- if (panelNav.getChildCount() > 0)
- {
- HtmlRendererUtils.writePrettyLineSeparator(facesContext);
- writer.startElement(HTML.TABLE_ELEM, component);
- HtmlRendererUtils.renderHTMLAttributes(writer, panelNav, HTML.TABLE_PASSTHROUGH_ATTRIBUTES);
- if (panelNav.getStyle() == null && panelNav.getStyleClass() == null)
- {
- writer.writeAttribute(HTML.BORDER_ATTR, ZERO_INTEGER, null);
- }
-
- HtmlNavigationMenuRendererUtils.renderChildrenTableLayout(facesContext, writer, panelNav, panelNav.getChildren(), 0);
-
- HtmlRendererUtils.writePrettyLineSeparator(facesContext);
- writer.endElement(HTML.TABLE_ELEM);
- }
- else
- {
- if (log.isWarnEnabled()) log.warn("PangelNavaigationMenu without children.");
}
}
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlNavigationMenuRendererUtils.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlNavigationMenuRendererUtils.java?rev=291500&r1=291499&r2=291500&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlNavigationMenuRendererUtils.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/navmenu/htmlnavmenu/HtmlNavigationMenuRendererUtils.java Sun Sep 25 17:25:40 2005
@@ -297,19 +297,7 @@
}
return mb;
}
-
- public static Object getValue(FacesContext facesContext, String key, Object value)
- {
- if (value == null)
- return null;
- String strValue = value.toString();
- if (HtmlNavigationMenuRendererUtils.isValueReference(strValue))
- {
- return facesContext.getApplication().createValueBinding(strValue);
- }
- return value;
- }
-
+
public static boolean isValueReference(String value)
{
if (value == null)