You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by gp...@apache.org on 2010/08/21 15:46:07 UTC
svn commit: r987757 -
/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/flow/FlowNavigationHandler.java
Author: gpetracek
Date: Sat Aug 21 13:46:06 2010
New Revision: 987757
URL: http://svn.apache.org/viewvc?rev=987757&view=rev
Log:
EXTCDI-36 minor change to allow returning the class itself as outcome
Modified:
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/flow/FlowNavigationHandler.java
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/flow/FlowNavigationHandler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/flow/FlowNavigationHandler.java?rev=987757&r1=987756&r2=987757&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/flow/FlowNavigationHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/view/flow/FlowNavigationHandler.java Sat Aug 21 13:46:06 2010
@@ -56,8 +56,14 @@ public class FlowNavigationHandler exten
{
if(outcome != null && outcome.contains("."))
{
+ String originalOutcome = outcome;
+
if(!otherOutcomes.contains(outcome))
{
+ if(outcome.startsWith("class "))
+ {
+ outcome = outcome.substring(6);
+ }
ViewDefinitionEntry entry = viewDefinitions.get(outcome);
if(entry == null)
@@ -66,7 +72,7 @@ public class FlowNavigationHandler exten
if(loadedClass == null)
{
- otherOutcomes.add(outcome);
+ otherOutcomes.add(originalOutcome);
}
else if(loadedClass instanceof Class && ViewDefinition.class.isAssignableFrom((Class)loadedClass))
{