myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bom...@apache.org
Subject svn commit: r730848 - in /myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12: MenuCheckboxExtensionTag.java MenuRadioExtensionTag.java
Date Fri, 02 Jan 2009 22:05:04 GMT
Author: bommel
Date: Fri Jan  2 14:05:03 2009
New Revision: 730848

URL: http://svn.apache.org/viewvc?rev=730848&view=rev
Log:
(TOBAGO-735) use of ValueExpression instead of ValueBinding (JSF 1.2)

Modified:
    myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/MenuCheckboxExtensionTag.java
    myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/MenuRadioExtensionTag.java

Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/MenuCheckboxExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/MenuCheckboxExtensionTag.java?rev=730848&r1=730847&r2=730848&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/MenuCheckboxExtensionTag.java
(original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/MenuCheckboxExtensionTag.java
Fri Jan  2 14:05:03 2009
@@ -24,14 +24,12 @@
 import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
 import org.apache.myfaces.tobago.component.Facets;
 import org.apache.myfaces.tobago.component.UICommand;
-import static org.apache.myfaces.tobago.component.Attributes.RENDERED_PARTIALLY;
+import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.internal.taglib.MenuItemTag;
 import org.apache.myfaces.tobago.internal.taglib.SelectBooleanCheckboxTag;
 
-import javax.el.MethodExpression;
 import javax.faces.webapp.FacetTag;
 import javax.faces.component.UIComponent;
-import javax.faces.el.ValueBinding;
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.BodyTagSupport;
 
@@ -129,11 +127,11 @@
     // Move attribute renderedPartially from selectOne to menuCommand component
     UIComponent selectBooleanComponent = selectBooleanCheckbox.getComponentInstance();
     UICommand command = (UICommand) menuCommandTag.getComponentInstance();
-    ValueBinding binding = selectBooleanComponent.getValueBinding(RENDERED_PARTIALLY);
-    if (binding != null) {
-      command.setValueBinding(RENDERED_PARTIALLY, binding);
+    javax.el.ValueExpression expression = selectBooleanComponent.getValueExpression(Attributes.RENDERED_PARTIALLY);
+    if (expression != null) {
+      command.setValueExpression(Attributes.RENDERED_PARTIALLY, expression);
     } else {
-      Object renderedPartially = selectBooleanComponent.getAttributes().get(RENDERED_PARTIALLY);
+      Object renderedPartially = selectBooleanComponent.getAttributes().get(Attributes.RENDERED_PARTIALLY);
       command.setRenderedPartially(StringUtils.split((String) renderedPartially, ", "));
     }
     
@@ -155,7 +153,7 @@
   @TagAttribute
   @UIComponentTagAttribute(type = {}, expression = DynamicExpression.METHOD_BINDING,
       methodReturnType = "java.lang.Object")
-  public void setAction(MethodExpression action) {
+  public void setAction(javax.el.MethodExpression action) {
     this.action = action;
   }
 

Modified: myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/MenuRadioExtensionTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/MenuRadioExtensionTag.java?rev=730848&r1=730847&r2=730848&view=diff
==============================================================================
--- myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/MenuRadioExtensionTag.java
(original)
+++ myfaces/tobago/trunk/extension/tobago-taglib-extension/src/main/java/org/apache/myfaces/tobago/taglib/extension12/MenuRadioExtensionTag.java
Fri Jan  2 14:05:03 2009
@@ -24,13 +24,12 @@
 import org.apache.myfaces.tobago.apt.annotation.UIComponentTagAttribute;
 import org.apache.myfaces.tobago.component.Facets;
 import org.apache.myfaces.tobago.component.UICommand;
-import static org.apache.myfaces.tobago.component.Attributes.RENDERED_PARTIALLY;
+import org.apache.myfaces.tobago.component.Attributes;
 import org.apache.myfaces.tobago.internal.taglib.MenuItemTag;
 import org.apache.myfaces.tobago.internal.taglib.SelectOneRadioTag;
 
 import javax.faces.webapp.FacetTag;
 import javax.faces.component.UIComponent;
-import javax.faces.el.ValueBinding;
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.BodyTagSupport;
 
@@ -135,11 +134,11 @@
     // Move attribute renderedPartially from selectOne to menuCommand component
     UIComponent selectOneComponent = selectOneRadio.getComponentInstance();
     UICommand command = (UICommand) menuCommandTag.getComponentInstance();
-    ValueBinding binding = selectOneComponent.getValueBinding(RENDERED_PARTIALLY);
-    if (binding != null) {
-      command.setValueBinding(RENDERED_PARTIALLY, binding);
+    javax.el.ValueExpression expression = selectOneComponent.getValueExpression(Attributes.RENDERED_PARTIALLY);
+    if (expression != null) {
+      command.setValueExpression(Attributes.RENDERED_PARTIALLY, expression);
     } else {
-      Object renderedPartially = selectOneComponent.getAttributes().get(RENDERED_PARTIALLY);
+      Object renderedPartially = selectOneComponent.getAttributes().get(Attributes.RENDERED_PARTIALLY);
       command.setRenderedPartially(StringUtils.split((String) renderedPartially, ", "));
     }
 



Mime
View raw message