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/12/01 01:22:46 UTC

svn commit: r1040837 - in /myfaces/extensions/cdi/trunk/jee-modules: jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/ jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/navigation/

Author: gpetracek
Date: Wed Dec  1 00:22:46 2010
New Revision: 1040837

URL: http://svn.apache.org/viewvc?rev=1040837&view=rev
Log:
EXTCDI-36 optional support for getNavigationCases

Modified:
    myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/DefaultWindowContextConfig.java
    myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/navigation/CodiNavigationHandler.java

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/DefaultWindowContextConfig.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/DefaultWindowContextConfig.java?rev=1040837&r1=1040836&r2=1040837&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/DefaultWindowContextConfig.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf/impl/config/DefaultWindowContextConfig.java Wed Dec  1 00:22:46 2010
@@ -118,6 +118,6 @@ public class DefaultWindowContextConfig 
 
     public boolean isUseViewConfigsAsNavigationCasesEnabled()
     {
-        return false;
+        return true;
     }
 }

Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/navigation/CodiNavigationHandler.java
URL: http://svn.apache.org/viewvc/myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/navigation/CodiNavigationHandler.java?rev=1040837&r1=1040836&r2=1040837&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/navigation/CodiNavigationHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf20-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/jsf2/impl/navigation/CodiNavigationHandler.java Wed Dec  1 00:22:46 2010
@@ -118,17 +118,19 @@ public class CodiNavigationHandler exten
             Set<NavigationCase> navigationCase = new HashSet<NavigationCase>();
 
             Map<String, List<String>> parameters = resolveParameters();
+            boolean includeParameters;
 
             for(ViewConfigEntry entry : viewConfigEntries)
             {
+                includeParameters = Page.ViewParameter.INCLUDE.equals(entry.getViewParameter());
                 navigationCase.add(new NavigationCase("*",
                                                       null,
                                                       null,
                                                       null,
                                                       entry.getViewId(),
-                                                      parameters,
+                                                      includeParameters ? parameters : null,
                                                       Page.NavigationMode.REDIRECT.equals(entry.getNavigationMode()),
-                                                      Page.ViewParameter.INCLUDE.equals(entry.getViewParameter())));
+                                                      includeParameters));
 
                 result.put(entry.getViewId(), navigationCase);
             }