You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ba...@apache.org on 2006/10/07 17:15:18 UTC

svn commit: r453927 - in /myfaces: core/branches/jsf12/api/src/main/java/javax/faces/component/ shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/taglib/

Author: baranda
Date: Sat Oct  7 08:15:18 2006
New Revision: 453927

URL: http://svn.apache.org/viewvc?view=rev&rev=453927
Log:
MYFACES-1443 (Revert JSR-252 changes in UIComponentTagUtils and deprecate it)
- And new class UIComponentELTagUtils has been created from UIComponentTagUtils

Added:
    myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentELTagUtils.java   (with props)
Modified:
    myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/UIGraphic.java
    myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentTagUtils.java

Modified: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/UIGraphic.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/UIGraphic.java?view=diff&rev=453927&r1=453926&r2=453927
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/UIGraphic.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/UIGraphic.java Sat Oct  7 08:15:18 2006
@@ -124,8 +124,9 @@
     public Object getValue()
     {
         if (_value != null) return _value;
-        ValueBinding vb = getValueBinding("value");
-        return vb != null ? (Object)vb.getValue(getFacesContext()) : null;
+
+        ValueExpression ve = getValueExpression("value");
+        return ve != null ? ve.getValue(getFacesContext().getELContext()) : null;
     }
 
 

