You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by we...@apache.org on 2006/06/15 11:40:42 UTC

svn commit: r414522 - in /myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag: MenuBarRenderer.java ToolBarRenderer.java

Author: weber
Date: Thu Jun 15 02:40:42 2006
New Revision: 414522

URL: http://svn.apache.org/viewvc?rev=414522&view=rev
Log:
fix for TOBAGO-81 (Non String item values not possible in tx:menuRadio)

Modified:
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuBarRenderer.java
    myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRenderer.java

Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuBarRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuBarRenderer.java?rev=414522&r1=414521&r2=414522&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuBarRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/MenuBarRenderer.java Thu Jun 15 02:40:42 2006
@@ -458,13 +458,13 @@
             + command.getClientId(facesContext));
       }
       String formattedValue
-          = getFormattedValue(facesContext, command, item.getValue());
+          = getFormattedValue(facesContext, radio, item.getValue());
       onClick = onClickPrefix + formattedValue + onClickPostfix;
       String image;
       if (item.getValue().equals(value) || markFirst) {
         image = "image/MenuRadioChecked.gif";
         markFirst = false;
-        sb.append("    ").append(onClickPrefix).append(item.getValue()).append("');");
+        sb.append("    ").append(onClickPrefix).append(formattedValue).append("');");
       } else {
         image = "image/MenuRadioUnchecked.gif";
       }

Modified: myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRenderer.java?rev=414522&r1=414521&r2=414522&view=diff
==============================================================================
--- myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRenderer.java (original)
+++ myfaces/tobago/trunk/theme/scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/ToolBarRenderer.java Thu Jun 15 02:40:42 2006
@@ -207,7 +207,7 @@
 
 
         String formattedValue
-            = getFormattedValue(facesContext, command, item.getValue());
+            = getFormattedValue(facesContext, radio, item.getValue());
         onClick = onClickPrefix + formattedValue + onClickPostfix;
         final boolean checked;
         if (item.getValue().equals(value) || markFirst) {