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 10:00:20 UTC
svn commit: r518527 - in /myfaces/core/branches/jsf12/api/src:
main/java/javax/faces/component/_ValueExpressionToValueBinding.java
test/java/javax/faces/component/_ValueExpressionToValueBindingTest.java
Author: mbr
Date: Thu Mar 15 02:00:20 2007
New Revision: 518527
URL: http://svn.apache.org/viewvc?view=rev&rev=518527
Log:
copied to api by svn copy
Added:
myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_ValueExpressionToValueBinding.java
- copied, changed from r517722, myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/convert/ValueExpressionToValueBinding.java
myfaces/core/branches/jsf12/api/src/test/java/javax/faces/component/_ValueExpressionToValueBindingTest.java (contents, props changed)
- copied, changed from r517722, myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/el/convert/ValueExpressionToValueBindingTest.java
Copied: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_ValueExpressionToValueBinding.java (from r517722, myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/convert/ValueExpressionToValueBinding.java)
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_ValueExpressionToValueBinding.java?view=diff&rev=518527&p1=myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/convert/ValueExpressionToValueBinding.java&r1=517722&p2=myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_ValueExpressionToValueBinding.java&r2=518527
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/main/java/org/apache/myfaces/el/convert/ValueExpressionToValueBinding.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_ValueExpressionToValueBinding.java Thu Mar 15 02:00:20 2007
@@ -14,18 +14,15 @@
* limitations under the License.
*/
-package org.apache.myfaces.el.convert;
+package javax.faces.component;
import javax.el.ELException;
import javax.el.ValueExpression;
-import javax.faces.component.StateHolder;
import javax.faces.context.FacesContext;
import javax.faces.el.EvaluationException;
import javax.faces.el.PropertyNotFoundException;
import javax.faces.el.ValueBinding;
-import org.apache.myfaces.shared_impl.util.ClassUtils;
-
/**
* Converter for legacy ValueBinding objects. See JSF 1.2 section 5.8.3
*
@@ -35,7 +32,7 @@
* @see javax.faces.component.ValueExpressionToValueBinding
*/
@SuppressWarnings("deprecation")
-public class ValueExpressionToValueBinding extends ValueBinding implements StateHolder
+class _ValueExpressionToValueBinding extends ValueBinding implements StateHolder
{
private ValueExpression _valueExpression;
@@ -43,7 +40,7 @@
private boolean isTransient = false;
// required no-arg constructor for StateHolder
- protected ValueExpressionToValueBinding()
+ protected _ValueExpressionToValueBinding()
{
_valueExpression = null;
}
@@ -67,7 +64,7 @@
return false;
if (getClass() != obj.getClass())
return false;
- final ValueExpressionToValueBinding other = (ValueExpressionToValueBinding) obj;
+ final _ValueExpressionToValueBinding other = (_ValueExpressionToValueBinding) obj;
if (_valueExpression == null)
{
if (other._valueExpression != null)
@@ -107,7 +104,7 @@
}
/** Creates a new instance of ValueExpressionToValueBinding */
- public ValueExpressionToValueBinding(ValueExpression valueExpression)
+ public _ValueExpressionToValueBinding(ValueExpression valueExpression)
{
if (valueExpression == null)
{
@@ -199,7 +196,7 @@
else
{
Object[] stateArray = (Object[]) state;
- _valueExpression = (ValueExpression) ClassUtils.newInstance((String) stateArray[0],
+ _valueExpression = (ValueExpression) _ClassUtils.newInstance((String) stateArray[0],
ValueExpression.class);
((StateHolder) _valueExpression).restoreState(facesContext, stateArray[1]);
}
Copied: myfaces/core/branches/jsf12/api/src/test/java/javax/faces/component/_ValueExpressionToValueBindingTest.java (from r517722, myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/el/convert/ValueExpressionToValueBindingTest.java)
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/test/java/javax/faces/component/_ValueExpressionToValueBindingTest.java?view=diff&rev=518527&p1=myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/el/convert/ValueExpressionToValueBindingTest.java&r1=517722&p2=myfaces/core/branches/jsf12/api/src/test/java/javax/faces/component/_ValueExpressionToValueBindingTest.java&r2=518527
==============================================================================
--- myfaces/core/branches/jsf12/impl/src/test/java/org/apache/myfaces/el/convert/ValueExpressionToValueBindingTest.java (original)
+++ myfaces/core/branches/jsf12/api/src/test/java/javax/faces/component/_ValueExpressionToValueBindingTest.java Thu Mar 15 02:00:20 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;
@@ -44,9 +44,9 @@
* @version $Revision$ $Date$
*/
@SuppressWarnings("deprecation")
-public class ValueExpressionToValueBindingTest extends TestCase
+public class _ValueExpressionToValueBindingTest extends TestCase
{
- private ValueExpressionToValueBinding testimpl;
+ private _ValueExpressionToValueBinding testimpl;
private ValueExpression expression;
private IMocksControl mockControl;
private FacesContext facesContext;
@@ -59,13 +59,13 @@
expression = mockControl.createMock(ValueExpression.class);
facesContext = mockControl.createMock(FacesContext.class);
elContext = mockControl.createMock(ELContext.class);
- testimpl = new ValueExpressionToValueBinding(expression);
+ testimpl = new _ValueExpressionToValueBinding(expression);
}
public void testHashCode() throws Exception
{
assertEquals(testimpl.hashCode(), testimpl.hashCode());
- ValueExpressionToValueBinding other = new ValueExpressionToValueBinding(expression);
+ _ValueExpressionToValueBinding other = new _ValueExpressionToValueBinding(expression);
assertEquals(testimpl.hashCode(), other.hashCode());
other.setTransient(true);
assertFalse(testimpl.hashCode() == other.hashCode());
@@ -75,7 +75,7 @@
public void testEquals() throws Exception
{
assertEquals(testimpl, testimpl);
- ValueExpressionToValueBinding other = new ValueExpressionToValueBinding(expression);
+ _ValueExpressionToValueBinding other = new _ValueExpressionToValueBinding(expression);
assertEquals(testimpl, other);
other.setTransient(true);
assertFalse(testimpl.equals(other));
@@ -84,7 +84,7 @@
/**
* Test method for
- * {@link org.apache.myfaces.el.convert.ValueExpressionToValueBinding#getType(javax.faces.context.FacesContext)}.
+ * {@link org.apache.myfaces.el.convert._ValueExpressionToValueBinding#getType(javax.faces.context.FacesContext)}.
*/
public void testGetType()
{
@@ -97,7 +97,7 @@
/**
* Test method for
- * {@link org.apache.myfaces.el.convert.ValueExpressionToValueBinding#getType(javax.faces.context.FacesContext)}.
+ * {@link org.apache.myfaces.el.convert._ValueExpressionToValueBinding#getType(javax.faces.context.FacesContext)}.
*/
public void testGetTypeExceptions() throws Exception
{
@@ -129,7 +129,7 @@
/**
* Test method for
- * {@link org.apache.myfaces.el.convert.ValueExpressionToValueBinding#getValue(javax.faces.context.FacesContext)}.
+ * {@link org.apache.myfaces.el.convert._ValueExpressionToValueBinding#getValue(javax.faces.context.FacesContext)}.
*/
public void testGetValue()
{
@@ -143,7 +143,7 @@
/**
* Test method for
- * {@link org.apache.myfaces.el.convert.ValueExpressionToValueBinding#getValue(javax.faces.context.FacesContext)}.
+ * {@link org.apache.myfaces.el.convert._ValueExpressionToValueBinding#getValue(javax.faces.context.FacesContext)}.
*/
public void testGetValueExceptions()
{
@@ -175,7 +175,7 @@
/**
* Test method for
- * {@link org.apache.myfaces.el.convert.ValueExpressionToValueBinding#isReadOnly(javax.faces.context.FacesContext)}.
+ * {@link org.apache.myfaces.el.convert._ValueExpressionToValueBinding#isReadOnly(javax.faces.context.FacesContext)}.
*/
public void testIsReadOnly()
{
@@ -194,7 +194,7 @@
/**
* Test method for
- * {@link org.apache.myfaces.el.convert.ValueExpressionToValueBinding#isReadOnly(javax.faces.context.FacesContext)}.
+ * {@link org.apache.myfaces.el.convert._ValueExpressionToValueBinding#isReadOnly(javax.faces.context.FacesContext)}.
*/
public void testIsReadOnlyExceptions()
{
@@ -226,7 +226,7 @@
/**
* Test method for
- * {@link org.apache.myfaces.el.convert.ValueExpressionToValueBinding#setValue(javax.faces.context.FacesContext, java.lang.Object)}.
+ * {@link org.apache.myfaces.el.convert._ValueExpressionToValueBinding#setValue(javax.faces.context.FacesContext, java.lang.Object)}.
*/
public void testSetValue()
{
@@ -240,7 +240,7 @@
/**
* Test method for
- * {@link org.apache.myfaces.el.convert.ValueExpressionToValueBinding#setValue(javax.faces.context.FacesContext, java.lang.Object)}.
+ * {@link org.apache.myfaces.el.convert._ValueExpressionToValueBinding#setValue(javax.faces.context.FacesContext, java.lang.Object)}.
*/
public void testSetValueExceptions()
{
@@ -274,7 +274,7 @@
/**
* Test method for
- * {@link org.apache.myfaces.el.convert.ValueExpressionToValueBinding#ValueExpressionToValueBinding(javax.el.ValueExpression)}.
+ * {@link org.apache.myfaces.el.convert._ValueExpressionToValueBinding#_ValueExpressionToValueBinding(javax.el.ValueExpression)}.
*/
public void testValueExpressionToValueBindingValueExpression()
{
@@ -282,7 +282,7 @@
{
public void run() throws Throwable
{
- new ValueExpressionToValueBinding(null);
+ new _ValueExpressionToValueBinding(null);
}
});
}
Propchange: myfaces/core/branches/jsf12/api/src/test/java/javax/faces/component/_ValueExpressionToValueBindingTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/core/branches/jsf12/api/src/test/java/javax/faces/component/_ValueExpressionToValueBindingTest.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL