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/09 10:18:26 UTC
svn commit: r983552 -
/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/scope/conversation/AccessScopeAwareNavigationHandler.java
Author: gpetracek
Date: Mon Aug 9 08:18:26 2010
New Revision: 983552
URL: http://svn.apache.org/viewvc?rev=983552&view=rev
Log:
EXTCDI-1, EXTCDI-2 and EXTCDI-3 cleanup
Modified:
myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/scope/conversation/AccessScopeAwareNavigationHandler.java
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/scope/conversation/AccessScopeAwareNavigationHandler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/scope/conversation/AccessScopeAwareNavigationHandler.java?rev=983552&r1=983551&r2=983552&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/scope/conversation/AccessScopeAwareNavigationHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf2/impl/scope/conversation/AccessScopeAwareNavigationHandler.java Mon Aug 9 08:18:26 2010
@@ -24,12 +24,16 @@ import static org.apache.myfaces.extensi
import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.util.JsfUtils;
import javax.faces.application.NavigationHandler;
+import javax.faces.application.ConfigurableNavigationHandler;
+import javax.faces.application.NavigationCase;
import javax.faces.context.FacesContext;
+import java.util.Map;
+import java.util.Set;
/**
* @author Gerhard Petracek
*/
-public class AccessScopeAwareNavigationHandler extends NavigationHandler
+public class AccessScopeAwareNavigationHandler extends ConfigurableNavigationHandler
{
private final NavigationHandler navigationHandler;
@@ -52,4 +56,22 @@ public class AccessScopeAwareNavigationH
storeCurrentViewIdAsNewViewId(facesContext);
}
+
+ public NavigationCase getNavigationCase(FacesContext context, String action, String outcome)
+ {
+ if(this.navigationHandler instanceof ConfigurableNavigationHandler)
+ {
+ return ((ConfigurableNavigationHandler)this.navigationHandler).getNavigationCase(context, action, outcome);
+ }
+ return null;
+ }
+
+ public Map<String, Set<NavigationCase>> getNavigationCases()
+ {
+ if(this.navigationHandler instanceof ConfigurableNavigationHandler)
+ {
+ return ((ConfigurableNavigationHandler)this.navigationHandler).getNavigationCases();
+ }
+ return null;
+ }
}