[richfaces-svn-commits] JBoss Rich Faces SVN: r9034 - in trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit: html and 1 other directory.

Author: nbelaevski Date: 2008-06-13 10:29:07 -0400 (Fri, 13 Jun 2008) New Revision: 9034 Modified: trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRendererBase.java trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuRenderer.java Log: http://jira.jboss.com/jira/browse/RF-3656 Modified: trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRendererBase.java =================================================================== --- trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRendererBase.java 2008-06-13 14:24:05 UTC (rev 9033) +++ trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRendererBase.java 2008-06-13 14:29:07 UTC (rev 9034) @@ -172,7 +172,7 @@ public void insertLabel(FacesContext context, UIComponent component) throws IOException { Object value = component.getAttributes().get("label"); if (value!=null){ - context.getResponseWriter().write(value.toString()); + context.getResponseWriter().writeText(value, null); } } Modified: trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java =================================================================== --- trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java 2008-06-13 14:24:05 UTC (rev 9033) +++ trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuGroupRenderer.java 2008-06-13 14:29:07 UTC (rev 9034) @@ -208,7 +208,7 @@ public void insertLabel(FacesContext context, UIComponent component) throws IOException { Object label = component.getAttributes().get("label"); if (label!=null){ - context.getResponseWriter().write(label.toString()); + context.getResponseWriter().writeText(label, null); } } Modified: trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuRenderer.java =================================================================== --- trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuRenderer.java 2008-06-13 14:24:05 UTC (rev 9033) +++ trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuRenderer.java 2008-06-13 14:29:07 UTC (rev 9034) @@ -39,6 +39,7 @@ import org.ajax4jsf.javascript.JSFunction; import org.ajax4jsf.javascript.ScriptUtils; import org.ajax4jsf.renderkit.AjaxRendererUtils; +import org.ajax4jsf.renderkit.RendererUtils.HTML; import org.richfaces.component.UIPanelMenu; import org.richfaces.component.UIPanelMenuGroup; import org.richfaces.component.UIPanelMenuItem; @@ -271,16 +272,14 @@ } } } - StringBuffer ret = new StringBuffer(); - ret.append("<script "); - ret.append("type=\"text/javascript\" "); - ret.append("id =\"script" + component.getClientId(context)+"\">\n"); - ret.append(panelMenu); - ret.append(buffer); - ret.append("\n</script>"); - ResponseWriter writer = context.getResponseWriter(); - writer.write(ret.toString()); + ResponseWriter writer = context.getResponseWriter(); + writer.startElement(HTML.SCRIPT_ELEM, component); + writer.writeAttribute(HTML.id_ATTRIBUTE, "script" + component.getClientId(context), null); + writer.writeAttribute(HTML.TYPE_ATTR, "text/javascript", null); + writer.writeText(panelMenu, null); + writer.writeText(buffer, null); + writer.endElement(HTML.SCRIPT_ELEM); } public void flatten(List children, List flatList, Map levels,int initialLevel) {