You are viewing a plain text version of this content. The canonical link for it is here.
Posted to adffaces-commits@incubator.apache.org by aw...@apache.org on 2006/10/10 16:54:57 UTC
svn commit: r454826 - in /incubator/adffaces/branches/faces-1_2:
plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/
trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/
trinidad/trinidad-api/sr...
Author: awiner
Date: Tue Oct 10 09:54:55 2006
New Revision: 454826
URL: http://svn.apache.org/viewvc?view=rev&rev=454826
Log:
Change from ValueBinding to ValueExpression in a bunch more places
Removed:
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/binding/ValueBindingAdapter.java
Modified:
incubator/adffaces/branches/faces-1_2/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXComponentBase.java
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/ColorConverter.java
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/ConverterUtils.java
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/DateTimeConverter.java
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/NumberConverter.java
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/ByteLengthValidator.java
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/DateTimeRangeValidator.java
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/RegExpValidator.java
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/ValidatorUtils.java
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UIXComponentELTag.java
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/DialogServiceImpl.java
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverter.java
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/ReturnActionListenerTag.java
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuUtils.java
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/EditableValueRenderer.java
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyRenderer.java
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ValueRenderer.java
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/InputRenderer.java
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectItemSupport.java
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectManyRenderer.java
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/ComponentDefTag.java
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/ComponentRefTag.java
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/listener/SetActionListener.java
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/util/TagUtils.java
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/SelectManyShuttleRenderer.java
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/DecodingUINodeRenderer.java
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/bind/ConverterBoundValue.java
incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/LongRangeValidator.java
Modified: incubator/adffaces/branches/faces-1_2/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java?view=diff&rev=454826&r1=454825&r2=454826
==============================================================================
--- incubator/adffaces/branches/faces-1_2/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java (original)
+++ incubator/adffaces/branches/faces-1_2/plugins/maven-faces-plugin/src/main/java/org/apache/myfaces/trinidadbuild/plugin/faces/GenerateJspTaglibsMojo.java Tue Oct 10 09:54:55 2006
@@ -737,7 +737,10 @@
if (properties.hasNext())
{
imports.add("javax.faces.convert.Converter");
- imports.add("javax.faces.el.ValueBinding");
+ if (_is12())
+ imports.add("javax.el.ValueExpression");
+ else
+ imports.add("javax.faces.el.ValueBinding");
imports.add("org.apache.myfaces.trinidadinternal.taglib.util.TagUtils");
}
@@ -801,7 +804,9 @@
{
String propName = property.getPropertyName();
String propVar = "_" + Util.getVariableFromName(propName);
- out.println("private String " + propVar + ";");
+ String jspPropType = _getJspPropertyType(property);
+
+ out.println("private " + jspPropType + " " + propVar + ";");
}
private void _writePropertySet(
@@ -811,9 +816,10 @@
String propName = property.getPropertyName();
String propVar = Util.getVariableFromName(propName);
String setMethod = Util.getPrefixedPropertyName("set", propName);
+ String jspPropType = _getJspPropertyType(property);
// TODO: restore coding standards, and make final
- out.println("public void " + setMethod + "(String " + propVar + ")");
+ out.println("public void " + setMethod + "(" + jspPropType + " " + propVar + ")");
out.println("{");
out.indent();
out.println("_" + propVar + " = " + propVar + ";");
@@ -914,44 +920,89 @@
String propFullClass = property.getPropertyClass();
String propClass = Util.getClassFromFullClass(propFullClass);
String propVar = "_" + Util.getVariableFromName(propName);
+
out.println("if (" + propVar + " != null)");
out.println("{");
out.indent();
- out.println("if (TagUtils.isValueReference(" + propVar + "))");
- out.println("{");
- out.indent();
- out.println("ValueBinding vb = TagUtils.getValueBinding(" + propVar + ");");
- out.println("converter.setValueBinding(\"" + propName + "\", vb);");
- out.unindent();
- out.println("}");
- String propType = _resolveType(propFullClass);
- if (propType != null)
+
+ if (_is12())
{
- out.println("else");
+ out.println("if (!" + propVar + ".isLiteralText())");
out.println("{");
out.indent();
- if ("StringArray".equals(propType))
+ out.println("converter.setValueExpression(\"" + propName + "\", " +
+ propVar + ");");
+ out.unindent();
+ out.println("}");
+ String propType = _resolveType(propFullClass);
+ if (propType != null)
{
- out.println("try");
+ out.println("else");
out.println("{");
+ out.indent();
+ if ("StringArray".equals(propType))
+ {
+ out.println("try");
+ out.println("{");
+ }
+
+ out.println(propClass + " value = TagUtils.get" + propType + "(" + propVar + ".getValue(null));");
+ String setMethod = Util.getPrefixedPropertyName("set", propName);
+ out.println("converter." + setMethod + "(value);");
+ if ("StringArray".equals(propType))
+ {
+ out.println("}");
+ out.println("catch (ParseException pe)");
+ out.println("{");
+ out.indent();
+ out.println("throw new JspException(");
+ out.println(" pe.getMessage() + \": \" + \"Position \" + pe.getErrorOffset());");
+ out.unindent();
+ out.println("}");
+ }
+ out.unindent();
+ out.println("}");
}
- out.println(propClass + " value = TagUtils.get" + propType + "(" + propVar + ");");
- String setMethod = Util.getPrefixedPropertyName("set", propName);
- out.println("converter." + setMethod + "(value);");
- if ("StringArray".equals(propType))
+ }
+ else
+ {
+ out.println("if (TagUtils.isValueReference(" + propVar + "))");
+ out.println("{");
+ out.indent();
+ out.println("ValueBinding vb = TagUtils.getValueBinding(" + propVar + ");");
+ out.println("converter.setValueBinding(\"" + propName + "\", vb);");
+ out.unindent();
+ out.println("}");
+ String propType = _resolveType(propFullClass);
+ if (propType != null)
{
- out.println("}");
- out.println("catch (ParseException pe)");
+ out.println("else");
out.println("{");
out.indent();
- out.println("throw new JspException(");
- out.println(" pe.getMessage() + \": \" + \"Position \" + pe.getErrorOffset());");
+ if ("StringArray".equals(propType))
+ {
+ out.println("try");
+ out.println("{");
+ }
+ out.println(propClass + " value = TagUtils.get" + propType + "(" + propVar + ");");
+ String setMethod = Util.getPrefixedPropertyName("set", propName);
+ out.println("converter." + setMethod + "(value);");
+ if ("StringArray".equals(propType))
+ {
+ out.println("}");
+ out.println("catch (ParseException pe)");
+ out.println("{");
+ out.indent();
+ out.println("throw new JspException(");
+ out.println(" pe.getMessage() + \": \" + \"Position \" + pe.getErrorOffset());");
+ out.unindent();
+ out.println("}");
+ }
out.unindent();
out.println("}");
}
- out.unindent();
- out.println("}");
}
+
out.unindent();
out.println("}");
}
@@ -981,6 +1032,19 @@
out.println("}");
}
}
+
+ private String _getJspPropertyType(PropertyBean property)
+ {
+ if (property.isMethodExpression())
+ return "MethodExpression";
+
+ if (_is12() && property.isMethodBinding())
+ return "MethodExpression";
+
+ if (_is12() && !property.isLiteralOnly())
+ return "ValueExpression";
+ return "String";
+ }
}
class ValidatorTagGenerator
@@ -1083,7 +1147,10 @@
if (properties.hasNext())
{
imports.add("javax.faces.validator.Validator");
- imports.add("javax.faces.el.ValueBinding");
+ if (_is12())
+ imports.add("javax.el.ValueExpression");
+ else
+ imports.add("javax.faces.el.ValueBinding");
imports.add("org.apache.myfaces.trinidadinternal.taglib.util.TagUtils");
}
@@ -1147,7 +1214,9 @@
{
String propName = property.getPropertyName();
String propVar = "_" + Util.getVariableFromName(propName);
- out.println("private String " + propVar + ";");
+ String jspPropType = _getJspPropertyType(property);
+
+ out.println("private " + jspPropType + " " + propVar + ";");
}
private void _writePropertySet(
@@ -1157,9 +1226,10 @@
String propName = property.getPropertyName();
String propVar = Util.getVariableFromName(propName);
String setMethod = Util.getPrefixedPropertyName("set", propName);
+ String jspPropType = _getJspPropertyType(property);
// TODO: restore coding standards, and make final
- out.println("public void " + setMethod + "(String " + propVar + ")");
+ out.println("public void " + setMethod + "(" + jspPropType + " " + propVar + ")");
out.println("{");
out.indent();
out.println("_" + propVar + " = " + propVar + ";");
@@ -1263,41 +1333,84 @@
out.println("if (" + propVar + " != null)");
out.println("{");
out.indent();
- out.println("if (TagUtils.isValueReference(" + propVar + "))");
- out.println("{");
- out.indent();
- out.println("ValueBinding vb = TagUtils.getValueBinding(" + propVar + ");");
- out.println("validator.setValueBinding(\"" + propName + "\", vb);");
- out.unindent();
- out.println("}");
- String propType = _resolveType(propFullClass);
- if (propType != null)
+ if (_is12())
{
- out.println("else");
+ out.println("if (!" + propVar + ".isLiteralText())");
out.println("{");
out.indent();
- if ("StringArray".equals(propType))
+ out.println("validator.setValueExpression(\"" + propName + "\", " +
+ propVar + ");");
+ out.unindent();
+ out.println("}");
+ String propType = _resolveType(propFullClass);
+ if (propType != null)
{
- out.println("try");
+ out.println("else");
out.println("{");
+ out.indent();
+ if ("StringArray".equals(propType))
+ {
+ out.println("try");
+ out.println("{");
+ }
+
+ out.println(propClass + " value = TagUtils.get" + propType + "(" + propVar + ".getValue(null));");
+ String setMethod = Util.getPrefixedPropertyName("set", propName);
+ out.println("validator." + setMethod + "(value);");
+ if ("StringArray".equals(propType))
+ {
+ out.println("}");
+ out.println("catch (ParseException pe)");
+ out.println("{");
+ out.indent();
+ out.println("throw new JspException(");
+ out.println(" pe.getMessage() + \": \" + \"Position \" + pe.getErrorOffset());");
+ out.unindent();
+ out.println("}");
+ }
+ out.unindent();
+ out.println("}");
}
- out.println(propClass + " value = TagUtils.get" + propType + "(" + propVar + ");");
- String setMethod = Util.getPrefixedPropertyName("set", propName);
- out.println("validator." + setMethod + "(value);");
- if ("StringArray".equals(propType))
+ }
+ else
+ {
+ out.println("if (TagUtils.isValueReference(" + propVar + "))");
+ out.println("{");
+ out.indent();
+ out.println("ValueBinding vb = TagUtils.getValueBinding(" + propVar + ");");
+ out.println("validator.setValueBinding(\"" + propName + "\", vb);");
+ out.unindent();
+ out.println("}");
+ String propType = _resolveType(propFullClass);
+ if (propType != null)
{
- out.println("}");
- out.println("catch (ParseException pe)");
+ out.println("else");
out.println("{");
out.indent();
- out.println("throw new JspException(");
- out.println(" pe.getMessage() + \": \" + \"Position \" + pe.getErrorOffset());");
+ if ("StringArray".equals(propType))
+ {
+ out.println("try");
+ out.println("{");
+ }
+ out.println(propClass + " value = TagUtils.get" + propType + "(" + propVar + ");");
+ String setMethod = Util.getPrefixedPropertyName("set", propName);
+ out.println("validator." + setMethod + "(value);");
+ if ("StringArray".equals(propType))
+ {
+ out.println("}");
+ out.println("catch (ParseException pe)");
+ out.println("{");
+ out.indent();
+ out.println("throw new JspException(");
+ out.println(" pe.getMessage() + \": \" + \"Position \" + pe.getErrorOffset());");
+ out.unindent();
+ out.println("}");
+ }
out.unindent();
out.println("}");
}
- out.unindent();
- out.println("}");
}
+
out.unindent();
out.println("}");
}
@@ -1327,6 +1440,19 @@
out.println("}");
}
}
+
+ private String _getJspPropertyType(PropertyBean property)
+ {
+ if (property.isMethodExpression())
+ return "MethodExpression";
+
+ if (_is12() && property.isMethodBinding())
+ return "MethodExpression";
+
+ if (_is12() && !property.isLiteralOnly())
+ return "ValueExpression";
+ return "String";
+ }
}
class ComponentTagGenerator
@@ -1463,27 +1589,42 @@
if (_isKeyStroke(propertyClass))
{
- imports.add("javax.faces.el.ValueBinding");
+ if (_is12())
+ imports.add("javax.el.ValueExpression");
+ else
+ imports.add("javax.faces.el.ValueBinding");
imports.add("javax.swing.KeyStroke");
}
else if (_isAWTKeyStroke(propertyClass))
{
- imports.add("javax.faces.el.ValueBinding");
+ if (_is12())
+ imports.add("javax.el.ValueExpression");
+ else
+ imports.add("javax.faces.el.ValueBinding");
imports.add("java.awt.AWTKeyStroke");
}
else if (_isConverter(propertyClass))
{
- imports.add("javax.faces.el.ValueBinding");
+ if (_is12())
+ imports.add("javax.el.ValueExpression");
+ else
+ imports.add("javax.faces.el.ValueBinding");
imports.add("javax.faces.convert.Converter");
}
else if (property.isVirtual())
{
- imports.add("javax.faces.el.ValueBinding");
+ if (_is12())
+ imports.add("javax.el.ValueExpression");
+ else
+ imports.add("javax.faces.el.ValueBinding");
imports.add("org.apache.myfaces.trinidadinternal.taglib.util.VirtualAttributeUtils");
}
else if (_isColorList(propertyClass, propertyClassParams))
{
- imports.add("javax.faces.el.ValueBinding");
+ if (_is12())
+ imports.add("javax.el.ValueExpression");
+ else
+ imports.add("javax.faces.el.ValueBinding");
imports.add("java.text.ParseException");
imports.add("org.apache.myfaces.trinidadinternal.taglib.util.TagUtils");
}
@@ -2465,4 +2606,4 @@
_CAN_COERCE.add("char");
_CAN_COERCE.add("byte");
}
-}
\ No newline at end of file
+}
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXComponentBase.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXComponentBase.java?view=diff&rev=454826&r1=454825&r2=454826
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXComponentBase.java (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/component/UIXComponentBase.java Tue Oct 10 09:54:55 2006
@@ -30,8 +30,6 @@
import javax.el.MethodExpression;
import javax.el.ValueExpression;
-import javax.faces.FacesException;
-import javax.faces.component.ContextCallback;
import javax.faces.component.NamingContainer;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/ColorConverter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/ColorConverter.java?view=diff&rev=454826&r1=454825&r2=454826
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/ColorConverter.java (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/ColorConverter.java Tue Oct 10 09:54:55 2006
@@ -19,6 +19,8 @@
import java.text.ParseException;
+import javax.el.ValueExpression;
+
import javax.faces.application.FacesMessage;
import javax.faces.component.StateHolder;
import javax.faces.component.UIComponent;
@@ -397,6 +399,42 @@
}
/**
+ * <p>Set the {@link ValueExpression} used to calculate the value for the
+ * specified attribute if any.</p>
+ *
+ * @param name Name of the attribute for which to set a {@link ValueExpression}
+ * @param expression The {@link ValueExpression} to set, or <code>null</code>
+ * to remove any currently set {@link ValueExpression}
+ *
+ * @exception NullPointerException if <code>name</code>
+ * is <code>null</code>
+ * @exception IllegalArgumentException if <code>name</code> is not a valid
+ * attribute of this converter
+ */
+ public void setValueExpression(String name, ValueExpression expression)
+ {
+ ConverterUtils.setValueExpression(_facesBean, name, expression) ;
+ }
+
+
+ /**
+ * <p>Return the {@link ValueExpression} used to calculate the value for the
+ * specified attribute name, if any.</p>
+ *
+ * @param name Name of the attribute or property for which to retrieve a
+ * {@link ValueExpression}
+ *
+ * @exception NullPointerException if <code>name</code>
+ * is <code>null</code>
+ * @exception IllegalArgumentException if <code>name</code> is not a valid
+ * attribute of this converter
+ */
+ public ValueExpression getValueExpression(String name)
+ {
+ return ConverterUtils.getValueExpression(_facesBean, name);
+ }
+
+ /**
* <p>Set the {@link ValueBinding} used to calculate the value for the
* specified attribute if any.</p>
*
@@ -408,6 +446,7 @@
* is <code>null</code>
* @exception IllegalArgumentException if <code>name</code> is not a valid
* attribute of this converter
+ * @deprecated
*/
public void setValueBinding(String name, ValueBinding binding)
{
@@ -425,6 +464,7 @@
* is <code>null</code>
* @exception IllegalArgumentException if <code>name</code> is not a valid
* attribute of this converter
+ * @deprecated
*/
public ValueBinding getValueBinding(String name)
{
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/ConverterUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/ConverterUtils.java?view=diff&rev=454826&r1=454825&r2=454826
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/ConverterUtils.java (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/ConverterUtils.java Tue Oct 10 09:54:55 2006
@@ -14,6 +14,8 @@
* limitations under the License.
*/
package org.apache.myfaces.trinidad.convert;
+
+import javax.el.ValueExpression;
import javax.faces.component.UIComponent;
import javax.faces.el.ValueBinding;
@@ -54,6 +56,19 @@
return bean;
}
+ static void setValueExpression(FacesBean bean, String name, ValueExpression expression)
+ {
+ PropertyKey key = _getPropertyKey(bean, name, true);
+ bean.setValueExpression(key, expression);
+ }
+
+ static ValueExpression getValueExpression(FacesBean bean, String name)
+ {
+ PropertyKey key = _getPropertyKey(bean, name, true);
+ return bean.getValueExpression(key);
+ }
+
+
static void setValueBinding(FacesBean bean, String name, ValueBinding binding)
{
PropertyKey key = _getPropertyKey(bean, name, true);
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/DateTimeConverter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/DateTimeConverter.java?view=diff&rev=454826&r1=454825&r2=454826
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/DateTimeConverter.java (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/DateTimeConverter.java Tue Oct 10 09:54:55 2006
@@ -30,6 +30,8 @@
import java.util.Set;
import java.util.TimeZone;
+import javax.el.ValueExpression;
+
import javax.faces.application.FacesMessage;
import javax.faces.component.StateHolder;
import javax.faces.component.UIComponent;
@@ -881,6 +883,42 @@
}
/**
+ * <p>Set the {@link ValueExpression} used to calculate the value for the
+ * specified attribute if any.</p>
+ *
+ * @param name Name of the attribute for which to set a {@link ValueExpression}
+ * @param expression The {@link ValueExpression} to set, or <code>null</code>
+ * to remove any currently set {@link ValueExpression}
+ *
+ * @exception NullPointerException if <code>name</code>
+ * is <code>null</code>
+ * @exception IllegalArgumentException if <code>name</code> is not a valid
+ * attribute of this converter
+ */
+ public void setValueExpression(String name, ValueExpression expression)
+ {
+ ConverterUtils.setValueExpression(_facesBean, name, expression) ;
+ }
+
+
+ /**
+ * <p>Return the {@link ValueExpression} used to calculate the value for the
+ * specified attribute name, if any.</p>
+ *
+ * @param name Name of the attribute or property for which to retrieve a
+ * {@link ValueExpression}
+ *
+ * @exception NullPointerException if <code>name</code>
+ * is <code>null</code>
+ * @exception IllegalArgumentException if <code>name</code> is not a valid
+ * attribute of this converter
+ */
+ public ValueExpression getValueExpression(String name)
+ {
+ return ConverterUtils.getValueExpression(_facesBean, name);
+ }
+
+ /**
* <p>Set the {@link ValueBinding} used to calculate the value for the
* specified attribute if any.</p>
*
@@ -892,6 +930,7 @@
* is <code>null</code>
* @exception IllegalArgumentException if <code>name</code> is not a valid
* attribute of this converter
+ * @deprecated
*/
public void setValueBinding(String name, ValueBinding binding)
{
@@ -910,6 +949,7 @@
* is <code>null</code>
* @exception IllegalArgumentException if <code>name</code> is not a valid
* attribute of this converter
+ * @deprecated
*/
public ValueBinding getValueBinding(String name)
{
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/NumberConverter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/NumberConverter.java?view=diff&rev=454826&r1=454825&r2=454826
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/NumberConverter.java (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/convert/NumberConverter.java Tue Oct 10 09:54:55 2006
@@ -26,6 +26,8 @@
import java.util.Locale;
import java.util.Map;
+import javax.el.ValueExpression;
+
import javax.faces.application.FacesMessage;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
@@ -322,6 +324,42 @@
}
/**
+ * <p>Set the {@link ValueExpression} used to calculate the value for the
+ * specified attribute if any.</p>
+ *
+ * @param name Name of the attribute for which to set a {@link ValueExpression}
+ * @param expression The {@link ValueExpression} to set, or <code>null</code>
+ * to remove any currently set {@link ValueExpression}
+ *
+ * @exception NullPointerException if <code>name</code>
+ * is <code>null</code>
+ * @exception IllegalArgumentException if <code>name</code> is not a valid
+ * attribute of this converter
+ */
+ public void setValueExpression(String name, ValueExpression expression)
+ {
+ ConverterUtils.setValueExpression(_facesBean, name, expression) ;
+ }
+
+
+ /**
+ * <p>Return the {@link ValueExpression} used to calculate the value for the
+ * specified attribute name, if any.</p>
+ *
+ * @param name Name of the attribute or property for which to retrieve a
+ * {@link ValueExpression}
+ *
+ * @exception NullPointerException if <code>name</code>
+ * is <code>null</code>
+ * @exception IllegalArgumentException if <code>name</code> is not a valid
+ * attribute of this converter
+ */
+ public ValueExpression getValueExpression(String name)
+ {
+ return ConverterUtils.getValueExpression(_facesBean, name);
+ }
+
+ /**
* <p>Set the {@link ValueBinding} used to calculate the value for the
* specified attribute if any.</p>
*
@@ -333,6 +371,7 @@
* is <code>null</code>
* @exception IllegalArgumentException if <code>name</code> is not a valid
* attribute of this converter
+ * @deprecated
*/
public void setValueBinding(String name, ValueBinding binding)
{
@@ -350,6 +389,7 @@
* is <code>null</code>
* @exception IllegalArgumentException if <code>name</code> is not a valid
* attribute of this converter
+ * @deprecated
*/
public ValueBinding getValueBinding(String name)
{
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/ByteLengthValidator.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/ByteLengthValidator.java?view=diff&rev=454826&r1=454825&r2=454826
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/ByteLengthValidator.java (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/ByteLengthValidator.java Tue Oct 10 09:54:55 2006
@@ -19,6 +19,8 @@
import java.nio.charset.IllegalCharsetNameException;
+import javax.el.ValueExpression;
+
import javax.faces.application.FacesMessage;
import javax.faces.component.StateHolder;
import javax.faces.component.UIComponent;
@@ -242,6 +244,43 @@
_isTransient = transientValue;
}
+
+ /**
+ * <p>Set the {@link ValueExpression} used to calculate the value for the
+ * specified attribute if any.</p>
+ *
+ * @param name Name of the attribute for which to set a {@link ValueExpression}
+ * @param expression The {@link ValueExpression} to set, or <code>null</code>
+ * to remove any currently set {@link ValueExpression}
+ *
+ * @exception NullPointerException if <code>name</code>
+ * is <code>null</code>
+ * @exception IllegalArgumentException if <code>name</code> is not a valid
+ * attribute of this converter
+ */
+ public void setValueExpression(String name, ValueExpression expression)
+ {
+ ValidatorUtils.setValueExpression(_facesBean, name, expression) ;
+ }
+
+
+ /**
+ * <p>Return the {@link ValueExpression} used to calculate the value for the
+ * specified attribute name, if any.</p>
+ *
+ * @param name Name of the attribute or property for which to retrieve a
+ * {@link ValueExpression}
+ *
+ * @exception NullPointerException if <code>name</code>
+ * is <code>null</code>
+ * @exception IllegalArgumentException if <code>name</code> is not a valid
+ * attribute of this converter
+ */
+ public ValueExpression getValueExpression(String name)
+ {
+ return ValidatorUtils.getValueExpression(_facesBean, name);
+ }
+
/**
* <p>Set the {@link ValueBinding} used to calculate the value for the
* specified attribute if any.</p>
@@ -254,6 +293,7 @@
* is <code>null</code>
* @exception IllegalArgumentException if <code>name</code> is not a valid
* attribute of this validator
+ * @deprecated
*/
public void setValueBinding(String name, ValueBinding binding)
{
@@ -271,6 +311,7 @@
* is <code>null</code>
* @exception IllegalArgumentException if <code>name</code> is not a valid
* attribute of this validator
+ * @deprecated
*/
public ValueBinding getValueBinding(String name)
{
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/DateTimeRangeValidator.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/DateTimeRangeValidator.java?view=diff&rev=454826&r1=454825&r2=454826
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/DateTimeRangeValidator.java (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/DateTimeRangeValidator.java Tue Oct 10 09:54:55 2006
@@ -18,6 +18,8 @@
import java.util.Date;
+import javax.el.ValueExpression;
+
import javax.faces.application.FacesMessage;
import javax.faces.component.StateHolder;
import javax.faces.component.UIComponent;
@@ -337,6 +339,44 @@
_facesBean.restoreState(context, state);
}
+
+ /**
+ * <p>Set the {@link ValueExpression} used to calculate the value for the
+ * specified attribute if any.</p>
+ *
+ * @param name Name of the attribute for which to set a {@link ValueExpression}
+ * @param expression The {@link ValueExpression} to set, or <code>null</code>
+ * to remove any currently set {@link ValueExpression}
+ *
+ * @exception NullPointerException if <code>name</code>
+ * is <code>null</code>
+ * @exception IllegalArgumentException if <code>name</code> is not a valid
+ * attribute of this converter
+ */
+ public void setValueExpression(String name, ValueExpression expression)
+ {
+ ValidatorUtils.setValueExpression(_facesBean, name, expression) ;
+ }
+
+
+ /**
+ * <p>Return the {@link ValueExpression} used to calculate the value for the
+ * specified attribute name, if any.</p>
+ *
+ * @param name Name of the attribute or property for which to retrieve a
+ * {@link ValueExpression}
+ *
+ * @exception NullPointerException if <code>name</code>
+ * is <code>null</code>
+ * @exception IllegalArgumentException if <code>name</code> is not a valid
+ * attribute of this converter
+ */
+ public ValueExpression getValueExpression(String name)
+ {
+ return ValidatorUtils.getValueExpression(_facesBean, name);
+ }
+
+
/**
* <p>Set the {@link ValueBinding} used to calculate the value for the
* specified attribute if any.</p>
@@ -349,6 +389,7 @@
* is <code>null</code>
* @exception IllegalArgumentException if <code>name</code> is not a valid
* attribute of this validator
+ * @deprecated
*/
public void setValueBinding(String name, ValueBinding binding)
{
@@ -366,6 +407,7 @@
* is <code>null</code>
* @exception IllegalArgumentException if <code>name</code> is not a valid
* attribute of this validator
+ * @deprecated
*/
public ValueBinding getValueBinding(String name)
{
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/RegExpValidator.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/RegExpValidator.java?view=diff&rev=454826&r1=454825&r2=454826
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/RegExpValidator.java (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/RegExpValidator.java Tue Oct 10 09:54:55 2006
@@ -19,6 +19,8 @@
import java.util.regex.Pattern;
import java.util.regex.PatternSyntaxException;
+import javax.el.ValueExpression;
+
import javax.faces.application.FacesMessage;
import javax.faces.component.StateHolder;
import javax.faces.component.UIComponent;
@@ -164,6 +166,44 @@
_facesBean.restoreState(context, state);
}
+
+ /**
+ * <p>Set the {@link ValueExpression} used to calculate the value for the
+ * specified attribute if any.</p>
+ *
+ * @param name Name of the attribute for which to set a {@link ValueExpression}
+ * @param expression The {@link ValueExpression} to set, or <code>null</code>
+ * to remove any currently set {@link ValueExpression}
+ *
+ * @exception NullPointerException if <code>name</code>
+ * is <code>null</code>
+ * @exception IllegalArgumentException if <code>name</code> is not a valid
+ * attribute of this converter
+ */
+ public void setValueExpression(String name, ValueExpression expression)
+ {
+ ValidatorUtils.setValueExpression(_facesBean, name, expression) ;
+ }
+
+
+ /**
+ * <p>Return the {@link ValueExpression} used to calculate the value for the
+ * specified attribute name, if any.</p>
+ *
+ * @param name Name of the attribute or property for which to retrieve a
+ * {@link ValueExpression}
+ *
+ * @exception NullPointerException if <code>name</code>
+ * is <code>null</code>
+ * @exception IllegalArgumentException if <code>name</code> is not a valid
+ * attribute of this converter
+ */
+ public ValueExpression getValueExpression(String name)
+ {
+ return ValidatorUtils.getValueExpression(_facesBean, name);
+ }
+
+
/**
* <p>Set the {@link ValueBinding} used to calculate the value for the
* specified attribute if any.</p>
@@ -176,6 +216,7 @@
* is <code>null</code>
* @exception IllegalArgumentException if <code>name</code> is not a valid
* attribute of this validator
+ * @deprecated
*/
public void setValueBinding(String name, ValueBinding binding)
{
@@ -193,6 +234,7 @@
* is <code>null</code>
* @exception IllegalArgumentException if <code>name</code> is not a valid
* attribute of this validator
+ * @deprecated
*/
public ValueBinding getValueBinding(String name)
{
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/ValidatorUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/ValidatorUtils.java?view=diff&rev=454826&r1=454825&r2=454826
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/ValidatorUtils.java (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/validator/ValidatorUtils.java Tue Oct 10 09:54:55 2006
@@ -14,6 +14,9 @@
* limitations under the License.
*/
package org.apache.myfaces.trinidad.validator;
+
+import javax.el.ValueExpression;
+
import javax.faces.component.UIComponent;
import javax.faces.el.ValueBinding;
@@ -69,6 +72,18 @@
return bean;
}
+ static void setValueExpression(FacesBean bean, String name, ValueExpression expression)
+ {
+ PropertyKey key = _getPropertyKey(bean, name, true);
+ bean.setValueExpression(key, expression);
+ }
+
+ static ValueExpression getValueExpression(FacesBean bean, String name)
+ {
+ PropertyKey key = _getPropertyKey(bean, name, true);
+ return bean.getValueExpression(key);
+ }
+
static void setValueBinding(FacesBean bean, String name, ValueBinding binding)
{
PropertyKey key = _getPropertyKey(bean, name, true);
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UIXComponentELTag.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UIXComponentELTag.java?view=diff&rev=454826&r1=454825&r2=454826
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UIXComponentELTag.java (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-api/src/main/java/org/apache/myfaces/trinidad/webapp/UIXComponentELTag.java Tue Oct 10 09:54:55 2006
@@ -28,12 +28,9 @@
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
-import javax.faces.el.MethodBinding;
-import javax.faces.el.ValueBinding;
import javax.faces.webapp.UIComponentELTag;
import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.TagSupport;
import org.apache.myfaces.trinidad.bean.FacesBean;
import org.apache.myfaces.trinidad.bean.PropertyKey;
@@ -42,7 +39,6 @@
import org.apache.myfaces.trinidad.change.ComponentChange;
import org.apache.myfaces.trinidad.component.UIXComponent;
import org.apache.myfaces.trinidad.context.RequestContext;
-import org.apache.myfaces.trinidad.event.AttributeChangeEvent;
import org.apache.myfaces.trinidad.logging.TrinidadLogger;
/**
@@ -130,7 +126,7 @@
/**
* Set a property of type java.lang.String[]. If the value
- * is an EL expression, it will be stored as a ValueBinding.
+ * is an EL expression, it will be stored as a ValueExpression.
* Otherwise, it will parsed as a whitespace-separated series
* of strings.
* Null values are ignored.
@@ -155,7 +151,7 @@
/**
* Set a property of type int[]. If the value
- * is an EL expression, it will be stored as a ValueBinding.
+ * is an EL expression, it will be stored as a ValueExpression.
* Otherwise, it will parsed as a whitespace-separated series
* of ints.
* Null values are ignored.
@@ -204,7 +200,7 @@
/**
* Set a property of type java.util.Date. If the value
- * is an EL expression, it will be stored as a ValueBinding.
+ * is an EL expression, it will be stored as a ValueExpression.
* Otherwise, it will parsed as an ISO 8601 date (yyyy-MM-dd).
* Null values are ignored.
*/
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/DialogServiceImpl.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/DialogServiceImpl.java?view=diff&rev=454826&r1=454825&r2=454826
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/DialogServiceImpl.java (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/context/DialogServiceImpl.java Tue Oct 10 09:54:55 2006
@@ -21,10 +21,11 @@
import java.util.List;
import java.util.Map;
+import javax.el.ValueExpression;
+
import javax.faces.component.UIComponent;
import javax.faces.component.UIViewRoot;
import javax.faces.context.FacesContext;
-import javax.faces.el.ValueBinding;
import javax.faces.render.RenderKit;
import org.apache.myfaces.trinidad.context.RequestContext;
@@ -410,9 +411,9 @@
@SuppressWarnings("unchecked")
private void _executeBindings(FacesContext context, UIComponent component)
{
- ValueBinding binding = component.getValueBinding("binding");
- if (binding != null)
- binding.setValue(context, component);
+ ValueExpression expression = component.getValueExpression("binding");
+ if (expression != null)
+ expression.setValue(context.getELContext(), component);
Iterator<UIComponent> kids = component.getFacetsAndChildren();
while (kids.hasNext())
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverter.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverter.java?view=diff&rev=454826&r1=454825&r2=454826
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverter.java (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/convert/DateTimeConverter.java Tue Oct 10 09:54:55 2006
@@ -29,7 +29,7 @@
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.convert.ConverterException;
-import javax.faces.el.ValueBinding;
+import javax.el.ValueExpression;
import org.apache.myfaces.trinidad.logging.TrinidadLogger;
@@ -108,10 +108,10 @@
Object value)
{
assert value != null;
- ValueBinding binding = component.getValueBinding("value");
- if (binding != null)
+ ValueExpression expression = component.getValueExpression("value");
+ if (expression != null)
{
- Class<?> expectedType = binding.getType(context);
+ Class<?> expectedType = expression.getType(context.getELContext());
// Sometimes the type might be null, if it cannot be determined:
if ((expectedType != null) && (!expectedType.isAssignableFrom(value.getClass())))
{
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/ReturnActionListenerTag.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/ReturnActionListenerTag.java?view=diff&rev=454826&r1=454825&r2=454826
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/ReturnActionListenerTag.java (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/facelets/ReturnActionListenerTag.java Tue Oct 10 09:54:55 2006
@@ -55,10 +55,10 @@
ValueExpression valueExp = _value.getValueExpression(faceletContext, Object.class);
ActionSource actionSource = (ActionSource)parent;
ReturnActionListener listener = new ReturnActionListener();
- listener.setValueBinding(ReturnActionListener.VALUE_KEY, new LegacyValueBinding(valueExp));
+ listener.setValueExpression(ReturnActionListener.VALUE_KEY, valueExp);
actionSource.addActionListener(listener);
}
}
private final TagAttribute _value;
-}
\ No newline at end of file
+}
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuUtils.java?view=diff&rev=454826&r1=454825&r2=454826
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuUtils.java (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/menu/MenuUtils.java Tue Oct 10 09:54:55 2006
@@ -31,8 +31,6 @@
import java.util.Set;
import javax.faces.context.FacesContext;
-import javax.faces.el.ValueBinding;
-
import javax.faces.webapp.UIComponentTag;
import org.apache.myfaces.trinidad.logging.TrinidadLogger;
@@ -48,7 +46,7 @@
MenuUtils() {}
//=======================================================================
- // Bound Value/EL Binding utilities
+ // Bound Value/EL Expression utilities
//=======================================================================
/**
@@ -62,12 +60,10 @@
try
{
- // Value of rendered is EL method binding, so we
- // need to evaluate it
- FacesContext ctx = FacesContext.getCurrentInstance();
- ValueBinding binding =
- ctx.getApplication().createValueBinding(elExpression);
- retVal = binding.getValue(ctx);
+ FacesContext ctx = FacesContext.getCurrentInstance();
+ return ctx.getApplication().evaluateExpressionGet(ctx,
+ elExpression,
+ null);
}
catch (Exception ex)
{
@@ -75,7 +71,6 @@
" is invalid or returned a bad value.\n", ex);
return null;
}
- return retVal;
}
/**
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/EditableValueRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/EditableValueRenderer.java?view=diff&rev=454826&r1=454825&r2=454826
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/EditableValueRenderer.java (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/EditableValueRenderer.java Tue Oct 10 09:54:55 2006
@@ -19,12 +19,13 @@
import java.util.Iterator;
+import javax.el.ValueExpression;
+
import javax.faces.component.EditableValueHolder;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.convert.Converter;
import javax.faces.convert.ConverterException;
-import javax.faces.el.ValueBinding;
import javax.faces.validator.Validator;
import org.apache.myfaces.trinidad.logging.TrinidadLogger;
@@ -227,15 +228,15 @@
if (Boolean.TRUE.equals(o))
return true;
- // Now, if the ValueBinding underlying the value says it's
+ // Now, if the ValueExpression underlying the value says it's
// read-only, then again, it is.
- ValueBinding vb = getValueBinding(bean);
- if ((vb != null) && vb.isReadOnly(context))
+ ValueExpression ve = getValueExpression(bean);
+ if ((ve != null) && ve.isReadOnly(context.getELContext()))
{
if (_LOG.isFiner())
{
_LOG.finer("Value expression {0} is read-only",
- vb.getExpressionString());
+ ve.getExpressionString());
}
return true;
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyRenderer.java?view=diff&rev=454826&r1=454825&r2=454826
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyRenderer.java (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/SimpleSelectManyRenderer.java Tue Oct 10 09:54:55 2006
@@ -23,14 +23,14 @@
import java.util.Arrays;
import java.util.List;
+import javax.el.ValueExpression;
+
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
import javax.faces.convert.Converter;
import javax.faces.convert.ConverterException;
-import javax.faces.el.ValueBinding;
-
import javax.faces.model.SelectItem;
import org.apache.myfaces.trinidad.logging.TrinidadLogger;
@@ -92,10 +92,10 @@
converter = getDefaultConverter(context, bean);
Class<?> modelClass = null;
- ValueBinding binding = getValueBinding(bean);
- if (binding != null)
+ ValueExpression expression = getValueExpression(bean);
+ if (expression != null)
{
- modelClass = binding.getType(context);
+ modelClass = expression.getType(context.getELContext());
}
boolean valuePassThru = getValuePassThru(getFacesBean(component));
@@ -144,11 +144,11 @@
FacesContext context,
FacesBean bean)
{
- ValueBinding binding = getValueBinding(bean);
- if (binding == null)
+ ValueExpression expression = getValueExpression(bean);
+ if (expression == null)
return null;
- Class<?> type = binding.getType(context);
+ Class<?> type = expression.getType(context.getELContext());
if ((type == null) || type.isAssignableFrom(List.class))
return null;
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ValueRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ValueRenderer.java?view=diff&rev=454826&r1=454825&r2=454826
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ValueRenderer.java (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/ValueRenderer.java Tue Oct 10 09:54:55 2006
@@ -15,10 +15,11 @@
*/
package org.apache.myfaces.trinidadinternal.renderkit.core.xhtml;
+import javax.el.ValueExpression;
+
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.convert.Converter;
-import javax.faces.el.ValueBinding;
import org.apache.myfaces.trinidad.bean.FacesBean;
import org.apache.myfaces.trinidad.bean.PropertyKey;
@@ -66,11 +67,11 @@
FacesContext context,
FacesBean bean)
{
- ValueBinding binding = getValueBinding(bean);
- if (binding == null)
+ ValueExpression expression = getValueExpression(bean);
+ if (expression == null)
return null;
- Class<?> type = binding.getType(context);
+ Class<?> type = expression.getType(context.getELContext());
return ConverterUtils.createConverter(context, type);
}
@@ -80,11 +81,11 @@
}
/**
- * Returns the ValueBinding for the "value" property.
+ * Returns the ValueExpression for the "value" property.
*/
- protected ValueBinding getValueBinding(FacesBean bean)
+ protected ValueExpression getValueExpression(FacesBean bean)
{
- return bean.getValueBinding(_valueKey);
+ return bean.getValueExpression(_valueKey);
}
protected Converter getConverter(FacesBean bean)
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/InputRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/InputRenderer.java?view=diff&rev=454826&r1=454825&r2=454826
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/InputRenderer.java (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/InputRenderer.java Tue Oct 10 09:54:55 2006
@@ -16,9 +16,11 @@
package org.apache.myfaces.trinidadinternal.renderkit.uix;
import java.util.Map;
+
+import javax.el.ValueExpression;
+
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
-import javax.faces.el.ValueBinding;
import org.apache.myfaces.trinidad.logging.TrinidadLogger;
@@ -43,13 +45,13 @@
Boolean.TRUE.equals(attrs.get("disabled")))
return false;
- ValueBinding vb = component.getValueBinding("value");
- if ((vb != null) && vb.isReadOnly(context))
+ ValueExpression ve = component.getValueExpression("value");
+ if ((ve != null) && ve.isReadOnly(context.getELContext()))
{
if (_LOG.isFiner())
{
_LOG.finer("Value expression {0} was read-only",
- vb.getExpressionString());
+ ve.getExpressionString());
}
return false;
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectItemSupport.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectItemSupport.java?view=diff&rev=454826&r1=454825&r2=454826
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectItemSupport.java (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectItemSupport.java Tue Oct 10 09:54:55 2006
@@ -22,13 +22,14 @@
import java.util.List;
import java.util.Map;
+import javax.el.ValueExpression;
+
import javax.faces.component.UIComponent;
import javax.faces.component.UISelectItem;
import javax.faces.component.UISelectItems;
import javax.faces.component.ValueHolder;
import javax.faces.context.FacesContext;
import javax.faces.convert.Converter;
-import javax.faces.el.ValueBinding;
import javax.faces.model.SelectItem;
import org.apache.myfaces.trinidad.component.UIXSelectItem;
import org.apache.myfaces.trinidadinternal.convert.ConverterUtils;
@@ -370,13 +371,13 @@
Converter converter = null;
Class<?> modelClass = null;
- ValueBinding binding = component.getValueBinding("value");
- if (binding != null)
+ ValueExpression expression = component.getValueExpression("value");
+ if (expression != null)
{
- modelClass = binding.getType(fContext);
+ modelClass = expression.getType(fContext.getELContext());
if (modelClass == null)
{
- Object o = binding.getValue(fContext);
+ Object o = expression.getValue(fContext.getELContext());
if (o != null)
{
modelClass = o.getClass();
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectManyRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectManyRenderer.java?view=diff&rev=454826&r1=454825&r2=454826
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectManyRenderer.java (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/uix/SelectManyRenderer.java Tue Oct 10 09:54:55 2006
@@ -21,11 +21,12 @@
import java.util.ArrayList;
import java.util.List;
+import javax.el.ValueExpression;
+
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.convert.Converter;
import javax.faces.convert.ConverterException;
-import javax.faces.el.ValueBinding;
import javax.faces.model.SelectItem;
import org.apache.myfaces.trinidad.component.UIXSelectMany;
@@ -58,13 +59,13 @@
UIXSelectMany selectMany = (UIXSelectMany)component;
Class<?> modelClass = null;
- ValueBinding binding = component.getValueBinding("value");
- if (binding != null)
+ ValueExpression expression = component.getValueExpression("value");
+ if (expression != null)
{
- modelClass = binding.getType(context);
+ modelClass = expression.getType(context.getELContext());
if (modelClass == null)
{
- Object o = binding.getValue(context);
+ Object o = expression.getValue(context.getELContext());
if (o != null)
{
modelClass = o.getClass();
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/ComponentDefTag.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/ComponentDefTag.java?view=diff&rev=454826&r1=454825&r2=454826
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/ComponentDefTag.java (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/ComponentDefTag.java Tue Oct 10 09:54:55 2006
@@ -60,9 +60,6 @@
if (_var != null)
{
- if (TagUtils.isValueReference(_var))
- throw new JspException("tr:componentDef does not support EL on 'var'");
-
((UIXComponentRef) component).setVar(_var);
}
}
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/ComponentRefTag.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/ComponentRefTag.java?view=diff&rev=454826&r1=454825&r2=454826
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/ComponentRefTag.java (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/ComponentRefTag.java Tue Oct 10 09:54:55 2006
@@ -209,7 +209,7 @@
AttributeMetaData attr = attrs.get(i);
String name = attr.getAttrName();
Class<?> klass = attr.getAttrClass();
- if (region.getValueBinding(name) != null)
+ if (region.getValueExpression(name) != null)
continue;
Object compValue = compAttrs.get(name);
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/listener/SetActionListener.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/listener/SetActionListener.java?view=diff&rev=454826&r1=454825&r2=454826
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/listener/SetActionListener.java (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/listener/SetActionListener.java Tue Oct 10 09:54:55 2006
@@ -19,7 +19,6 @@
import javax.faces.component.StateHolder;
import javax.faces.context.FacesContext;
-import javax.faces.el.ValueBinding;
import javax.faces.event.ActionEvent;
import javax.faces.event.ActionListener;
@@ -45,7 +44,7 @@
static public final FacesBean.Type TYPE = new FacesBean.Type();
static public final PropertyKey FROM_KEY =
TYPE.registerKey("from");
- // Must be a ValueBinding
+ // Must be a ValueExpression
static public final PropertyKey TO_KEY =
TYPE.registerKey("to");
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/util/TagUtils.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/util/TagUtils.java?view=diff&rev=454826&r1=454825&r2=454826
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/util/TagUtils.java (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/taglib/util/TagUtils.java Tue Oct 10 09:54:55 2006
@@ -30,7 +30,6 @@
import javax.faces.application.Application;
import javax.faces.context.FacesContext;
-import javax.faces.el.ValueBinding;
import org.apache.myfaces.trinidad.logging.TrinidadLogger;
@@ -50,14 +49,6 @@
{
}
- public static ValueBinding getValueBinding(String valueBindingExpression)
- {
- FacesContext context = FacesContext.getCurrentInstance();
- Application app = context.getApplication();
- ValueBinding vb = app.createValueBinding(valueBindingExpression);
- return vb;
- }
-
public static void assertNotNull(Object object)
{
if (null == object)
@@ -72,9 +63,12 @@
* @return
*/
public static String getString(
- String value)
+ Object value)
{
- return value;
+ if (value == null)
+ return null;
+
+ return value.toString();
}
/**
@@ -83,9 +77,15 @@
* @return
*/
public static boolean getBoolean(
- String value)
+ Object value)
{
- return Boolean.valueOf(value).booleanValue();
+ if (value == null)
+ return false;
+
+ if (value instanceof Boolean)
+ return ((Boolean) value).booleanValue();
+
+ return Boolean.valueOf(value.toString()).booleanValue();
}
/**
@@ -94,9 +94,15 @@
* @return
*/
public static int getInteger(
- String value)
+ Object value)
{
- return Integer.valueOf(value).intValue();
+ if (value == null)
+ return 0;
+
+ if (value instanceof Number)
+ return ((Number) value).intValue();
+
+ return Integer.valueOf(value.toString()).intValue();
}
@@ -107,9 +113,12 @@
* @return
*/
public static String[] getStringArray(
- String value) throws ParseException
+ Object value) throws ParseException
{
- return _getTokensArray(value);
+ if (value == null)
+ return null;
+
+ return _getTokensArray(value.toString());
}
/**
@@ -118,9 +127,15 @@
* @return
*/
public static Date getDate(
- String value)
+ Object value)
{
- return _parseISODate(value);
+ if (value == null)
+ return null;
+
+ if (value instanceof Date)
+ return ((Date) value);
+
+ return _parseISODate(value.toString());
}
/**
@@ -129,9 +144,15 @@
* @return
*/
public static Locale getLocale(
- String value)
+ Object value)
{
- return _getLocale(value);
+ if (value == null)
+ return null;
+
+ if (value instanceof Locale)
+ return ((Locale) value);
+
+ return _getLocale(value.toString());
}
/**
@@ -140,21 +161,15 @@
* @return
*/
public static TimeZone getTimeZone(
- String value)
+ Object value)
{
- return TimeZone.getTimeZone(value);
- }
+ if (value == null)
+ return null;
- public static boolean isValueReference(String expression)
- {
- if (null != expression)
- {
- int start = expression.indexOf("#{");
- if ((start >= 0) && (expression.indexOf('}', start + 1) >= 0))
- return true;
- }
+ if (value instanceof TimeZone)
+ return ((TimeZone) value);
- return false;
+ return TimeZone.getTimeZone(value.toString());
}
/**
@@ -162,9 +177,13 @@
* java.util.List of java.awt.Color objects and returns it.
* @throws ParseException In case of any parse errors upon such conversion.
*/
- public static List<Color> getColorList(String value) throws ParseException
+ public static List<Color> getColorList(Object value) throws ParseException
{
- String[] tokenArray = _getTokensArray(value);
+ if (value == null)
+ return null;
+
+ String valueStr = value.toString();
+ String[] tokenArray = _getTokensArray(valueStr);
if (tokenArray == null)
return null;
@@ -178,7 +197,7 @@
if (!colorCode.startsWith("#"))
throw new ParseException(
"Color code " + colorCode + " in '" + value + "' does not start with a '#'",
- value.indexOf(colorCode));
+ valueStr.indexOf(colorCode));
//pu: Allow NumberFormatException (RTE) to propogate as is, or transform to JspException ?.
int rgb = Integer.parseInt(colorCode.substring(1), 16);
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/SelectManyShuttleRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/SelectManyShuttleRenderer.java?view=diff&rev=454826&r1=454825&r2=454826
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/SelectManyShuttleRenderer.java (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/ui/laf/base/desktop/SelectManyShuttleRenderer.java Tue Oct 10 09:54:55 2006
@@ -21,10 +21,12 @@
import java.util.List;
import java.util.Map;
+
+import javax.el.ValueExpression;
+
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.context.ResponseWriter;
-import javax.faces.el.ValueBinding;
import javax.faces.model.SelectItem;
@@ -1713,12 +1715,12 @@
{
UIComponent component = NodeUtils.getUIComponent(parentContext,
parentContext.getAncestorNode(0));
- ValueBinding vb = component.getValueBinding("value");
- if (vb != null)
+ ValueExpression ve = component.getValueExpression("value");
+ if (ve != null)
{
FacesContext fContext = (context == null) ?
FacesContext.getCurrentInstance() : context.getFacesContext();
- if (vb.isReadOnly(fContext))
+ if (ve.isReadOnly(fContext.getELContext()))
return Boolean.TRUE;
}
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/DecodingUINodeRenderer.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/DecodingUINodeRenderer.java?view=diff&rev=454826&r1=454825&r2=454826
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/DecodingUINodeRenderer.java (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/DecodingUINodeRenderer.java Tue Oct 10 09:54:55 2006
@@ -15,12 +15,13 @@
*/
package org.apache.myfaces.trinidadinternal.uinode;
+import javax.el.ValueExpression;
+
import javax.faces.component.EditableValueHolder;
import javax.faces.component.UIComponent;
import javax.faces.context.FacesContext;
import javax.faces.convert.Converter;
import javax.faces.convert.ConverterException;
-import javax.faces.el.ValueBinding;
import org.apache.myfaces.trinidad.logging.TrinidadLogger;
@@ -114,10 +115,11 @@
if (converter != null)
return converter;
- ValueBinding binding = ((UIComponent) component).getValueBinding("value");
- if (binding != null)
+ ValueExpression expression = ((UIComponent) component).
+ getValueExpression("value");
+ if (expression != null)
{
- Class<?> modelClass = binding.getType(context);
+ Class<?> modelClass = expression.getType(context.getELContext());
return ConverterUtils.createConverter(context, modelClass);
}
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/bind/ConverterBoundValue.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/bind/ConverterBoundValue.java?view=diff&rev=454826&r1=454825&r2=454826
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/bind/ConverterBoundValue.java (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/uinode/bind/ConverterBoundValue.java Tue Oct 10 09:54:55 2006
@@ -15,9 +15,10 @@
*/
package org.apache.myfaces.trinidadinternal.uinode.bind;
+import javax.el.ValueExpression;
+
import javax.faces.context.FacesContext;
import javax.faces.convert.Converter;
-import javax.faces.el.ValueBinding;
import org.apache.myfaces.trinidad.bean.FacesBean;
import org.apache.myfaces.trinidad.component.UIXComponent;
@@ -52,15 +53,15 @@
Converter converter = (Converter)
bean.getProperty(UIXValue.CONVERTER_KEY);
- // OK, no explicit converter, look at the ValueBinding
+ // OK, no explicit converter, look at the ValueExpression
if (converter == null)
{
- ValueBinding binding = bean.getValueBinding(UIXValue.VALUE_KEY);
- if (binding != null)
+ ValueExpression expression = bean.getValueExpression(UIXValue.VALUE_KEY);
+ if (expression != null)
{
FacesContext fContext = (context == null) ?
FacesContext.getCurrentInstance() : context.getFacesContext();
- Class<?> type = binding.getType(fContext);
+ Class<?> type = expression.getType(fContext.getELContext());
converter = ConverterUtils.createConverter(fContext, type);
}
}
Modified: incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/LongRangeValidator.java
URL: http://svn.apache.org/viewvc/incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/LongRangeValidator.java?view=diff&rev=454826&r1=454825&r2=454826
==============================================================================
--- incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/LongRangeValidator.java (original)
+++ incubator/adffaces/branches/faces-1_2/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/validator/LongRangeValidator.java Tue Oct 10 09:54:55 2006
@@ -57,7 +57,7 @@
Object label = component.getAttributes().get("label");
if ( null == label)
- label = component.getValueBinding("label");
+ label = component.getValueExpression("label");
if (value != null && value instanceof Number)
{