Added: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentELTagUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentELTagUtils.java?view=auto&rev=453927
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentELTagUtils.java (added)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentELTagUtils.java Sat Oct  7 08:15:18 2006
@@ -0,0 +1,306 @@
+/*
+ * Copyright 2006 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.myfaces.shared.taglib;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import javax.faces.context.FacesContext;
+import javax.faces.component.UIComponent;
+import javax.faces.component.UICommand;
+import javax.faces.component.UIParameter;
+import javax.faces.component.UISelectBoolean;
+import javax.faces.component.UIGraphic;
+import javax.faces.component.ValueHolder;
+import javax.faces.component.EditableValueHolder;
+import javax.faces.component.ActionSource2;
+import javax.faces.event.ActionEvent;
+import javax.faces.event.ValueChangeEvent;
+import javax.faces.event.MethodExpressionActionListener;
+import javax.faces.event.MethodExpressionValueChangeListener;
+import javax.faces.webapp.UIComponentTag;
+import javax.faces.convert.Converter;
+import javax.faces.validator.MethodExpressionValidator;
+import javax.el.ValueExpression;
+import javax.el.MethodExpression;
+import javax.el.ELContext;
+
+/**
+ * @author Manfred Geiler (latest modification by $Author$)
+ * @author Bruno Aranda (JSR-252)
+ * @version $Revision$ $Date$
+ *
+ * @since 1.2
+ */
+public class UIComponentELTagUtils
+{
+    private static final Log log = LogFactory.getLog(UIComponentELTagUtils.class);
+
+    private static final Class[] VALIDATOR_ARGS = {FacesContext.class,
+                                                   UIComponent.class,
+                                                   Object.class};
+    private static final Class[] ACTION_LISTENER_ARGS = {ActionEvent.class};
+    private static final Class[] VALUE_LISTENER_ARGS = {ValueChangeEvent.class};
+
+    private UIComponentELTagUtils() {}    //util class, no instantiation allowed
+
+    /**
+     * @since 1.2
+     */
+    public static void setIntegerProperty(FacesContext context,
+                                          UIComponent component,
+                                          String propName,
+                                          ValueExpression value)
+    {
+        String strValue = (String) evaluateValueExpression(context.getELContext(), value);
+
+        if (strValue != null)
+        {
+            component.getAttributes().put(propName, Integer.valueOf(value.getExpressionString()));
+        }
+    }
+
+
+    /**
+     * @since 1.2
+     */
+    public static void setLongProperty(FacesContext context,
+                                       UIComponent component,
+                                       String propName,
+                                       ValueExpression value)
+    {
+        String strValue = (String) evaluateValueExpression(context.getELContext(), value);
+
+        if (strValue != null)
+        {
+            component.getAttributes().put(propName, Long.valueOf(value.getExpressionString()));
+        }
+    }
+
+    /**
+     * @since 1.2
+     */
+    public static void setStringProperty(FacesContext context,
+                                     UIComponent component,
+                                     String propName,
+                                     ValueExpression value)
+    {
+        String strValue = (String) evaluateValueExpression(context.getELContext(), value);
+
+        if (strValue != null)
+        {
+            component.getAttributes().put(propName, value.getExpressionString());
+        }
+    }
+
+    /**
+     * @since 1.2
+     */
+    public static void setBooleanProperty(FacesContext context,
+                                      UIComponent component,
+                                      String propName,
+                                      ValueExpression value)
+    {
+        String strValue = (String) evaluateValueExpression(context.getELContext(), value);
+
+        if (strValue != null)
+        {
+            component.getAttributes().put(propName, Boolean.valueOf(value.getExpressionString()));
+        }
+    }
+
+    /**
+     * @since 1.2
+     */
+    public static void setValueProperty(FacesContext context,
+                                        UIComponent component,
+                                        ValueExpression value)
+    {
+        if (value != null)
+        {
+            if (!value.isLiteralText())
+            {
+                component.setValueExpression(org.apache.myfaces.shared.renderkit.JSFAttr.VALUE_ATTR, value);
+            }
+            else if (component instanceof UICommand)
+            {
+                ((UICommand)component).setValue(value.getExpressionString());
+            }
+            else if (component instanceof UIParameter)
+            {
+                ((UIParameter)component).setValue(value.getExpressionString());
+            }
+            else if (component instanceof UISelectBoolean)
+            {
+                ((UISelectBoolean)component).setValue(Boolean.valueOf(value.getExpressionString()));
+            }
+            else if (component instanceof UIGraphic)
+            {
+                ((UIGraphic)component).setValue(value.getExpressionString());
+            }
+            //Since many input components are ValueHolders the special components
+            //must come first, ValueHolder is the last resort.
+            else if (component instanceof ValueHolder)
+            {
+                ((ValueHolder)component).setValue(value.getExpressionString());
+            }
+            else
+            {
+                log.error("Component " + component.getClass().getName() + " is no ValueHolder, cannot set value.");
+            }
+        }
+    }
+
+    /**
+     * @since 1.2
+     */
+    public static void setConverterProperty(FacesContext context,
+                                        UIComponent component,
+                                        ValueExpression value)
+    {
+        if (value != null)
+        {
+            if (component instanceof ValueHolder)
+            {
+                if (value.isLiteralText())
+                {
+                    FacesContext facesContext = FacesContext.getCurrentInstance();
+                    Converter converter = facesContext.getApplication().createConverter(value.getExpressionString());
+                    ((ValueHolder)component).setConverter(converter);
+                }
+                else
+                {
+                    component.setValueExpression(org.apache.myfaces.shared.renderkit.JSFAttr.CONVERTER_ATTR, value);
+                }
+            }
+            else
+            {
+                log.error("Component " + component.getClass().getName() + " is no ValueHolder, cannot set value.");
+            }
+        }
+    }
+
+    /**
+     * @since 1.2
+     */
+    public static void addValidatorProperty(FacesContext context,
+                                            UIComponent component,
+                                            MethodExpression validator)
+    {
+        if (validator != null)
+        {
+            if (!(component instanceof EditableValueHolder))
+            {
+                throw new IllegalArgumentException("Component " + component.getClientId(context) + " is no EditableValueHolder");
+            }
+
+            ((EditableValueHolder)component).addValidator(new MethodExpressionValidator(validator));
+        }
+    }
+
+    /**
+     * @since 1.2
+     */
+    public static void setValueBinding(FacesContext context,
+                                       UIComponent component,
+                                       String propName,
+                                       ValueExpression value)
+    {
+        if (value != null)
+        {
+            if (!value.isLiteralText())
+            {
+                component.setValueExpression(propName, value);
+            }
+            else
+            {
+                throw new IllegalArgumentException("Component " + component.getClientId(context) + " attribute " + propName + " must be a value reference, was " + value);
+            }
+        }
+    }
+
+    /**
+     * @since 1.2
+     */
+    public static void setActionProperty(FacesContext context,
+                                         UIComponent component,
+                                         MethodExpression action)
+    {
+        if (action != null)
+        {
+            if (!(component instanceof ActionSource2))
+            {
+                throw new IllegalArgumentException("Component " + component.getClientId(context) + " is no ActionSource2");
+            }
+
+            ((ActionSource2)component).setActionExpression(action);
+        }
+    }
+
+    /**
+     * @since 1.2
+     */
+    public static void addActionListenerProperty(FacesContext context,
+                                                 UIComponent component,
+                                                 MethodExpression actionListener)
+    {
+        if (actionListener != null)
+        {
+            if (!(component instanceof ActionSource2))
+            {
+                throw new IllegalArgumentException("Component " + component.getClientId(context) + " is no ActionSource");
+            }
+
+            ((ActionSource2)component).addActionListener(new MethodExpressionActionListener(actionListener));
+        }
+    }
+
+    /**
+     * @since 1.2
+     */
+    public static void addValueChangedListenerProperty(FacesContext context,
+                                                       UIComponent component,
+                                                       MethodExpression valueChangedListener)
+    {
+        if (valueChangedListener != null)
+        {
+            if (!(component instanceof EditableValueHolder))
+            {
+                throw new IllegalArgumentException("Component " + component.getClientId(context) + " is no EditableValueHolder");
+            }
+
+            ((EditableValueHolder)component).addValueChangeListener(
+                    new MethodExpressionValueChangeListener(valueChangedListener));
+        }
+    }
+
+    /**
+     * @since 1.2
+     */
+    public static Object evaluateValueExpression(ELContext elContext, ValueExpression valueExpression )
+    {
+        if (valueExpression.isLiteralText())
+        {
+            return valueExpression.getExpressionString();
+        }
+        else
+        {
+            return valueExpression.getValue(elContext);
+        }
+    }
+
+
+}

