From richfaces-svn-commits at lists.jboss.org Fri Jun 13 10:29:07 2008
Content-Type: multipart/mixed; boundary="===============5263127669672705232=="
MIME-Version: 1.0
From: richfaces-svn-commits at lists.jboss.org
To: richfaces-svn-commits at lists.jboss.org
Subject: [richfaces-svn-commits] JBoss Rich Faces SVN: r9034 - in
 trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit: html and 1 other
 directory.
Date: Fri, 13 Jun 2008 10:29:07 -0400
Message-ID: <E1K7AH5-000258-By@committer01.frg.pub.inap.atl.jboss.com>

--===============5263127669672705232==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

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/PanelMenuRender=
erBase.java
   trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuG=
roupRenderer.java
   trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenuR=
enderer.java
Log:
http://jira.jboss.com/jira/browse/RF-3656

Modified: trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/PanelMen=
uRendererBase.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRende=
rerBase.java	2008-06-13 14:24:05 UTC (rev 9033)
+++ trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/PanelMenuRende=
rerBase.java	2008-06-13 14:29:07 UTC (rev 9034)
@@ -172,7 +172,7 @@
 	public void insertLabel(FacesContext context, UIComponent component) thro=
ws IOException {
 		Object value =3D component.getAttributes().get("label");
 		if (value!=3Dnull){
-			context.getResponseWriter().write(value.toString());
+			context.getResponseWriter().writeText(value, null);
 		}
 	}
 	=


Modified: trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/Pan=
elMenuGroupRenderer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenu=
GroupRenderer.java	2008-06-13 14:24:05 UTC (rev 9033)
+++ trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenu=
GroupRenderer.java	2008-06-13 14:29:07 UTC (rev 9034)
@@ -208,7 +208,7 @@
 	public void insertLabel(FacesContext context, UIComponent component) thro=
ws IOException {
 		Object label =3D component.getAttributes().get("label");
 		if (label!=3Dnull){
-			context.getResponseWriter().write(label.toString());
+			context.getResponseWriter().writeText(label, null);
 		}
 	}
 =


Modified: trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/Pan=
elMenuRenderer.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenu=
Renderer.java	2008-06-13 14:24:05 UTC (rev 9033)
+++ trunk/ui/panelmenu/src/main/java/org/richfaces/renderkit/html/PanelMenu=
Renderer.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 =3D new StringBuffer();
-		ret.append("<script ");
-		ret.append("type=3D\"text/javascript\" ");
-		ret.append("id =3D\"script" + component.getClientId(context)+"\">\n");
-		ret.append(panelMenu);
-		ret.append(buffer);
-		ret.append("\n</script>");
 		=

-		ResponseWriter writer 	=3D context.getResponseWriter();
-		writer.write(ret.toString());
+		ResponseWriter writer =3D context.getResponseWriter();
+		writer.startElement(HTML.SCRIPT_ELEM, component);
+		writer.writeAttribute(HTML.id_ATTRIBUTE, "script" + component.getClientI=
d(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 initialL=
evel) {


--===============5263127669672705232==--