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/04/28 17:35:16 UTC

svn commit: r533360 - in /myfaces: core/branches/jsf12/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlMenuRendererTest.java shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java

Author: baranda
Date: Sat Apr 28 08:35:15 2007
New Revision: 533360

URL: http://svn.apache.org/viewvc?view=rev&rev=533360
Log:
Fixes MYFACES-1611 (Attribute "readonly" not honoured in selectOneMenu)

Added:
    myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlMenuRendererTest.java
      - copied, changed from r533353, myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlCheckboxRendererTest.java
Modified:
    myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java

Copied: myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlMenuRendererTest.java (from r533353, 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/HtmlMenuRendererTest.java?view=diff&rev=533360&p1=myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlCheckboxRendererTest.java&r1=533353&p2=myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/renderkit/html/HtmlMenuRendererTest.java&r2=533360
==============================================================================
--- 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/HtmlMenuRendererTest.java Sat Apr 28 08:35:15 2007
@@ -20,7 +20,7 @@
 import org.apache.shale.test.mock.MockResponseWriter;
 
 import javax.faces.component.UISelectItems;
-import javax.faces.component.html.HtmlSelectManyCheckbox;
+import javax.faces.component.html.HtmlSelectOneMenu;
 import javax.faces.model.SelectItem;
 import java.io.StringWriter;
 import java.util.ArrayList;
@@ -30,12 +30,15 @@
  * @author Bruno Aranda (latest modification by $Author$)
  * @version $Revision$ $Date$
  */
-public class HtmlCheckboxRendererTest extends AbstractJsfTestCase
+public class HtmlMenuRendererTest extends AbstractJsfTestCase
 {
+    private static final String LINE_SEPARATOR = System.getProperty(
+            "line.separator", "\r\n");
+
     private MockResponseWriter writer ;
-    private HtmlSelectManyCheckbox selectManyCheckbox;
+    private HtmlSelectOneMenu selectOneMenu;
 
-    public HtmlCheckboxRendererTest(String name)
+    public HtmlMenuRendererTest(String name)
     {
         super(name);
     }
@@ -44,27 +47,27 @@
     {
         super.setUp();
 
-        selectManyCheckbox = new HtmlSelectManyCheckbox();
+        selectOneMenu = new HtmlSelectOneMenu();
 
         writer = new MockResponseWriter(new StringWriter(), null, null);
         facesContext.setResponseWriter(writer);
 
         facesContext.getViewRoot().setRenderKitId(MockRenderKitFactory.HTML_BASIC_RENDER_KIT);
         facesContext.getRenderKit().addRenderer(
-                selectManyCheckbox.getFamily(),
-                selectManyCheckbox.getRendererType(),
-                new HtmlCheckboxRenderer());
+                selectOneMenu.getFamily(),
+                selectOneMenu.getRendererType(),
+                new HtmlMenuRenderer());
 
     }
 
     protected void tearDown() throws Exception
     {
         super.tearDown();
-        selectManyCheckbox = null;
+        selectOneMenu = null;
         writer = null;
     }
 
-    public void testDefault() throws Exception
+    public void testRenderDefault() throws Exception
     {
         List items = new ArrayList();
         items.add(new SelectItem("mars"));
@@ -73,64 +76,38 @@
         UISelectItems selectItems = new UISelectItems();
         selectItems.setValue(items);
 
-        selectManyCheckbox.getChildren().add(selectItems);
+        selectOneMenu.getChildren().add(selectItems);
 
-        selectManyCheckbox.encodeAll(facesContext);
+        selectOneMenu.encodeAll(facesContext);
         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\">&#160;mars</label></td>\t\t" +
-                "<td><input id=\"j_id0:1\" type=\"checkbox\" name=\"j_id0\" value=\"jupiter\"/><label for=\"j_id0:1\">&#160;jupiter</label></td>" +
-                "</tr></table>", output);
+        assertEquals("<select name=\"j_id0\" size=\"1\">" +
+                "\t<option value=\"mars\">mars</option>" +
+                "\t<option value=\"jupiter\">jupiter</option></select>", output);
     }
 
-    public void testRenderSelectItemWithoutValue() throws Exception
+    public void testRenderReadonly() throws Exception
     {
         List items = new ArrayList();
-        items.add(new SelectItem(null, "mars"));
-        items.add(new SelectItem(null, "jupiter"));
+        items.add(new SelectItem("mars"));
+        items.add(new SelectItem("jupiter"));
 
         UISelectItems selectItems = new UISelectItems();
         selectItems.setValue(items);
 
-        selectManyCheckbox.getChildren().add(selectItems);
+        selectOneMenu.getChildren().add(selectItems);
+
+        selectOneMenu.setReadonly(true);
 
-        selectManyCheckbox.encodeAll(facesContext);
+        selectOneMenu.encodeAll(facesContext);
         facesContext.renderResponse();
 
         String output = writer.getWriter().toString();
-        assertEquals("<table><tr>\t\t" +
-                "<td><input id=\"j_id0:0\" type=\"checkbox\" name=\"j_id0\"/><label for=\"j_id0:0\">&#160;mars</label></td>\t\t" +
-                "<td><input id=\"j_id0:1\" type=\"checkbox\" name=\"j_id0\"/><label for=\"j_id0:1\">&#160;jupiter</label></td>" +
-                "</tr></table>", output);
+        assertEquals("<select name=\"j_id0\" size=\"1\" readonly=\"readonly\">" +
+                "\t<option value=\"mars\">mars</option>" +
+                "\t<option value=\"jupiter\">jupiter</option></select>", output);
     }
 
-    public void testRenderDisabledEnabledClass() throws Exception
-    {
-        List items = new ArrayList();
-        SelectItem disabledItem = new SelectItem("mars", "mars");
-        disabledItem.setDisabled(true);
 
-        items.add(disabledItem);
-        items.add(new SelectItem("jupiter", "jupiter"));
-
-        UISelectItems selectItems = new UISelectItems();
-        selectItems.setValue(items);
-
-        selectManyCheckbox.getChildren().add(selectItems);
-
-        selectManyCheckbox.setEnabledClass("enabledClass");
-        selectManyCheckbox.setDisabledClass("disabledClass");
-
-        selectManyCheckbox.encodeAll(facesContext);
-        facesContext.renderResponse();
-
-        String output = writer.getWriter().toString();
-        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\">&#160;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\">&#160;jupiter</label></td>" +
-                "</tr></table>", output);
-    }
-}
+}
\ No newline at end of file

Modified: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java?view=diff&rev=533360&r1=533359&r2=533360
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/renderkit/html/HtmlRendererUtils.java Sat Apr 28 08:35:15 2007
@@ -300,6 +300,11 @@
             writer.writeAttribute(HTML.DISABLED_ATTR, Boolean.TRUE, null);
         }
 
+        if (isReadOnly(uiComponent))
+        {
+            writer.writeAttribute(HTML.READONLY_ATTR, HTML.READONLY_ATTR, null);
+        }
+
         Set lookupSet = getSubmittedOrSelectedValuesAsSet(selectMany, uiComponent, facesContext, converter);
 
         renderSelectOptions(facesContext, uiComponent, converter, lookupSet,