You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mb...@apache.org on 2007/03/15 09:48:52 UTC
svn commit: r518520 - in /myfaces/core/branches/jsf12/api/src:
main/java/javax/faces/component/_ValueBindingToValueExpression.java
test/java/javax/faces/component/_ValueBindingToValueExpressionTest.java
Author: mbr
Date: Thu Mar 15 01:48:51 2007
New Revision: 518520
URL: http://svn.apache.org/viewvc?view=rev&rev=518520
Log:
ValueBindingToValueExpression impl copied to api
Added:
myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_ValueBindingToValueExpression.java
- copied, changed from r517722, myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/convert/ValueBindingToValueExpression.java
myfaces/core/branches/jsf12/api/src/test/java/javax/faces/component/_ValueBindingToValueExpressionTest.java
- copied, changed from r517722, myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/el/convert/ValueBindingToValueExpressionTest.java
Copied: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_ValueBindingToValueExpression.java (from r517722, myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/convert/ValueBindingToValueExpression.java)
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_ValueBindingToValueExpression.java?view=diff&rev=518520&p1=myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/convert/ValueBindingToValueExpression.java&r1=517722&p2=myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_ValueBindingToValueExpression.java&r2=518520
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/convert/ValueBindingToValueExpression.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_ValueBindingToValueExpression.java Thu Mar 15 01:48:51 2007
@@ -14,38 +14,36 @@
* limitations under the License.
*/
-package org.apache.myfaces.el.convert;
+package javax.faces.component;
import javax.el.ELContext;
import javax.el.ELException;
import javax.el.PropertyNotFoundException;
import javax.el.PropertyNotWritableException;
import javax.el.ValueExpression;
-import javax.faces.component.StateHolder;
import javax.faces.context.FacesContext;
import javax.faces.el.EvaluationException;
import javax.faces.el.ValueBinding;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
/**
* Wraps a ValueBinding inside a ValueExpression. Also allows access to the original ValueBinding object.
*
* Although ValueExpression implements Serializable, this class implements StateHolder instead.
*
- * ATTENTION: If you make changes to this class, treat {@link ValueBindingToValueExpression} accordingly.
+ * ATTENTION: If you make changes to this class, treat {@link _ValueBindingToValueExpression} accordingly.
*
* @author Stan Silvert
* @see javax.faces.component._ValueBindingToValueExpression
*/
@SuppressWarnings("deprecation")
-public class ValueBindingToValueExpression extends ValueExpression implements StateHolder
+public class _ValueBindingToValueExpression extends ValueExpression implements StateHolder
{
private static final long serialVersionUID = 8071429285360496554L;
- private static final Log logger = LogFactory.getLog(ValueBindingToValueExpression.class);
+ private static final Log logger = LogFactory.getLog(_ValueBindingToValueExpression.class);
private ValueBinding _valueBinding;
@@ -54,7 +52,7 @@
/**
* No-arg constructor used during restoreState
*/
- protected ValueBindingToValueExpression()
+ protected _ValueBindingToValueExpression()
{
}
@@ -68,7 +66,7 @@
}
/** Creates a new instance of ValueBindingToValueExpression */
- public ValueBindingToValueExpression(ValueBinding valueBinding)
+ public _ValueBindingToValueExpression(ValueBinding valueBinding)
{
if (valueBinding == null)
{
@@ -153,7 +151,7 @@
return false;
if (getClass() != obj.getClass())
return false;
- final ValueBindingToValueExpression other = (ValueBindingToValueExpression) obj;
+ final _ValueBindingToValueExpression other = (_ValueBindingToValueExpression) obj;
if (_transient != other._transient)
return false;
if (_valueBinding == null)
@@ -209,7 +207,7 @@
else if (state != null)
{
Object[] stateArray = (Object[]) state;
- _valueBinding = (ValueBinding) ClassUtils.newInstance((String) stateArray[0], ValueBinding.class);
+ _valueBinding = (ValueBinding) _ClassUtils.newInstance((String) stateArray[0], ValueBinding.class);
((StateHolder) _valueBinding).restoreState(context, stateArray[1]);
}
}
Copied: myfaces/core/branches/jsf12/api/src/test/java/javax/faces/component/_ValueBindingToValueExpressionTest.java (from r517722, myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/el/convert/ValueBindingToValueExpressionTest.java)
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/test/java/javax/faces/component/_ValueBindingToValueExpressionTest.java?view=diff&rev=518520&p1=myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/el/convert/ValueBindingToValueExpressionTest.java&r1=517722&p2=myfaces/core/branches/jsf12/api/src/test/java/javax/faces/component/_ValueBindingToValueExpressionTest.java&r2=518520
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/el/convert/ValueBindingToValueExpressionTest.java (original)
+++ myfaces/core/branches/jsf12/api/src/test/java/javax/faces/component/_ValueBindingToValueExpressionTest.java Thu Mar 15 01:48:51 2007
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.myfaces.el.convert;
+package javax.faces.component;
-import static org.apache.myfaces.Assert.assertException;
+import static org.apache.myfaces.Assert.*;
import static org.easymock.EasyMock.*;
import java.util.Date;
@@ -42,10 +42,10 @@
* @version $Revision$ $Date$
*/
@SuppressWarnings("deprecation")
-public class ValueBindingToValueExpressionTest extends TestCase
+public class _ValueBindingToValueExpressionTest extends TestCase
{
- private ValueBindingToValueExpression testimpl;
+ private _ValueBindingToValueExpression testimpl;
private ValueBinding binding;
private IMocksControl mockControl;
private FacesContext facesContext;
@@ -58,7 +58,7 @@
binding = mockControl.createMock(ValueBinding.class);
facesContext = mockControl.createMock(FacesContext.class);
elContext = mockControl.createMock(ELContext.class);
- testimpl = new ValueBindingToValueExpression(binding);
+ testimpl = new _ValueBindingToValueExpression(binding);
}
/**
@@ -67,7 +67,7 @@
public void testHashCode()
{
assertEquals(testimpl.hashCode(), testimpl.hashCode());
- ValueBindingToValueExpression other = new ValueBindingToValueExpression(binding);
+ _ValueBindingToValueExpression other = new _ValueBindingToValueExpression(binding);
assertEquals(testimpl.hashCode(), other.hashCode());
other.setTransient(true);
assertFalse(testimpl.hashCode() == other.hashCode());
@@ -80,7 +80,7 @@
public void testEqualsObject()
{
assertEquals(testimpl, testimpl);
- ValueBindingToValueExpression other = new ValueBindingToValueExpression(binding);
+ _ValueBindingToValueExpression other = new _ValueBindingToValueExpression(binding);
assertEquals(testimpl, other);
other.setTransient(true);
assertFalse(testimpl.equals(other));
@@ -103,7 +103,7 @@
*/
public void testValueBindingToValueExpression()
{
- testimpl = new ValueBindingToValueExpression();
+ testimpl = new _ValueBindingToValueExpression();
assertNull(testimpl.getValueBinding());
assertNull(testimpl.getExpectedType());
assertException(IllegalStateException.class, new TestRunner()