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 2005/08/23 11:12:26 UTC
svn commit: r239380 [3/3] - in /myfaces: examples/trunk/simple/
forrest/trunk/content/xdocs/sandbox/
share/trunk/src/java/org/apache/myfaces/renderkit/html/
tomahawk/trunk/src/java/org/apache/myfaces/component/html/util/
tomahawk/trunk/src/java/org/apa...
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tabbedpane/HtmlTabbedPaneRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tabbedpane/HtmlTabbedPaneRenderer.java?rev=239380&r1=239379&r2=239380&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tabbedpane/HtmlTabbedPaneRenderer.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tabbedpane/HtmlTabbedPaneRenderer.java Tue Aug 23 02:11:59 2005
@@ -289,7 +289,7 @@
String actionURL = viewHandler.getActionURL(facesContext, viewId);
//write out auto form
- writer.startElement(HTML.FORM_ELEM, null);
+ writer.startElement(HTML.FORM_ELEM, tabbedPane);
writer.writeAttribute(HTML.NAME_ATTR, tabbedPane.getClientId(facesContext) + AUTO_FORM_SUFFIX, null);
writer.writeAttribute(HTML.STYLE_ATTR, "display:inline", null);
writer.writeAttribute(HTML.METHOD_ATTR, "post", null);
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tree/renderkit/html/HtmlTreeRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tree/renderkit/html/HtmlTreeRenderer.java?rev=239380&r1=239379&r2=239380&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tree/renderkit/html/HtmlTreeRenderer.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tree/renderkit/html/HtmlTreeRenderer.java Tue Aug 23 02:11:59 2005
@@ -71,7 +71,7 @@
HtmlTree tree = (HtmlTree) component;
HtmlRendererUtils.writePrettyLineSeparator(facesContext);
- writer.startElement(HTML.TABLE_ELEM, null);
+ writer.startElement(HTML.TABLE_ELEM, component);
HtmlRendererUtils.renderHTMLAttributes(writer, tree, HTML.TABLE_PASSTHROUGH_ATTRIBUTES);
writer.writeAttribute(HTML.BORDER_ATTR, ZERO, null);
writer.writeAttribute(HTML.CELLSPACING_ATTR, ZERO, null);
@@ -87,7 +87,7 @@
renderFacet(facesContext, writer, component, true, maxLevel);
// Render children.
- renderChildren(facesContext, writer, tree, childNodes, maxLevel, tree.getIconProvider());
+ renderChildren(facesContext, writer, tree, childNodes, maxLevel, tree.getIconProvider(), component);
// Render footer.
renderFacet(facesContext, writer, component, false, maxLevel);
@@ -227,9 +227,9 @@
* @throws IOException Throws an IOException.
*/
protected void renderChildren(FacesContext facesContext, ResponseWriter writer, HtmlTree tree, List children,
- int maxLevel, IconProvider iconProvider) throws IOException
+ int maxLevel, IconProvider iconProvider, UIComponent component) throws IOException
{
- renderChildren(facesContext, writer, tree, children, maxLevel, iconProvider, 0);
+ renderChildren(facesContext, writer, tree, children, maxLevel, iconProvider, 0, component);
}
/**
@@ -247,7 +247,7 @@
* @throws IOException Throws an IOException.
*/
protected void renderChildren(FacesContext facesContext, ResponseWriter writer, HtmlTree tree, List children,
- int maxLevel, IconProvider iconProvider, int rowClassIndex) throws IOException
+ int maxLevel, IconProvider iconProvider, int rowClassIndex, UIComponent component) throws IOException
{
String rowClasses = tree.getRowClasses();
String columnClasses = tree.getColumnClasses();
@@ -271,7 +271,7 @@
}
HtmlRendererUtils.writePrettyLineSeparator(facesContext);
- writer.startElement(HTML.TR_ELEM, null);
+ writer.startElement(HTML.TR_ELEM, component);
if (rowClassIndex < rowClassesCount)
{
@@ -327,7 +327,7 @@
if (child.getChildCount() > 0)
{
- renderChildren(facesContext, writer, tree, child.getChildren(), maxLevel, iconProvider, rowClassIndex);
+ renderChildren(facesContext, writer, tree, child.getChildren(), maxLevel, iconProvider, rowClassIndex, component);
if (rowClassesCount > 0)
{
rowClassIndex += (child.getChildCount() % rowClassesCount);
@@ -361,7 +361,7 @@
for (int i = 0; i < layout.length - 1; i++)
{
int state = layout[i];
- writer.startElement(HTML.TD_ELEM, null);
+ writer.startElement(HTML.TD_ELEM, child);
String url = getLayoutImage(tree, state);
if ((url != null) && (url.length() > 0))
@@ -396,7 +396,7 @@
}
// command link
- writer.startElement(HTML.TD_ELEM, null);
+ writer.startElement(HTML.TD_ELEM, tree);
int state = layout[layout.length - 1];
String url = getLayoutImage(tree, state);
@@ -438,7 +438,7 @@
if ((url != null) && (url.length() > 0))
{
- writer.startElement(HTML.TD_ELEM, null);
+ writer.startElement(HTML.TD_ELEM, tree);
if (iconClass != null)
{
writer.writeAttribute(HTML.CLASS_ATTR, iconClass, null);
@@ -453,7 +453,7 @@
}
// node label
- writer.startElement(HTML.TD_ELEM, null);
+ writer.startElement(HTML.TD_ELEM, tree);
writer.writeAttribute(HTML.COLSPAN_ATTR, new Integer(labelColSpan), null);
if (child.isSelected() && tree.getSelectedNodeClass() != null)
{
@@ -543,4 +543,4 @@
return tree.getIconNoline();
}
}
-}
\ No newline at end of file
+}
Modified: myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tree2/HtmlTreeRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tree2/HtmlTreeRenderer.java?rev=239380&r1=239379&r2=239380&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tree2/HtmlTreeRenderer.java (original)
+++ myfaces/tomahawk/trunk/src/java/org/apache/myfaces/custom/tree2/HtmlTreeRenderer.java Tue Aug 23 02:11:59 2005
@@ -360,11 +360,11 @@
protected void beforeNodeEncode(FacesContext context, ResponseWriter out, HtmlTree tree)
throws IOException
{
- out.startElement(HTML.TABLE_ELEM, null);
+ out.startElement(HTML.TABLE_ELEM, tree);
out.writeAttribute(HTML.CELLPADDING_ATTR, "0", null);
out.writeAttribute(HTML.CELLSPACING_ATTR, "0", null);
out.writeAttribute(HTML.BORDER_ATTR, "0", null);
- out.startElement(HTML.TR_ELEM, null);
+ out.startElement(HTML.TR_ELEM, tree);
}
protected void afterNodeEncode(FacesContext context, ResponseWriter out)
@@ -589,18 +589,18 @@
String javascriptLocation = (String)component.getAttributes().get(JSFAttr.JAVASCRIPT_LOCATION);
if (javascriptLocation == null)
{
- AddResource.addJavaScriptHere(HtmlTreeRenderer.class, "javascript/tree.js", context);
- AddResource.addJavaScriptHere(HtmlTreeRenderer.class, "javascript/cookielib.js", context);
+ AddResource.addJavaScriptHere(HtmlTreeRenderer.class, "javascript/tree.js", context, component);
+ AddResource.addJavaScriptHere(HtmlTreeRenderer.class, "javascript/cookielib.js", context, component);
}
else
{
- out.startElement(HTML.SCRIPT_ELEM, null);
+ out.startElement(HTML.SCRIPT_ELEM, component);
out.writeAttribute(HTML.TYPE_ATTR, "text/javascript", null);
out.writeAttribute(HTML.SRC_ATTR,
javascriptLocation + "/tree.js", null);
out.endElement(HTML.SCRIPT_ELEM);
- out.startElement(HTML.SCRIPT_ELEM, null);
+ out.startElement(HTML.SCRIPT_ELEM, component);
out.writeAttribute(HTML.TYPE_ATTR, "text/javascript", null);
out.writeAttribute(HTML.SRC_ATTR,
javascriptLocation + "/cookielib.js", null);