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:16:45 UTC
svn commit: r518536 -
/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_MethodBindingToMethodExpression.java
Author: mbr
Date: Thu Mar 15 02:16:44 2007
New Revision: 518536
URL: http://svn.apache.org/viewvc?view=rev&rev=518536
Log:
newInstance used from _ClassUtils
Modified:
myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_MethodBindingToMethodExpression.java
Modified: myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_MethodBindingToMethodExpression.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_MethodBindingToMethodExpression.java?view=diff&rev=518536&r1=518535&r2=518536
==============================================================================
--- myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_MethodBindingToMethodExpression.java (original)
+++ myfaces/core/branches/jsf12/api/src/main/java/javax/faces/component/_MethodBindingToMethodExpression.java Thu Mar 15 02:16:44 2007
@@ -161,7 +161,7 @@
else if (state != null)
{
Object[] values = (Object[]) state;
- methodBinding = (MethodBinding) newInstance(values[0].toString(), EXPECTED_TYPES);
+ methodBinding = (MethodBinding) _ClassUtils.newInstance(values[0].toString(), EXPECTED_TYPES);
((StateHolder) methodBinding).restoreState(context, values[1]);
methodInfo = null;
}
@@ -204,41 +204,6 @@
else if (!methodBinding.equals(other.methodBinding))
return false;
return true;
- }
-
- @SuppressWarnings("unchecked")
- protected Object newInstance(String className, Class[] expectedTypes)
- {
- try
- {
- ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
- if (classLoader == null)
- {
- classLoader = getClass().getClassLoader();
- }
- Class clazz = classLoader.loadClass(className);
- for (int i = 0, size = expectedTypes.length; i < size; i++)
- {
- if (!expectedTypes[i].isAssignableFrom(clazz))
- {
- throw new IllegalStateException("class for name " + className + " does not implement "
- + expectedTypes[i].getName());
- }
- }
- return clazz.newInstance();
- }
- catch (ClassNotFoundException e)
- {
- throw new IllegalStateException(e.getMessage(), e);
- }
- catch (InstantiationException e)
- {
- throw new IllegalStateException(e.getMessage(), e);
- }
- catch (IllegalAccessException e)
- {
- throw new IllegalStateException(e.getMessage(), e);
- }
}
private void checkNullState(Object notNullInstance, String instanceName)