You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2006/04/27 04:29:23 UTC

svn commit: r397367 - in /myfaces/tobago/trunk: core/src/main/java/org/apache/myfaces/tobago/renderkit/ theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/

Author: bommel
Date: Wed Apr 26 19:29:22 2006
New Revision: 397367

URL: http://svn.apache.org/viewcvs?rev=397367&view=rev
Log:
TOBAGO-59 decode should not call setValue should call setSubmitedValue

Modified:
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectManyRendererBase.java
    myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectOneRendererBase.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectBooleanCheckboxRenderer.java

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectManyRendererBase.java
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectManyRendererBase.java?rev=397367&r1=397366&r2=397367&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectManyRendererBase.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectManyRendererBase.java Wed Apr 26 19:29:22 2006
@@ -35,27 +35,23 @@
 
     UISelectMany uiSelectMany = (UISelectMany) component;
 
-    String[] newValue = (String[])
+    String[] newValues = (String[])
         facesContext.getExternalContext().getRequestParameterValuesMap().get(uiSelectMany.getClientId(facesContext));
     if (LOG.isDebugEnabled()) {
       LOG.debug("decode: key='" + component.getClientId(facesContext)
-          + "' value='" + newValue + "'");
-      LOG.debug("size ... '" + (newValue != null ? newValue.length : -1) + "'");
-      if (newValue != null) {
-        for (int i = 0; i < newValue.length; i++) {
-          if (LOG.isDebugEnabled()) {
-            LOG.debug("newValue[i] = '" + newValue[i] + "'");
-          }
+          + "' value='" + newValues + "'");
+      LOG.debug("size ... '" + (newValues != null ? newValues.length : -1) + "'");
+      if (newValues != null) {
+        for (String newValue : newValues) {
+          LOG.debug("newValues[i] = '" + newValue + "'");
         }
       }
     }
 
-    if (newValue == null) {
-      newValue = new String[0]; // because no selection will not submitted by browsers
+    if (newValues == null) {
+      newValues = new String[0]; // because no selection will not submitted by browsers
     }
-    uiSelectMany.setValue(newValue);
-    uiSelectMany.setValid(true);
+    uiSelectMany.setSubmittedValue(newValues);
   }
-
 }
 

Modified: myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectOneRendererBase.java
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectOneRendererBase.java?rev=397367&r1=397366&r2=397367&view=diff
==============================================================================
--- myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectOneRendererBase.java (original)
+++ myfaces/tobago/trunk/core/src/main/java/org/apache/myfaces/tobago/renderkit/SelectOneRendererBase.java Wed Apr 26 19:29:22 2006
@@ -43,12 +43,7 @@
     if (LOG.isDebugEnabled()) {
       LOG.debug("decode: key='" + clientId + "' value='" + newValue + "'");
     }
-    Object convertedValue = null;
-    if (newValue != null) {
-      convertedValue = getConvertedValue(facesContext, component, newValue);
-    }
-    uiSelectOne.setValue(convertedValue);
-    uiSelectOne.setValid(true);    
+    uiSelectOne.setSubmittedValue(newValue);    
   }
 
 

Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectBooleanCheckboxRenderer.java
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectBooleanCheckboxRenderer.java?rev=397367&r1=397366&r2=397367&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectBooleanCheckboxRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SelectBooleanCheckboxRenderer.java Wed Apr 26 19:29:22 2006
@@ -47,13 +47,10 @@
     String newValue = (String)
         facesContext.getExternalContext().getRequestParameterMap()
         .get(uiInput.getClientId(facesContext));
-//    LogUtils.logParameter(((ServletRequest)facesContext.getExternalContext().getRequest()));
-//    LOG.debug("decode: key='" + uiInput.getClientId(facesContext)
-//        + "' value='" + newValue + "'  valid = " + uiInput.isValid());
     if (newValue != null) {
-      uiInput.setValue(Boolean.valueOf(newValue));
+      uiInput.setSubmittedValue(newValue);
     } else {
-      uiInput.setValue(Boolean.FALSE);
+      uiInput.setSubmittedValue(String.valueOf(false));
     }
   }
 
@@ -83,7 +80,7 @@
     }
 
     Boolean currentValue = (Boolean) component.getValue();
-    boolean checked = currentValue != null ? currentValue.booleanValue() : false;
+    boolean checked = currentValue != null && currentValue.booleanValue();
 
     writer.startElement("input", component);
     writer.writeAttribute("type", "checkbox", null);