You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2008/08/10 00:16:17 UTC
svn commit: r684369 -
/myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/
Author: lu4242
Date: Sat Aug 9 15:16:15 2008
New Revision: 684369
URL: http://svn.apache.org/viewvc?rev=684369&view=rev
Log:
changed class name of package scoped inner classes according to myfaces style
Added:
myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/_AttachedListStateWrapper.java
- copied, changed from r684082, myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AttachedListStateWrapper.java
myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/_AttachedStateWrapper.java
- copied, changed from r684082, myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AttachedStateWrapper.java
Removed:
myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AttachedListStateWrapper.java
myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AttachedStateWrapper.java
Modified:
myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidatorBase.java
Modified: myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidatorBase.java
URL: http://svn.apache.org/viewvc/myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidatorBase.java?rev=684369&r1=684368&r2=684369&view=diff
==============================================================================
--- myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidatorBase.java (original)
+++ myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/ValidatorBase.java Sat Aug 9 15:16:15 2008
@@ -259,7 +259,7 @@
{
lst.add(saveAttachedState(context, it.next()));
}
- return new AttachedListStateWrapper(lst);
+ return new _AttachedListStateWrapper(lst);
}
else if (attachedObject instanceof StateHolder)
{
@@ -269,7 +269,7 @@
}
else
{
- return new AttachedStateWrapper(attachedObject.getClass(),
+ return new _AttachedStateWrapper(attachedObject.getClass(),
((StateHolder)attachedObject).saveState(context));
}
}
@@ -279,7 +279,7 @@
}
else
{
- return new AttachedStateWrapper(attachedObject.getClass(), null);
+ return new _AttachedStateWrapper(attachedObject.getClass(), null);
}
}
@@ -289,9 +289,9 @@
{
if (context == null) throw new NullPointerException("context");
if (stateObj == null) return null;
- if (stateObj instanceof AttachedListStateWrapper)
+ if (stateObj instanceof _AttachedListStateWrapper)
{
- List lst = ((AttachedListStateWrapper)stateObj).getWrappedStateList();
+ List lst = ((_AttachedListStateWrapper)stateObj).getWrappedStateList();
List restoredList = new ArrayList(lst.size());
for (Iterator it = lst.iterator(); it.hasNext(); )
{
@@ -299,9 +299,9 @@
}
return restoredList;
}
- else if (stateObj instanceof AttachedStateWrapper)
+ else if (stateObj instanceof _AttachedStateWrapper)
{
- Class clazz = ((AttachedStateWrapper)stateObj).getClazz();
+ Class clazz = ((_AttachedStateWrapper)stateObj).getClazz();
Object restoredObject;
try
{
@@ -317,7 +317,7 @@
}
if (restoredObject instanceof StateHolder)
{
- Object wrappedState = ((AttachedStateWrapper)stateObj).getWrappedStateObject();
+ Object wrappedState = ((_AttachedStateWrapper)stateObj).getWrappedStateObject();
((StateHolder)restoredObject).restoreState(context, wrappedState);
}
return restoredObject;
Copied: myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/_AttachedListStateWrapper.java (from r684082, myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AttachedListStateWrapper.java)
URL: http://svn.apache.org/viewvc/myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/_AttachedListStateWrapper.java?p2=myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/_AttachedListStateWrapper.java&p1=myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AttachedListStateWrapper.java&r1=684082&r2=684369&rev=684369&view=diff
==============================================================================
--- myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AttachedListStateWrapper.java (original)
+++ myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/_AttachedListStateWrapper.java Sat Aug 9 15:16:15 2008
@@ -25,13 +25,13 @@
* @author Manfred Geiler (latest modification by $Author: bdudney $)
* @version $Revision: 225333 $ $Date: 2005-07-26 17:49:19 +0200 (Di, 26 Jul 2005) $
*/
-class AttachedListStateWrapper
+class _AttachedListStateWrapper
implements Serializable
{
private static final long serialVersionUID = -3958718149793179776L;
private List _wrappedStateList;
- public AttachedListStateWrapper(List wrappedStateList)
+ public _AttachedListStateWrapper(List wrappedStateList)
{
_wrappedStateList = wrappedStateList;
}
Copied: myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/_AttachedStateWrapper.java (from r684082, myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AttachedStateWrapper.java)
URL: http://svn.apache.org/viewvc/myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/_AttachedStateWrapper.java?p2=myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/_AttachedStateWrapper.java&p1=myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AttachedStateWrapper.java&r1=684082&r2=684369&rev=684369&view=diff
==============================================================================
--- myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/AttachedStateWrapper.java (original)
+++ myfaces/commons/trunk/myfaces-commons-validators/src/main/java/org/apache/myfaces/commons/validator/_AttachedStateWrapper.java Sat Aug 9 15:16:15 2008
@@ -24,7 +24,7 @@
* @author Manfred Geiler (latest modification by $Author: bdudney $)
* @version $Revision: 225333 $ $Date: 2005-07-26 17:49:19 +0200 (Di, 26 Jul 2005) $
*/
-class AttachedStateWrapper
+class _AttachedStateWrapper
implements Serializable
{
private static final long serialVersionUID = 4948301780259917764L;
@@ -35,7 +35,7 @@
* @param clazz null means wrappedStateObject is a List of state objects
* @param wrappedStateObject
*/
- public AttachedStateWrapper(Class clazz, Object wrappedStateObject)
+ public _AttachedStateWrapper(Class clazz, Object wrappedStateObject)
{
if (wrappedStateObject != null && !(wrappedStateObject instanceof Serializable))
{