Propchange: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentELTagUtils.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentELTagUtils.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentTagUtils.java
URL: http://svn.apache.org/viewvc/myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentTagUtils.java?view=diff&rev=453927&r1=453926&r2=453927
==============================================================================
--- myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentTagUtils.java (original)
+++ myfaces/shared/branches/3_0_0/core/src/main/java/org/apache/myfaces/shared/taglib/UIComponentTagUtils.java Sat Oct  7 08:15:18 2006
@@ -27,17 +27,13 @@
 import javax.faces.el.ValueBinding;
 import javax.faces.event.ActionEvent;
 import javax.faces.event.ValueChangeEvent;
-import javax.faces.event.MethodExpressionActionListener;
-import javax.faces.event.MethodExpressionValueChangeListener;
 import javax.faces.webapp.UIComponentTag;
-import javax.faces.validator.MethodExpressionValidator;
-import javax.el.ValueExpression;
-import javax.el.MethodExpression;
-import javax.el.ELContext;
 
 /**
  * @author Manfred Geiler (latest modification by $Author$)
  * @version $Revision$ $Date$
+ *
+ * @deprecated replaced by @{link UIComponentELTagUtils}
  */
 public class UIComponentTagUtils
 {
@@ -52,113 +48,126 @@
     private UIComponentTagUtils() {}    //util class, no instantiation allowed
 
 
-    /**
-     * @deprecated
-     */
     public static boolean isValueReference(String v)
     {
         return UIComponentTag.isValueReference(v);
     }
 
-    /**
-     * @since 1.2
-     */
+
     public static void setIntegerProperty(FacesContext context,
                                           UIComponent component,
                                           String propName,
-                                          ValueExpression value)
+                                          String value)
     {
-        String strValue = (String) evaluateValueExpression(context.getELContext(), value);
-
-        if (strValue != null)
+        if (value != null)
         {
-            component.getAttributes().put(propName, Integer.valueOf(value.getExpressionString()));
+            if (isValueReference(value))
+            {
+                ValueBinding vb = context.getApplication().createValueBinding(value);
+                component.setValueBinding(propName, vb);
+            }
+            else
+            {
+                //FIXME: should use converter maybe?
+                component.getAttributes().put(propName, Integer.valueOf(value));
+            }
         }
     }
 
-
-    /**
-     * @since 1.2
-     */
     public static void setLongProperty(FacesContext context,
                                        UIComponent component,
                                        String propName,
-                                       ValueExpression value)
+                                       String value)
     {
-        String strValue = (String) evaluateValueExpression(context.getELContext(), value);
-
-        if (strValue != null)
+        if (value != null)
         {
-            component.getAttributes().put(propName, Long.valueOf(value.getExpressionString()));
+            if (isValueReference(value))
+            {
+                ValueBinding vb = context.getApplication().createValueBinding(value);
+                component.setValueBinding(propName, vb);
+            }
+            else
+            {
+                //FIXME: should use converter maybe?
+                component.getAttributes().put(propName, Long.valueOf(value));
+            }
         }
     }
 
