You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltaspike.apache.org by gp...@apache.org on 2013/09/10 12:34:42 UTC
git commit: DELTASPIKE-410 improved compatibility with mojarra
Updated Branches:
refs/heads/master 109af9847 -> 6060db960
DELTASPIKE-410 improved compatibility with mojarra
Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/6060db96
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/6060db96
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/6060db96
Branch: refs/heads/master
Commit: 6060db960d2e5eac128d43f95f92c5cb4baa0d4e
Parents: 109af98
Author: gpetracek <gp...@apache.org>
Authored: Tue Sep 10 12:33:40 2013 +0200
Committer: gpetracek <gp...@apache.org>
Committed: Tue Sep 10 12:33:50 2013 +0200
----------------------------------------------------------------------
.../deltaspike/jsf/api/config/JsfModuleConfig.java | 9 ---------
.../navigation/DeltaSpikeNavigationHandler.java | 17 -----------------
2 files changed, 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/6060db96/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/JsfModuleConfig.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/JsfModuleConfig.java b/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/JsfModuleConfig.java
index 949d200..33c8341 100644
--- a/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/JsfModuleConfig.java
+++ b/deltaspike/modules/jsf/api/src/main/java/org/apache/deltaspike/jsf/api/config/JsfModuleConfig.java
@@ -45,15 +45,6 @@ public class JsfModuleConfig implements DeltaSpikeConfig
}
/**
- * @return true for creating additional navigation-cases based on view configs for
- * ConfigurableNavigationHandler#getNavigationCases
- */
- public boolean isUseViewConfigsAsNavigationCasesEnabled()
- {
- return true;
- }
-
- /**
* Per default all faces-messages are preserved for the next rendering process
* @return true if the messages should be preserved automatically, false otherwise
*/
http://git-wip-us.apache.org/repos/asf/deltaspike/blob/6060db96/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/navigation/DeltaSpikeNavigationHandler.java
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/navigation/DeltaSpikeNavigationHandler.java b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/navigation/DeltaSpikeNavigationHandler.java
index fd01bf6..cd0d1ed 100644
--- a/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/navigation/DeltaSpikeNavigationHandler.java
+++ b/deltaspike/modules/jsf/impl/src/main/java/org/apache/deltaspike/jsf/impl/navigation/DeltaSpikeNavigationHandler.java
@@ -22,11 +22,9 @@ import org.apache.deltaspike.core.api.config.view.DefaultErrorView;
import org.apache.deltaspike.core.api.config.view.ViewConfig;
import org.apache.deltaspike.core.api.config.view.metadata.ViewConfigDescriptor;
import org.apache.deltaspike.core.api.config.view.metadata.ViewConfigResolver;
-import org.apache.deltaspike.core.api.provider.BeanProvider;
import org.apache.deltaspike.core.spi.activation.Deactivatable;
import org.apache.deltaspike.core.util.ClassDeactivationUtils;
import org.apache.deltaspike.core.util.ClassUtils;
-import org.apache.deltaspike.jsf.api.config.JsfModuleConfig;
import org.apache.deltaspike.jsf.api.config.view.View;
import org.apache.deltaspike.jsf.impl.config.view.navigation.NavigationCaseMapWrapper;
import org.apache.deltaspike.jsf.impl.config.view.navigation.ViewConfigAwareNavigationHandler;
@@ -51,7 +49,6 @@ public class DeltaSpikeNavigationHandler extends ConfigurableNavigationHandler i
private final NavigationHandler wrapped;
private final boolean activated;
- private final boolean addViewConfigsAsNavigationCase;
/**
* Constructor for wrapping the given {@link NavigationHandler}
@@ -62,8 +59,6 @@ public class DeltaSpikeNavigationHandler extends ConfigurableNavigationHandler i
{
this.wrapped = navigationHandler;
this.activated = ClassDeactivationUtils.isActivated(getClass());
-
- this.addViewConfigsAsNavigationCase = this.activated && isAddViewConfigsAsNavigationCaseActivated();
}
@Override
@@ -171,18 +166,6 @@ public class DeltaSpikeNavigationHandler extends ConfigurableNavigationHandler i
result = new HashMap<String, Set<NavigationCase>>();
}
- if (!this.addViewConfigsAsNavigationCase)
- {
- return result;
- }
-
return new NavigationCaseMapWrapper(result);
}
-
- private boolean isAddViewConfigsAsNavigationCaseActivated()
- {
- JsfModuleConfig config = BeanProvider.getContextualReference(JsfModuleConfig.class);
-
- return config.isUseViewConfigsAsNavigationCasesEnabled();
- }
}