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

Author: maksimkaszynski Date: 2007-11-15 13:49:06 -0500 (Thu, 15 Nov 2007) New Revision: 4028 Modified: trunk/sandbox/ui/contextMenu/src/main/config/component/contextMenu.xml trunk/sandbox/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererBase.java trunk/sandbox/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererDelegate.java Log: moved to javascript rendering Modified: trunk/sandbox/ui/contextMenu/src/main/config/component/contextMenu.xml =================================================================== --- trunk/sandbox/ui/contextMenu/src/main/config/component/contextMenu.xml 2007-11-15 18:48:54 UTC (rev 4027) +++ trunk/sandbox/ui/contextMenu/src/main/config/component/contextMenu.xml 2007-11-15 18:49:06 UTC (rev 4028) @@ -12,7 +12,7 @@ <renderer> <name>org.richfaces.DropDownMenuRenderer</name> - <classname>org.richfaces.renderkit.html.ContextMenuRendererDelegate</classname> + <classname>org.richfaces.renderkit.html.ContextMenuRendererBase</classname> </renderer> <tag> <name>contextMenu</name> Modified: trunk/sandbox/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererBase.java =================================================================== --- trunk/sandbox/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererBase.java 2007-11-15 18:48:54 UTC (rev 4027) +++ trunk/sandbox/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererBase.java 2007-11-15 18:49:06 UTC (rev 4028) @@ -25,44 +25,69 @@ import javax.faces.component.UIComponent; import javax.faces.context.FacesContext; +import javax.faces.context.ResponseWriter; +import org.ajax4jsf.renderkit.RendererUtils.HTML; +import org.ajax4jsf.resource.InternetResource; import org.richfaces.renderkit.TemplateEncoderRendererBase; /** * @author Maksim Kaszynski * */ -public abstract class ContextMenuRendererBase extends +public class ContextMenuRendererBase extends TemplateEncoderRendererBase { - private final ContextMenuRendererDelegate delegate = new ContextMenuRendererDelegate(); + + private final InternetResource[] ownScripts = { + getResource("/org/richfaces/renderkit/html/scripts/json/json-dom.js") + }; + private final InternetResource[] scripts; + + public ContextMenuRendererBase() { + InternetResource[] delegateScripts = delegate.getScripts(); + scripts = new InternetResource[delegateScripts.length + ownScripts.length]; + + System.arraycopy(delegateScripts, 0, scripts, 0, delegateScripts.length); + System.arraycopy(ownScripts, 0, scripts, delegateScripts.length, ownScripts.length); + } + @Override + protected InternetResource[] getScripts() { + return scripts; + } + + @Override + protected InternetResource[] getStyles() { + return delegate.getStyles(); + } + + @Override protected Class<? extends UIComponent> getComponentClass() { return delegate.getComponentClass(); } @Override - public void encodeBegin(FacesContext context, UIComponent component) - throws IOException { - super.encodeBegin(context, component); + protected void doEncodeBegin(ResponseWriter writer, FacesContext context, + UIComponent component) throws IOException { + writer.startElement(HTML.DIV_ELEM, component); + writer.writeAttribute(HTML.id_ATTRIBUTE, component.getClientId(context), "id"); } + @Override - public void encodeChildren(FacesContext context, UIComponent component) + public void renderChildren(FacesContext context, UIComponent component) throws IOException { - // TODO Auto-generated method stub - super.encodeChildren(context, component); + delegate.encodeChildren(context, component); } + @Override - public void encodeEnd(FacesContext context, UIComponent component) - throws IOException { - // TODO Auto-generated method stub - super.encodeEnd(context, component); + protected void doEncodeEnd(ResponseWriter writer, FacesContext context, + UIComponent component) throws IOException { + writer.endElement(HTML.DIV_ELEM); } - - } Modified: trunk/sandbox/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererDelegate.java =================================================================== --- trunk/sandbox/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererDelegate.java 2007-11-15 18:48:54 UTC (rev 4027) +++ trunk/sandbox/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererDelegate.java 2007-11-15 18:49:06 UTC (rev 4028) @@ -68,6 +68,7 @@ subMenuOptions.addEventHandler("onopen"); subMenuOptions.addEventHandler("onclose"); subMenuOptions.addOption("direction"); + subMenuOptions.addOption("dummy", "dummy"); function.addParameter(subMenuOptions); function.appendScript(buffer); @@ -93,6 +94,8 @@ menuOptions.addEventHandler("onexpand"); menuOptions.addEventHandler("onitemselect"); menuOptions.addEventHandler("ongroupactivate"); + + menuOptions.addOption("dummy", "dummy"); function.addParameter(menuOptions); function.appendScript(buffer);