You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2012/02/17 16:59:35 UTC
svn commit: r1245629 - in /myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main: java-jsf-1.1/org/apache/myfaces/tobago/internal/taglib/extension/ java-jsf-1.2/org/apache/myfaces/tobago/internal/taglib/extension/

Author: lofwyr
Date: Fri Feb 17 15:59:35 2012
New Revision: 1245629

URL: http://svn.apache.org/viewvc?rev=1245629&view=rev
Log:
TOBAGO-1041: tx:selectBooleanCheckbox label is rendered twice - as label and itemLabel
 - implementing the fix for JSPs

Modified:
    myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java-jsf-1.1/org/apache/myfaces/tobago/internal/taglib/extension/SelectBooleanCheckboxExtensionTag.java
    myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/internal/taglib/extension/SelectBooleanCheckboxExtensionTag.java

Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java-jsf-1.1/org/apache/myfaces/tobago/internal/taglib/extension/SelectBooleanCheckboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java-jsf-1.1/org/apache/myfaces/tobago/internal/taglib/extension/SelectBooleanCheckboxExtensionTag.java?rev=1245629&r1=1245628&r2=1245629&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java-jsf-1.1/org/apache/myfaces/tobago/internal/taglib/extension/SelectBooleanCheckboxExtensionTag.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java-jsf-1.1/org/apache/myfaces/tobago/internal/taglib/extension/SelectBooleanCheckboxExtensionTag.java Fri Feb 17 15:59:35 2012
@@ -130,9 +130,6 @@ public class SelectBooleanCheckboxExtens
     if (fieldId != null) {
       selectBooleanCheckboxTag.setId(fieldId);
     }
-    if (label != null) {
-      selectBooleanCheckboxTag.setLabel(label);
-    }
     if (readonly != null) {
       selectBooleanCheckboxTag.setReadonly(readonly);
     }
@@ -142,8 +139,13 @@ public class SelectBooleanCheckboxExtens
     if (required != null) {
       selectBooleanCheckboxTag.setRequired(required);
     }
+    if (label != null) {
+      selectBooleanCheckboxTag.setLabel(label);
+    }
     if (itemLabel != null) {
-      selectBooleanCheckboxTag.setLabel(itemLabel);
+      selectBooleanCheckboxTag.setItemLabel(itemLabel);
+    } else {
+      selectBooleanCheckboxTag.setItemLabel("");
     }
     if (markup != null) {
       selectBooleanCheckboxTag.setMarkup(markup);

Modified: myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/internal/taglib/extension/SelectBooleanCheckboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/internal/taglib/extension/SelectBooleanCheckboxExtensionTag.java?rev=1245629&r1=1245628&r2=1245629&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/internal/taglib/extension/SelectBooleanCheckboxExtensionTag.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-taglib-extension/src/main/java-jsf-1.2/org/apache/myfaces/tobago/internal/taglib/extension/SelectBooleanCheckboxExtensionTag.java Fri Feb 17 15:59:35 2012
@@ -22,6 +22,7 @@ import org.apache.myfaces.tobago.apt.ann
 import org.apache.myfaces.tobago.apt.annotation.Tag;
 import org.apache.myfaces.tobago.apt.annotation.TagAttribute;
 import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
+import org.apache.myfaces.tobago.compat.FacesUtilsEL;
 import org.apache.myfaces.tobago.internal.taglib.SelectBooleanCheckboxTag;
 
 import javax.el.ValueExpression;
@@ -125,8 +126,13 @@ public class SelectBooleanCheckboxExtens
     if (required != null) {
       selectBooleanCheckboxTag.setRequired(required);
     }
+    if (label != null) {
+      selectBooleanCheckboxTag.setLabel(label);
+    }
     if (itemLabel != null) {
-      selectBooleanCheckboxTag.setLabel(itemLabel);
+      selectBooleanCheckboxTag.setItemLabel(itemLabel);
+    } else {
+      selectBooleanCheckboxTag.setItemLabel((ValueExpression) FacesUtilsEL.createExpressionOrBinding(""));
     }
     if (markup != null) {
       selectBooleanCheckboxTag.setMarkup(markup);