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/07/09 10:18:58 UTC
svn commit: r962441 - in
/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces: application/
config/element/ config/impl/digester/ config/impl/digester/elements/
Author: jakobk
Date: Fri Jul 9 08:18:57 2010
New Revision: 962441
URL: http://svn.apache.org/viewvc?rev=962441&view=rev
Log:
MYFACES-2800 navigation-case/redirect/include-view-params is not picked up and has a wrong default value
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/element/Redirect.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Redirect.java
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java?rev=962441&r1=962440&r2=962441&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/application/NavigationHandlerImpl.java Fri Jul 9 08:18:57 2010
@@ -613,7 +613,13 @@ public class NavigationHandlerImpl
{
if(configCase.getRedirect() != null)
{
- apiCases.add(new NavigationCase(rule.getFromViewId(),configCase.getFromAction(),configCase.getFromOutcome(),configCase.getIf(),configCase.getToViewId(),configCase.getRedirect().getViewParams(),true,configCase.getRedirect().isIncludeViewParams()));
+ String includeViewParamsAttribute = configCase.getRedirect().getIncludeViewParams();
+ boolean includeViewParams = false; // default value is false
+ if (includeViewParamsAttribute != null)
+ {
+ includeViewParams = new Boolean(includeViewParamsAttribute);
+ }
+ apiCases.add(new NavigationCase(rule.getFromViewId(),configCase.getFromAction(),configCase.getFromOutcome(),configCase.getIf(),configCase.getToViewId(),configCase.getRedirect().getViewParams(),true,includeViewParams));
}
else
{
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/element/Redirect.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/element/Redirect.java?rev=962441&r1=962440&r2=962441&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/element/Redirect.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/element/Redirect.java Fri Jul 9 08:18:57 2010
@@ -25,5 +25,5 @@ import java.util.Map;
public interface Redirect
{
public Map<String, List<String>> getViewParams();
- public boolean isIncludeViewParams();
+ public String getIncludeViewParams();
}
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java?rev=962441&r1=962440&r2=962441&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/DigesterFacesConfigUnmarshallerImpl.java Fri Jul 9 08:18:57 2010
@@ -222,8 +222,8 @@ public class DigesterFacesConfigUnmarsha
digester.addCallMethod("faces-config/navigation-rule/navigation-case/if", "setIf", 0);
digester.addCallMethod("faces-config/navigation-rule/navigation-case/to-view-id", "setToViewId", 0);
digester.addObjectCreate("faces-config/navigation-rule/navigation-case/redirect", Redirect.class);
+ digester.addSetProperties("faces-config/navigation-rule/navigation-case/redirect", "include-view-params", "includeViewParams");
digester.addSetNext("faces-config/navigation-rule/navigation-case/redirect", "setRedirect");
- digester.addCallMethod("faces-config/navigation-rule/navigation-case/redirect/include-view-params", "setIncludeViewParams", 0);
digester.addObjectCreate("faces-config/navigation-rule/navigation-case/redirect/view-param", ViewParam.class);
digester.addSetNext("faces-config/navigation-rule/navigation-case/redirect/view-param", "addViewParam");
digester.addCallMethod("faces-config/navigation-rule/navigation-case/redirect/view-param/name", "setName",0);
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Redirect.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Redirect.java?rev=962441&r1=962440&r2=962441&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Redirect.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/config/impl/digester/elements/Redirect.java Fri Jul 9 08:18:57 2010
@@ -29,8 +29,7 @@ import org.apache.myfaces.config.impl.di
public class Redirect implements org.apache.myfaces.config.element.Redirect
{
private Map<String,List<String>> viewParams = new HashMap<String,List<String>>();
- private boolean includeViewParams = true;
-
+ private String includeViewParams;
public void addViewParam(ViewParam viewParam)
{
@@ -49,14 +48,14 @@ public class Redirect implements org.apa
return viewParams;
}
- public void setIncludeViewParams(String includeViewParams)
- {
- this.includeViewParams = new Boolean (includeViewParams);
- }
-
- public boolean isIncludeViewParams()
+ public String getIncludeViewParams()
{
return includeViewParams;
}
+ public void setIncludeViewParams(String includeViewParams)
+ {
+ this.includeViewParams = includeViewParams;
+ }
+
}