You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2011/08/29 21:02:32 UTC
svn commit: r1162947 - in
/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit:
RendererUtils.java html/HtmlGridRendererBase.java
html/HtmlRendererUtils.java html/HtmlTableRendererBase.java
Author: lu4242
Date: Mon Aug 29 19:02:32 2011
New Revision: 1162947
URL: http://svn.apache.org/viewvc?rev=1162947&view=rev
Log:
MYFACES-3295 Replace RendererUtils.renderChild() by UIComponent.encodeAll()
Modified:
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java
myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java?rev=1162947&r1=1162946&r2=1162947&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/RendererUtils.java Mon Aug 29 19:02:32 2011
@@ -522,12 +522,20 @@ public final class RendererUtils
for (int i = 0; i < childCount; i++)
{
UIComponent child = component.getChildren().get(i);
- renderChild(facesContext, child);
+ //renderChild(facesContext, child);
+ child.encodeAll(facesContext);
}
}
}
-
+ /**
+ *
+ * @param facesContext
+ * @param child
+ * @throws IOException
+ * @deprecated use UIComponent.encodeAll() instead
+ */
+ @Deprecated
public static void renderChild(FacesContext facesContext, UIComponent child)
throws IOException
{
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java?rev=1162947&r1=1162946&r2=1162947&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlGridRendererBase.java Mon Aug 29 19:02:32 2011
@@ -209,7 +209,8 @@ public class HtmlGridRendererBase
writer.writeAttribute(HTML.COLSPAN_ATTR, Integer.toString(columns), null);
HtmlRendererUtils.writePrettyLineSeparator(context);
- RendererUtils.renderChild(context, facet);
+ //RendererUtils.renderChild(context, facet);
+ facet.encodeAll(context);
HtmlRendererUtils.writePrettyLineSeparator(context);
writer.endElement(header ? HTML.TH_ELEM : HTML.TD_ELEM);
@@ -331,7 +332,8 @@ public class HtmlGridRendererBase
writer.writeAttribute(HTML.CLASS_ATTR, columnClassesArray[columnIndex], null);
}
columnIndex = childAttributes(context, writer, child, columnIndex);
- RendererUtils.renderChild(context, child);
+ //RendererUtils.renderChild(context, child);
+ child.encodeAll(context);
writer.endElement(HTML.TD_ELEM);
columnIndex++;
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java?rev=1162947&r1=1162946&r2=1162947&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java Mon Aug 29 19:02:32 2011
@@ -927,7 +927,8 @@ public final class HtmlRendererUtils {
writer.writeAttribute(HTML.STYLE_ATTR, captionStyle, null);
}
- RendererUtils.renderChild(context, captionFacet);
+ //RendererUtils.renderChild(context, captionFacet);
+ captionFacet.encodeAll(context);
writer.endElement(HTML.CAPTION_ELEM);
}
Modified: myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java?rev=1162947&r1=1162946&r2=1162947&view=diff
==============================================================================
--- myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java (original)
+++ myfaces/core/trunk/shared/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlTableRendererBase.java Mon Aug 29 19:02:32 2011
@@ -225,7 +225,8 @@ public class HtmlTableRendererBase exten
}
// render the facet
HtmlRendererUtils.writePrettyLineSeparator(facesContext);
- RendererUtils.renderChild(facesContext, colgroupsFacet);
+ //RendererUtils.renderChild(facesContext, colgroupsFacet);
+ colgroupsFacet.encodeAll(facesContext);
}
/**
@@ -501,7 +502,8 @@ public class HtmlTableRendererBase exten
{
writer.writeAttribute(HTML.CLASS_ATTR, styles.getColumnStyle(columnStyleIndex), null);
}
- RendererUtils.renderChild(facesContext, component);
+ //RendererUtils.renderChild(facesContext, component);
+ component.encodeAll(facesContext);
if(rowHeader)
{
writer.endElement(HTML.TH_ELEM);
@@ -919,7 +921,8 @@ public class HtmlTableRendererBase exten
}
if (facet != null)
{
- RendererUtils.renderChild(facesContext, facet);
+ //RendererUtils.renderChild(facesContext, facet);
+ facet.encodeAll(facesContext);
}
writer.endElement(colElementName);
writer.endElement(HTML.TR_ELEM);
@@ -971,7 +974,8 @@ public class HtmlTableRendererBase exten
if(spacer == null) return;
writer.startElement(HTML.TD_ELEM, component);
- RendererUtils.renderChild(facesContext, spacer);
+ //RendererUtils.renderChild(facesContext, spacer);
+ spacer.encodeAll(facesContext);
writer.endElement(HTML.TD_ELEM);
}
@@ -1067,7 +1071,8 @@ public class HtmlTableRendererBase exten
if (facet != null)
{
- RendererUtils.renderChild(facesContext, facet);
+ //RendererUtils.renderChild(facesContext, facet);
+ facet.encodeAll(facesContext);
}
writer.endElement(determineHeaderCellTag(facesContext, uiComponent.getParent()));
}
@@ -1118,7 +1123,8 @@ public class HtmlTableRendererBase exten
}
if (facet != null)
{
- RendererUtils.renderChild(facesContext, facet);
+ //RendererUtils.renderChild(facesContext, facet);
+ facet.encodeAll(facesContext);
}
writer.endElement(HTML.TD_ELEM);
}