-    /**
-     * @since 1.2
-     */
     public static void setStringProperty(FacesContext context,
                                      UIComponent component,
                                      String propName,
-                                     ValueExpression value)
+                                     String value)
     {
-        String strValue = (String) evaluateValueExpression(context.getELContext(), value);
-
-        if (strValue != null)
+        if (value != null)
         {
-            component.getAttributes().put(propName, value.getExpressionString());
+            if (isValueReference(value))
+            {
+                ValueBinding vb = context.getApplication().createValueBinding(value);
+                component.setValueBinding(propName, vb);
+            }
+            else
+            {
+                //TODO: Warning if component has no such property (with reflection)
+                component.getAttributes().put(propName, value);
+            }
         }
     }
 
-    /**
-     * @since 1.2
-     */
+
     public static void setBooleanProperty(FacesContext context,
                                       UIComponent component,
                                       String propName,
-                                      ValueExpression value)
+                                      String value)
     {
-        String strValue = (String) evaluateValueExpression(context.getELContext(), value);
-
-        if (strValue != null)
+        if (value != null)
         {
-            component.getAttributes().put(propName, Boolean.valueOf(value.getExpressionString()));
+            if (isValueReference(value))
+            {
+                ValueBinding vb = context.getApplication().createValueBinding(value);
+                component.setValueBinding(propName, vb);
+            }
+            else
+            {
+                //TODO: More sophisticated way to convert boolean value (yes/no, 1/0, on/off, etc.)
+                component.getAttributes().put(propName, Boolean.valueOf(value));
+            }
         }
     }
 
-    /**
-     * @since 1.2
-     */
+
     public static void setValueProperty(FacesContext context,
                                         UIComponent component,
-                                        ValueExpression value)
+                                        String value)
     {
         if (value != null)
         {
-            if (!value.isLiteralText())
+            if (isValueReference(value))
             {
-                component.setValueExpression(org.apache.myfaces.shared.renderkit.JSFAttr.VALUE_ATTR, value);
+                ValueBinding vb = context.getApplication().createValueBinding(value);
+                component.setValueBinding(org.apache.myfaces.shared.renderkit.JSFAttr.VALUE_ATTR, vb);
             }
             else if (component instanceof UICommand)
             {
-                ((UICommand)component).setValue(value.getExpressionString());
+                ((UICommand)component).setValue(value);
             }
             else if (component instanceof UIParameter)
             {
-                ((UIParameter)component).setValue(value.getExpressionString());
+                ((UIParameter)component).setValue(value);
             }
             else if (component instanceof UISelectBoolean)
             {
-                ((UISelectBoolean)component).setValue(Boolean.valueOf(value.getExpressionString()));
+                ((UISelectBoolean)component).setValue(Boolean.valueOf(value));
             }
             else if (component instanceof UIGraphic)
             {
-                ((UIGraphic)component).setValue(value.getExpressionString());
+                ((UIGraphic)component).setValue(value);
             }
             //Since many input components are ValueHolders the special components
             //must come first, ValueHolder is the last resort.
             else if (component instanceof ValueHolder)
             {
-                ((ValueHolder)component).setValue(value.getExpressionString());
+                ((ValueHolder)component).setValue(value);
             }
             else
             {
@@ -167,26 +176,25 @@
         }
     }
 
-    /**
-     * @since 1.2
-     */
+
     public static void setConverterProperty(FacesContext context,
                                         UIComponent component,
-                                        ValueExpression value)
+                                        String value)
     {
         if (value != null)
         {
             if (component instanceof ValueHolder)
             {
-                if (value.isLiteralText())
+                if (isValueReference(value))
                 {
-                    FacesContext facesContext = FacesContext.getCurrentInstance();
-                    Converter converter = facesContext.getApplication().createConverter(value.getExpressionString());
-                    ((ValueHolder)component).setConverter(converter);
+                    ValueBinding vb = context.getApplication().createValueBinding(value);
+                    component.setValueBinding(org.apache.myfaces.shared.renderkit.JSFAttr.CONVERTER_ATTR, vb);
                 }
                 else
                 {
-                    component.setValueExpression(org.apache.myfaces.shared.renderkit.JSFAttr.CONVERTER_ATTR, value);
+                    FacesContext facesContext = FacesContext.getCurrentInstance();
+                    Converter converter = facesContext.getApplication().createConverter(value);
+                    ((ValueHolder)component).setConverter(converter);
                 }
             }
             else
@@ -196,12 +204,10 @@
         }
     }
 
