You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ba...@apache.org on 2007/05/07 17:24:03 UTC
svn commit: r535899 - in /myfaces:
core/branches/jsf12/impl/src/test/java/org/apache/myfaces/renderkit/html/
shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/
Author: baranda
Date: Mon May 7 08:24:02 2007
New Revision: 535899
URL: http://svn.apache.org/viewvc?view=rev&rev=535899
Log:
Fixes MYFACES-1624 (In oneradio and manycheckbox, the style attribute has not to be passed to the input elements)
Modified:
myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlCheckboxRendererTest.java
myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlRadioRendererTest.java
myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HTML.java
myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java
myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java
Modified: myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlCheckboxRendererTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlCheckboxRendererTest.java?view=diff&rev=535899&r1=535898&r2=535899
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlCheckboxRendererTest.java (original)
+++ myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlCheckboxRendererTest.java Mon May 7 08:24:02 2007
@@ -79,7 +79,6 @@
facesContext.renderResponse();
String output = writer.getWriter().toString();
-
assertEquals("<table><tr>\t\t" +
"<td><input id=\"j_id0:0\" type=\"checkbox\" name=\"j_id0\" value=\"mars\"/><label for=\"j_id0:0\"> mars</label></td>\t\t" +
"<td><input id=\"j_id0:1\" type=\"checkbox\" name=\"j_id0\" value=\"jupiter\"/><label for=\"j_id0:1\"> jupiter</label></td>" +
@@ -131,6 +130,29 @@
assertEquals("<table><tr>\t\t" +
"<td><input id=\"j_id0:0\" type=\"checkbox\" name=\"j_id0\" disabled=\"disabled\" value=\"mars\"/><label for=\"j_id0:0\" class=\"disabledClass\"> mars</label></td>\t\t" +
"<td><input id=\"j_id0:1\" type=\"checkbox\" name=\"j_id0\" value=\"jupiter\"/><label for=\"j_id0:1\" class=\"enabledClass\"> jupiter</label></td>" +
+ "</tr></table>", output);
+ }
+
+ public void testRenderStylePassthru() throws Exception
+ {
+ List items = new ArrayList();
+ items.add(new SelectItem(null, "mars"));
+ items.add(new SelectItem(null, "jupiter"));
+
+ UISelectItems selectItems = new UISelectItems();
+ selectItems.setValue(items);
+
+ selectManyCheckbox.getChildren().add(selectItems);
+
+ selectManyCheckbox.setStyle("color: red");
+
+ selectManyCheckbox.encodeAll(facesContext);
+ facesContext.renderResponse();
+
+ String output = writer.getWriter().toString();
+ assertEquals("<table style=\"color: red\"><tr>\t\t" +
+ "<td><input id=\"j_id0:0\" type=\"checkbox\" name=\"j_id0\"/><label for=\"j_id0:0\"> mars</label></td>\t\t" +
+ "<td><input id=\"j_id0:1\" type=\"checkbox\" name=\"j_id0\"/><label for=\"j_id0:1\"> jupiter</label></td>" +
"</tr></table>", output);
}
}
Modified: myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlRadioRendererTest.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlRadioRendererTest.java?view=diff&rev=535899&r1=535898&r2=535899
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlRadioRendererTest.java (original)
+++ myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlRadioRendererTest.java Mon May 7 08:24:02 2007
@@ -79,8 +79,31 @@
facesContext.renderResponse();
String output = writer.getWriter().toString();
-
+
assertEquals("<table><tr>\t\t" +
+ "<td><input id=\"j_id0:0\" type=\"radio\" name=\"j_id0\" value=\"mars\"/><label for=\"j_id0:0\"> mars</label></td>\t\t" +
+ "<td><input id=\"j_id0:1\" type=\"radio\" name=\"j_id0\" value=\"jupiter\"/><label for=\"j_id0:1\"> jupiter</label></td>" +
+ "</tr></table>", output);
+ }
+
+ public void testDefaultStylePassthru() throws Exception
+ {
+ List items = new ArrayList();
+ items.add(new SelectItem("mars"));
+ items.add(new SelectItem("jupiter"));
+
+ UISelectItems selectItems = new UISelectItems();
+ selectItems.setValue(items);
+
+ selectOneRadio.getChildren().add(selectItems);
+
+ selectOneRadio.setStyle("color: red;");
+
+ selectOneRadio.encodeEnd(facesContext);
+ facesContext.renderResponse();
+
+ String output = writer.getWriter().toString();
+ assertEquals("<table style=\"color: red;\"><tr>\t\t" +
"<td><input id=\"j_id0:0\" type=\"radio\" name=\"j_id0\" value=\"mars\"/><label for=\"j_id0:0\"> mars</label></td>\t\t" +
"<td><input id=\"j_id0:1\" type=\"radio\" name=\"j_id0\" value=\"jupiter\"/><label for=\"j_id0:1\"> jupiter</label></td>" +
"</tr></table>", output);
Modified: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HTML.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HTML.java?view=diff&rev=535899&r1=535898&r2=535899
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HTML.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HTML.java Mon May 7 08:24:02 2007
@@ -144,6 +144,11 @@
COMMON_PASSTROUGH_ATTRIBUTES,
COMMON_FIELD_ATTRIBUTES_WITHOUT_DISABLED,
COMMON_FIELD_EVENT_ATTRIBUTES);
+ String[] COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_STYLE =
+ (String[]) ArrayUtils.concat(
+ COMMON_PASSTROUGH_ATTRIBUTES_WITHOUT_STYLE,
+ COMMON_FIELD_ATTRIBUTES_WITHOUT_DISABLED,
+ COMMON_FIELD_EVENT_ATTRIBUTES);
String[] COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_ONFOCUS =
(String[]) org.apache.myfaces.shared.util.ArrayUtils.concat(
COMMON_PASSTROUGH_ATTRIBUTES,
@@ -261,6 +266,10 @@
(String[]) ArrayUtils.concat(
INPUT_ATTRIBUTES,
COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED);
+ String[] INPUT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_STYLE =
+ (String[]) ArrayUtils.concat(
+ INPUT_ATTRIBUTES,
+ COMMON_FIELD_PASSTROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_STYLE);
String[] INPUT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_ONFOCUS_AND_ONCLICK =
(String[]) org.apache.myfaces.shared.util.ArrayUtils.concat(
Modified: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java?view=diff&rev=535899&r1=535898&r2=535899
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlCheckboxRendererBase.java Mon May 7 08:24:02 2007
@@ -251,7 +251,7 @@
}
HtmlRendererUtils.renderHTMLAttributes(writer, uiComponent,
- HTML.INPUT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED);
+ HTML.INPUT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_STYLE);
if (isDisabled(facesContext, uiComponent)) {
writer.writeAttribute(HTML.DISABLED_ATTR, Boolean.TRUE, null);
}
Modified: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java?view=diff&rev=535899&r1=535898&r2=535899
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRadioRendererBase.java Mon May 7 08:24:02 2007
@@ -20,11 +20,7 @@
import org.apache.myfaces.shared.renderkit.JSFAttr;
import org.apache.myfaces.shared.renderkit.RendererUtils;
-import javax.faces.component.NamingContainer;
-import javax.faces.component.UIComponent;
-import javax.faces.component.UIInput;
-import javax.faces.component.UISelectOne;
-import javax.faces.component.UIOutput;
+import javax.faces.component.*;
import javax.faces.component.html.HtmlSelectOneRadio;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
@@ -252,7 +248,7 @@
writer.writeAttribute(HTML.VALUE_ATTR, value, null);
}
- HtmlRendererUtils.renderHTMLAttributes(writer, uiComponent, HTML.INPUT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED);
+ HtmlRendererUtils.renderHTMLAttributes(writer, uiComponent, HTML.INPUT_PASSTHROUGH_ATTRIBUTES_WITHOUT_DISABLED_AND_STYLE);
if (isDisabled(facesContext, uiComponent))
{
writer.writeAttribute(org.apache.myfaces.shared.renderkit.html.HTML.DISABLED_ATTR, Boolean.TRUE, null);