Author: awiner
Date: Tue Aug 15 22:22:15 2006
New Revision: 431825
URL: http://svn.apache.org/viewvc?rev=431825&view=rev
Log:
Apply patch for ADFFACES-129: trinidad does not work with jsf 1.1_02 sun ri
<h:commandButton> component
Added:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/HtmlCommandButtonRenderer.java
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderKit.java
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderKit.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderKit.java?rev=431825&r1=431824&r2=431825&view=diff
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderKit.java
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/CoreRenderKit.java
Tue Aug 15 22:22:15 2006
@@ -78,6 +78,7 @@
import org.apache.myfaces.trinidadinternal.agent.TrinidadAgent;
import org.apache.myfaces.trinidadinternal.agent.AgentUtil;
+import
org.apache.myfaces.trinidadinternal.renderkit.htmlBasic.HtmlCommandButtonRenderer;
import org.apache.myfaces.trinidadinternal.share.util.CaboHttpUtils;
import org.apache.myfaces.trinidadinternal.webapp.DispatchServletResponse;
@@ -557,6 +558,12 @@
addRenderer(UICommand.COMPONENT_FAMILY,
"javax.faces.Link",
new HtmlCommandLinkRenderer());
+ // In jsf 1.1_02 the ri FormRenderer writes out script used by
+ // h:commandButton. Since we override the RI FormRenderer, we also
+ // need to override the commandButton renderer:
+ addRenderer(UICommand.COMPONENT_FAMILY,
+ "javax.faces.Button",
+ new HtmlCommandButtonRenderer());
}
Added:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/HtmlCommandButtonRenderer.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/HtmlCommandButtonRenderer.java?rev=431825&view=auto
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/HtmlCommandButtonRenderer.java
(added)
+++
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/htmlBasic/HtmlCommandButtonRenderer.java
Tue Aug 15 22:22:15 2006
@@ -0,0 +1,147 @@
+package org.apache.myfaces.trinidadinternal.renderkit.htmlBasic;
+
+import java.io.IOException;
+
+import java.util.Map;
+
+import javax.faces.component.UICommand;
+import javax.faces.component.UIComponent;
+import javax.faces.context.FacesContext;
+import javax.faces.context.ResponseWriter;
+import javax.faces.event.ActionEvent;
+
+import javax.faces.render.Renderer;
+
+import org.apache.myfaces.trinidadinternal.renderkit.RenderingContext;
+import
org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.AutoSubmitUtils;
+import org.apache.myfaces.trinidadinternal.renderkit.core.xhtml.XhtmlUtils;
+
+public class HtmlCommandButtonRenderer extends Renderer
+{
+ public HtmlCommandButtonRenderer()
+ {
+ }
+
+ public void encodeBegin(FacesContext context,
+ UIComponent component)
+ throws IOException
+ {
+ if (!component.isRendered())
+ {
+ return;
+ }
+
+ Map attrs = component.getAttributes();
+ UICommand command = (UICommand) component;
+ // Which button type (SUBMIT, RESET, or BUTTON) should we generate?
+ String type = (String) attrs.get("type");
+ if (type == null)
+ {
+ type = "submit";
+ }
+
+ ResponseWriter writer = context.getResponseWriter();
+
+ Object value = command.getValue();
+ String label = (value != null) ? value.toString() : "";
+
+ String imageSrc = (String) attrs.get("image");
+ writer.startElement("input", component);
+ String id = component.getClientId(context);
+ writer.writeAttribute("id", id, "id");
+ writer.writeAttribute("name", id, null);
+ if (imageSrc != null)
+ {
+ writer.writeAttribute("type", "image", "type");
+ writer.writeURIAttribute("src", imageSrc, "image");
+ }
+ else
+ {
+ writer.writeAttribute("type", type.toLowerCase(), "type");
+ writer.writeAttribute("value", label, "value");
+ }
+
+ RenderingContext arc = RenderingContext.getCurrentInstance();
+ String script = AutoSubmitUtils.getFullPageSubmitScript(
+ arc, id, false,
+ null/*no event*/,
+ null,
+ false/* return false*/);
+ String onclick = (String) attrs.get("onclick");
+ script = XhtmlUtils.getChainedJS(onclick, script, true);
+
+ writer.writeAttribute("onclick", script, null);
+ _writePassThruAttrs(writer, attrs, _passthruAttributes);
+ _writeBooleanPassThruAttr(writer, attrs, "disabled");
+ _writeBooleanPassThruAttr(writer, attrs, "ismap");
+
+
+ Object styleClass = attrs.get("styleClass");
+ if (styleClass != null)
+ {
+ writer.writeAttribute("class", styleClass, "styleClass");
+ }
+
+ writer.endElement("input");
+ }
+
+ public void decode(FacesContext context, UIComponent component)
+ {
+ Object source =
+ context.getExternalContext().getRequestParameterMap().get("source");
+
+ String clientId = component.getClientId(context);
+ if ((source != null) &&
+ source.equals(clientId))
+ {
+ (new ActionEvent(component)).queue();
+ }
+ }
+
+ private void _writeBooleanPassThruAttr(ResponseWriter out, Map attrs, String
key)
+ throws IOException
+ {
+ Object value = attrs.get(key);
+ if (Boolean.TRUE.equals(value))
+ {
+ out.writeAttribute(key, key, key);
+ }
+ }
+
+ private void _writePassThruAttrs(ResponseWriter out, Map attrs, String[]
keys)
+ throws IOException
+ {
+ for(int i=0; i<keys.length; i++)
+ {
+ String key = keys[i];
+ Object value = attrs.get(key);
+ if (value != null)
+ {
+ out.writeAttribute(key, value, key);
+ }
+ }
+ }
+
+ private static final String[] _passthruAttributes = {
+ "accesskey",
+ "alt",
+ "dir",
+ "lang",
+ "onblur",
+ "onchange",
+ "ondblclick",
+ "onfocus",
+ "onkeydown",
+ "onkeypress",
+ "onkeyup",
+ "onmousedown",
+ "onmousemove",
+ "onmouseout",
+ "onmouseover",
+ "onmouseup",
+ "onselect",
+ "style",
+ "tabindex",
+ "title",
+ };
+}