-    /**
-     * @since 1.2
-     */
-    public static void addValidatorProperty(FacesContext context,
+
+    public static void setValidatorProperty(FacesContext context,
                                             UIComponent component,
-                                            MethodExpression validator)
+                                            String validator)
     {
         if (validator != null)
         {
@@ -209,24 +215,30 @@
             {
                 throw new IllegalArgumentException("Component " + component.getClientId(context) + " is no EditableValueHolder");
             }
-
-            ((EditableValueHolder)component).addValidator(new MethodExpressionValidator(validator));
+            if (isValueReference(validator))
+            {
+                MethodBinding mb = context.getApplication().createMethodBinding(validator,
+                                                                                VALIDATOR_ARGS);
+                ((EditableValueHolder)component).setValidator(mb);
+            }
+            else
+            {
+                log.error("Component " + component.getClientId(context) + " has invalid validation expression " + validator);
+            }
         }
     }
 
-    /**
-     * @since 1.2
-     */
     public static void setValueBinding(FacesContext context,
                                        UIComponent component,
                                        String propName,
-                                       ValueExpression value)
+                                       String value)
     {
         if (value != null)
         {
-            if (!value.isLiteralText())
+            if (isValueReference(value))
             {
-                component.setValueExpression(propName, value);
+                ValueBinding vb = context.getApplication().createValueBinding(value);
+                component.setValueBinding(propName, vb);
             }
             else
             {
@@ -235,48 +247,65 @@
         }
     }
 
-    /**
-     * @since 1.2
-     */
     public static void setActionProperty(FacesContext context,
                                          UIComponent component,
-                                         MethodExpression action)
+                                         String action)
     {
         if (action != null)
         {
-            if (!(component instanceof ActionSource2))
+            if (!(component instanceof ActionSource))
             {
-                throw new IllegalArgumentException("Component " + component.getClientId(context) + " is no ActionSource2");
+                throw new IllegalArgumentException("Component " + component.getClientId(context) + " is no ActionSource");
             }
-
-            ((ActionSource2)component).setActionExpression(action);
+            MethodBinding mb;
+            if (isValueReference(action))
+            {
+                mb = context.getApplication().createMethodBinding(action, null);
+            }
+            else
+            {
+                mb = new SimpleActionMethodBinding(action);
+            }
+            ((ActionSource)component).setAction(mb);
         }
     }
 
-    /**
-     * @since 1.2
-     */
-    public static void addActionListenerProperty(FacesContext context,
+    public static void setActionListenerProperty(FacesContext context,
                                                  UIComponent component,
-                                                 MethodExpression actionListener)
+                                                 String actionListener)
     {
         if (actionListener != null)
         {
-            if (!(component instanceof ActionSource2))
+            if (!(component instanceof ActionSource))
             {
                 throw new IllegalArgumentException("Component " + component.getClientId(context) + " is no ActionSource");
             }
+            if (isValueReference(actionListener))
+            {
+                MethodBinding mb = context.getApplication().createMethodBinding(actionListener,
+                                                                                ACTION_LISTENER_ARGS);
 
-            ((ActionSource2)component).addActionListener(new MethodExpressionActionListener(actionListener));
+                /**
+                if(! Void.class.equals(mb.getType(context)))
+                {
+                    throw new IllegalArgumentException(
+                            actionListener +
+                            " : Return types for action listeners must be void, see JSF spec. 3.2.1.1");
+                }
+                */
+
+                ((ActionSource)component).setActionListener(mb);
+            }
+            else
+            {
+                log.error("Component " + component.getClientId(context) + " has invalid actionListener value: " + actionListener);
+            }
         }
     }
 
-    /**
-     * @since 1.2
-     */
-    public static void addValueChangedListenerProperty(FacesContext context,
+    public static void setValueChangedListenerProperty(FacesContext context,
                                                        UIComponent component,
-                                                       MethodExpression valueChangedListener)
+                                                       String valueChangedListener)
     {
         if (valueChangedListener != null)
         {
@@ -284,164 +313,26 @@
             {
                 throw new IllegalArgumentException("Component " + component.getClientId(context) + " is no EditableValueHolder");
             }
+            if (isValueReference(valueChangedListener))
+            {
+                MethodBinding mb = context.getApplication().createMethodBinding(valueChangedListener,
+                                                                                VALUE_LISTENER_ARGS);
+                /**
+                if(! Void.class.equals(mb.getType(context)))
+                {
+                    throw new IllegalArgumentException(
+                            valueChangedListener +
+                            " : Return types for value change listeners must be void, see JSF spec. 3.2.5.1");
+                }
+                */
 
-            ((EditableValueHolder)component).addValueChangeListener(
-                    new MethodExpressionValueChangeListener(valueChangedListener));
-        }
-    }
-
-    /**
-     * @since 1.2
-     */
-    public static Object evaluateValueExpression(ELContext elContext, ValueExpression valueExpression )
-    {
-        if (valueExpression.isLiteralText())
-        {
-            return valueExpression.getExpressionString();
-        }
-        else
-        {
-            return valueExpression.getValue(elContext);
+                ((EditableValueHolder)component).setValueChangeListener(mb);
+            }
+            else
+            {
+                log.error("Component " + component.getClientId(context) + " has invalid valueChangedListener expression " + valueChangedListener);
+            }
         }
     }
