You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2008/10/09 09:27:49 UTC
svn commit: r703088 - in
/myfaces/trinidad/branches/1.2.9.1-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean:
FacesBeanImpl.java ValueBindingValueExpression.java
ValueExpressionValueBinding.java
Author: matzew
Date: Thu Oct 9 00:27:48 2008
New Revision: 703088
URL: http://svn.apache.org/viewvc?rev=703088&view=rev
Log:
TRINIDAD-1255 - Further clean up of ValueExpressionValueBinding and ValueBindingValueExpression and their usage
Thx to Blake Sullivan for his patch
Modified:
myfaces/trinidad/branches/1.2.9.1-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/FacesBeanImpl.java
myfaces/trinidad/branches/1.2.9.1-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/ValueBindingValueExpression.java
myfaces/trinidad/branches/1.2.9.1-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/ValueExpressionValueBinding.java
Modified: myfaces/trinidad/branches/1.2.9.1-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/FacesBeanImpl.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.9.1-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/FacesBeanImpl.java?rev=703088&r1=703087&r2=703088&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.9.1-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/FacesBeanImpl.java (original)
+++ myfaces/trinidad/branches/1.2.9.1-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/FacesBeanImpl.java Thu Oct 9 00:27:48 2008
@@ -140,18 +140,21 @@
}
+ @SuppressWarnings("deprecation")
final public ValueBinding getValueBinding(PropertyKey key)
{
ValueExpression ve = getValueExpression(key);
+
if (ve == null)
return null;
-
- if (ve instanceof ValueBindingValueExpression)
- return ((ValueBindingValueExpression) ve).getValueBinding();
-
- return ValueExpressionValueBinding.newValueExpressionValueBinding(ve);
+ else
+ {
+ // wrap the ValueExpression if necessary
+ return ValueExpressionValueBinding.getValueBinding(ve);
+ }
}
+ @SuppressWarnings("deprecation")
final public void setValueBinding(PropertyKey key, ValueBinding binding)
{
ValueExpression ve;
@@ -162,7 +165,7 @@
}
else
{
- ve = ValueBindingValueExpression.newValueBindingValueExpression(binding);
+ ve = ValueBindingValueExpression.getValueExpression(binding);
}
setValueExpression(key, ve);
@@ -291,7 +294,7 @@
PropertyKey toKey = _convertKey(fromKey);
if (toKey.getSupportsBinding())
{
- setValueBinding(toKey, from.getValueBinding(fromKey));
+ setValueExpression(toKey, from.getValueExpression(fromKey));
}
}
}
Modified: myfaces/trinidad/branches/1.2.9.1-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/ValueBindingValueExpression.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.9.1-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/ValueBindingValueExpression.java?rev=703088&r1=703087&r2=703088&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.9.1-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/ValueBindingValueExpression.java (original)
+++ myfaces/trinidad/branches/1.2.9.1-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/ValueBindingValueExpression.java Thu Oct 9 00:27:48 2008
@@ -30,12 +30,22 @@
import javax.faces.el.ValueBinding;
-@Deprecated
class ValueBindingValueExpression extends ValueExpression
{
- public static ValueBindingValueExpression newValueBindingValueExpression(ValueBinding binding)
- {
- if (binding instanceof StateHolder)
+ /**
+ * Given a ValueBinding <code>binding</code>, return a ValueExpression.
+ * The returned ValueExpression will implement StateHolder and Serializable interfaces if
+ * <code>ve</code> implements these interfaces.
+ * @param binding The ValueBinding
+ * @return a ValueExpression equivalent to the ValueBinding
+ */
+ public static ValueExpression getValueExpression(ValueBinding binding)
+ {
+ // if we previously wrapped a ValueExpression, unwrap it and return it, otherwise create the
+ // correct subclass of ValueBindingValueExpression
+ if (binding instanceof ValueExpressionValueBinding)
+ return ((ValueExpressionValueBinding)binding).getValueExpression();
+ else if (binding instanceof StateHolder)
{
if (binding instanceof Serializable)
return new SerializableStateHolderValueBindingValueExpression(binding);
@@ -65,6 +75,7 @@
return _binding;
}
+ @SuppressWarnings("deprecation")
public Object getValue(ELContext elContext)
{
try
@@ -78,6 +89,7 @@
}
}
+ @SuppressWarnings("deprecation")
public void setValue(ELContext elContext, Object object)
{
try
@@ -91,6 +103,7 @@
}
}
+ @SuppressWarnings("deprecation")
public boolean isReadOnly(ELContext elContext)
{
try
@@ -104,6 +117,7 @@
}
}
+ @SuppressWarnings("deprecation")
public Class<?> getType(ELContext elContext)
{
try
@@ -122,6 +136,7 @@
return null;
}
+ @SuppressWarnings("deprecation")
public String getExpressionString()
{
return _binding.getExpressionString();
@@ -207,3 +222,4 @@
private final ValueBinding _binding;
}
+
Modified: myfaces/trinidad/branches/1.2.9.1-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/ValueExpressionValueBinding.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.9.1-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/ValueExpressionValueBinding.java?rev=703088&r1=703087&r2=703088&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.9.1-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/ValueExpressionValueBinding.java (original)
+++ myfaces/trinidad/branches/1.2.9.1-branch/trinidad-api/src/main/java/org/apache/myfaces/trinidad/bean/ValueExpressionValueBinding.java Thu Oct 9 00:27:48 2008
@@ -28,12 +28,22 @@
import javax.faces.el.EvaluationException;
import javax.faces.el.ValueBinding;
-@Deprecated
public class ValueExpressionValueBinding extends ValueBinding
{
- public static ValueExpressionValueBinding newValueExpressionValueBinding(ValueExpression ve)
- {
- if (ve instanceof StateHolder)
+ /**
+ * Given a ValueExpression <code>ve</code>, return a ValueBinding.
+ * The returned ValueBinding will implement StateHolder and Serializable interfaces if
+ * <code>ve</code> implements these interfaces.
+ * @param ve The ValueExpression
+ * @return a ValueBinding equivalent to the ValueExpression
+ */
+ public static ValueBinding getValueBinding(ValueExpression ve)
+ {
+ // if we previously wrapped a ValueBinding, unwrap it and return it, otherwise create the
+ // correct subclass of ValueBinding
+ if (ve instanceof ValueBindingValueExpression)
+ return ((ValueBindingValueExpression)ve).getValueBinding();
+ else if (ve instanceof StateHolder)
{
if (ve instanceof Serializable)
return new SerializableStateHolderValueExpressionValueBinding(ve);
@@ -50,6 +60,7 @@
}
}
+ @SuppressWarnings("deprecation")
private ValueExpressionValueBinding(ValueExpression ve)
{
if (ve == null)
@@ -63,6 +74,7 @@
return _ve;
}
+ @SuppressWarnings("deprecation")
public Object getValue(FacesContext facesContext)
{
try
@@ -76,6 +88,7 @@
}
}
+ @SuppressWarnings("deprecation")
public void setValue(FacesContext facesContext, Object object)
{
try
@@ -89,6 +102,7 @@
}
}
+ @SuppressWarnings("deprecation")
public boolean isReadOnly(FacesContext facesContext)
{
try
@@ -102,6 +116,7 @@
}
}
+ @SuppressWarnings("deprecation")
public Class getType(FacesContext facesContext)
{
try