You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ja...@apache.org on 2010/01/22 00:39:55 UTC
svn commit: r901926 - in
/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets:
AbstractFaceletContext.java impl/DefaultFaceletContext.java
tag/jsf/ComponentTagHandlerDelegate.java
Author: jakobk
Date: Thu Jan 21 23:39:55 2010
New Revision: 901926
URL: http://svn.apache.org/viewvc?rev=901926&view=rev
Log:
MYFACES-2501 f:validateBean should only use the validationGroups from the stack, if its validationGroups property is null or an empty string: changed method in AbstractFaceletContext to fit the new solution better.
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/AbstractFaceletContext.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletContext.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentTagHandlerDelegate.java
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/AbstractFaceletContext.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/AbstractFaceletContext.java?rev=901926&r1=901925&r2=901926&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/AbstractFaceletContext.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/AbstractFaceletContext.java Thu Jan 21 23:39:55 2010
@@ -169,11 +169,11 @@
public abstract void pushAjaxHandlerToStack(AjaxHandler parent);
/**
- * Gets all validation groups on the stack.
+ * Gets the top of the validationGroups stack.
* @return
* @since 2.0
*/
- public abstract Iterator<String> getValidationGroups();
+ public abstract String getFirstValidationGroupFromStack();
/**
* Removes top of stack.
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletContext.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletContext.java?rev=901926&r1=901925&r2=901926&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletContext.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/impl/DefaultFaceletContext.java Thu Jan 21 23:39:55 2010
@@ -618,13 +618,13 @@
}
/**
- * Gets all validation groups on the stack.
+ * Gets the top of the validationGroups stack.
* @return
* @since 2.0
*/
@Override
@SuppressWarnings("unchecked")
- public Iterator<String> getValidationGroups()
+ public String getFirstValidationGroupFromStack()
{
Map<Object, Object> attributes = getFacesContext().getAttributes();
@@ -632,7 +632,7 @@
= (LinkedList<String>) attributes.get(VALIDATION_GROUPS_STACK);
if (validationGroupsStack != null && !validationGroupsStack.isEmpty())
{
- return validationGroupsStack.iterator();
+ return validationGroupsStack.getFirst(); // top-of-stack
}
return null;
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentTagHandlerDelegate.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentTagHandlerDelegate.java?rev=901926&r1=901925&r2=901926&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentTagHandlerDelegate.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentTagHandlerDelegate.java Thu Jan 21 23:39:55 2010
@@ -497,10 +497,10 @@
{
// no validationGroups available
// --> get the validationGroups from the stack
- Iterator<String> itValidationGroups = actx.getValidationGroups();
- if (itValidationGroups != null && itValidationGroups.hasNext())
+ String stackGroup = actx.getFirstValidationGroupFromStack();
+ if (stackGroup != null)
{
- validationGroups = itValidationGroups.next();
+ validationGroups = stackGroup;
}
else
{