-
-
-    /**
-     * DEPRECATED METHODS
-     *********************/
-
-    /**
-     * @deprecated
-     */
-    public static void setIntegerProperty(FacesContext context,
-                                          UIComponent component,
-                                          String propName,
-                                          String value)
-    {
-        setLongProperty(context, component, propName, createValueExpression(context, value, Integer.class));
-    }
-
-    /**
-     * @deprecated
-     */
-    public static void setLongProperty(FacesContext context, 
-                                       UIComponent component,
-                                       String propName, 
-                                       String value)
-    {
-        setLongProperty(context, component, propName, createValueExpression(context, value, Long.class));
-    }
-
-    /**
-     * @deprecated
-     */
-    public static void setStringProperty(FacesContext context,
-                                     UIComponent component,
-                                     String propName,
-                                     String value)
-    {
-        setStringProperty(context, component, propName, createValueExpression(context, value, String.class));
-    }
-
-
-    /**
-     * @deprecated
-     */
-    public static void setBooleanProperty(FacesContext context,
-                                      UIComponent component,
-                                      String propName,
-                                      String value)
-    {
-        setStringProperty(context, component, propName, createValueExpression(context, value, Boolean.class));
-    }
-
-    /**
-     * @deprecated
-     */
-    public static void setValueProperty(FacesContext context,
-                                        UIComponent component,
-                                        String value)
-    {
-        setValueProperty(context, component, createValueExpression(context, value, Object.class));
-    }
-
-    /**
-     * @deprecated
-     */
-    public static void setConverterProperty(FacesContext context,
-                                        UIComponent component,
-                                        String value)
-    {
-        setValueProperty(context, component, createValueExpression(context, value, String.class));
-    }
-
-    /**
-     * @deprecated
-     */
-    public static void setValidatorProperty(FacesContext context,
-                                            UIComponent component,
-                                            String validator)
-    {
-        addValidatorProperty(context, component, createMethodExpression(context, validator, null, VALIDATOR_ARGS));
-    }
-
-    /**
-     * @deprecated
-     */
-    public static void setValueBinding(FacesContext context,
-                                       UIComponent component,
-                                       String propName,
-                                       String value)
-    {
-        setValueBinding(context, component, propName, createValueExpression(context, value, String.class));
-    }
-
-    /**
-     * @deprecated
-     */
-    public static void setActionProperty(FacesContext context,
-                                         UIComponent component,
-                                         String action)
-    {
-        setActionProperty(context, component, createMethodExpression(context, action, null, null));
-     }
-
-    /**
-     * @deprecated
-     */
-    public static void setActionListenerProperty(FacesContext context,
-                                                 UIComponent component,
-                                                 String actionListener)
-    {
-        addActionListenerProperty(context, component, createMethodExpression(context, actionListener, null, ACTION_LISTENER_ARGS));
-    }
-
-    /**
-     * @deprecated
-     */
-    public static void setValueChangedListenerProperty(FacesContext context,
-                                                       UIComponent component,
-                                                       String valueChangedListener)
-    {
-        addValueChangedListenerProperty(context, component, createMethodExpression(context, valueChangedListener, null, VALUE_LISTENER_ARGS));
-    }
-
-    private static ValueExpression createValueExpression(FacesContext context,
-                                     String expression,
-                                     Class expectedType)
-    {
-        return (expression == null)? null : context.getApplication().getExpressionFactory()
-                .createValueExpression(context.getELContext(), expression, expectedType);
-    }
-
-    private static MethodExpression createMethodExpression(FacesContext context,
-                                     String expression,
-                                     Class expectedType,
-                                     Class[] parameters)
-    {
-        return (expression == null)? null : context.getApplication().getExpressionFactory()
-                .createMethodExpression(context.getELContext(), expression, expectedType, parameters);
-    }
-
 
 }