You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by st...@apache.org on 2011/03/10 00:03:46 UTC
svn commit: r1080051 - in /myfaces/core/trunk:
api/src/main/java/javax/faces/component/UIInput.java
impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java
Author: struberg
Date: Wed Mar 9 23:03:46 2011
New Revision: 1080051
URL: http://svn.apache.org/viewvc?rev=1080051&view=rev
Log:
MYFACES-3063 fix a few instanceof
Modified:
myfaces/core/trunk/api/src/main/java/javax/faces/component/UIInput.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java
Modified: myfaces/core/trunk/api/src/main/java/javax/faces/component/UIInput.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/api/src/main/java/javax/faces/component/UIInput.java?rev=1080051&r1=1080050&r2=1080051&view=diff
==============================================================================
--- myfaces/core/trunk/api/src/main/java/javax/faces/component/UIInput.java (original)
+++ myfaces/core/trunk/api/src/main/java/javax/faces/component/UIInput.java Wed Mar 9 23:03:46 2011
@@ -941,10 +941,9 @@ public class UIInput extends UIOutput im
public void markInitialState()
{
super.markInitialState();
- if (_validatorList != null &&
- _validatorList instanceof PartialStateHolder)
+ if (_validatorList != null)
{
- ((PartialStateHolder)_validatorList).markInitialState();
+ _validatorList.markInitialState();
}
}
@@ -953,10 +952,9 @@ public class UIInput extends UIOutput im
if (initialStateMarked())
{
super.clearInitialState();
- if (_validatorList != null &&
- _validatorList instanceof PartialStateHolder)
+ if (_validatorList != null)
{
- ((PartialStateHolder)_validatorList).clearInitialState();
+ _validatorList.clearInitialState();
}
}
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java?rev=1080051&r1=1080050&r2=1080051&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/ApplicationImpl.java Wed Mar 9 23:03:46 2011
@@ -268,12 +268,15 @@ public class ApplicationImpl extends App
{
Object validatorClass = getObjectFromClassMap(validatorId, _validatorClassMap);
String className;
- if(validatorClass instanceof String)
- className = (String)validatorClass;
-
- //otherwise validatorClass is an object of type Class<?>
- className = ((Class<?>)validatorClass).getName();
-
+
+ if (validatorClass instanceof Class)
+ {
+ className = ((Class<?>)validatorClass).getName();
+ }
+ else
+ {
+ className = validatorClass.toString();
+ }
// Ensure atomicity between _defaultValidatorsIds and _cachedDefaultValidatorsIds
synchronized(_defaultValidatorsIds)
{