You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2009/06/15 22:39:15 UTC

svn commit: r784968 - in /myfaces/tomahawk/trunk: core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlCheckboxRenderer.java core12/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlCheckboxRenderer.java

Author: lu4242
Date: Mon Jun 15 20:39:15 2009
New Revision: 784968

URL: http://svn.apache.org/viewvc?rev=784968&view=rev
Log:
TOMAHAWK-1429 t:checkbox not checked correctly after validation error (Thanks to Mathias Werlitz)

Modified:
    myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlCheckboxRenderer.java
    myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlCheckboxRenderer.java

Modified: myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlCheckboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlCheckboxRenderer.java?rev=784968&r1=784967&r2=784968&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlCheckboxRenderer.java (original)
+++ myfaces/tomahawk/trunk/core/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlCheckboxRenderer.java Mon Jun 15 20:39:15 2009
@@ -415,7 +415,13 @@
         String itemStrValue = getItemStringValue(facesContext, uiSelectMany, converter, itemValue);
 
         //TODO: we must cache this Set!
-        Set lookupSet = RendererUtils.getSelectedValuesAsSet(facesContext, uiComponent, converter, uiSelectMany);
+        Set lookupSet = RendererUtils.getSubmittedValuesAsSet(facesContext, uiComponent, converter, uiSelectMany);
+        
+        boolean useSubmittedValues = (lookupSet != null);
+        if (!useSubmittedValues)
+        {
+            lookupSet = RendererUtils.getSelectedValuesAsSet(facesContext, uiComponent, converter, uiSelectMany);
+        }
 
         ResponseWriter writer = facesContext.getResponseWriter();
         

Modified: myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlCheckboxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlCheckboxRenderer.java?rev=784968&r1=784967&r2=784968&view=diff
==============================================================================
--- myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlCheckboxRenderer.java (original)
+++ myfaces/tomahawk/trunk/core12/src/main/java/org/apache/myfaces/renderkit/html/ext/HtmlCheckboxRenderer.java Mon Jun 15 20:39:15 2009
@@ -422,7 +422,13 @@
         String itemStrValue = getItemStringValue(facesContext, uiSelectMany, converter, itemValue);
 
         //TODO: we must cache this Set!
-        Set lookupSet = RendererUtils.getSelectedValuesAsSet(facesContext, uiComponent, converter, uiSelectMany);
+        Set lookupSet = RendererUtils.getSubmittedValuesAsSet(facesContext, uiComponent, converter, uiSelectMany);
+        
+        boolean useSubmittedValues = (lookupSet != null);
+        if (!useSubmittedValues)
+        {
+            lookupSet = RendererUtils.getSelectedValuesAsSet(facesContext, uiComponent, converter, uiSelectMany);
+        }
 
         ResponseWriter writer = facesContext.getResponseWriter();