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/07/11 03:00:10 UTC
svn commit: r962963 - in
/myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl:
request/ scope/conversation/
Author: gpetracek
Date: Sun Jul 11 01:00:10 2010
New Revision: 962963
URL: http://svn.apache.org/viewvc?rev=962963&view=rev
Log:
EXTCDI-1, EXTCDI-2 and EXTCDI-3 cleanup
Modified:
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/request/CodiFacesContextFactory.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/request/CodiFacesContextWrapper.java
myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/AccessScopeAwareNavigationHandler.java
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/request/CodiFacesContextFactory.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/request/CodiFacesContextFactory.java?rev=962963&r1=962962&r2=962963&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/request/CodiFacesContextFactory.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/request/CodiFacesContextFactory.java Sun Jul 11 01:00:10 2010
@@ -50,4 +50,13 @@ public class CodiFacesContextFactory ext
return new CodiFacesContextWrapper(facesContext);
}
+
+ public static FacesContext wrapFacesContext(FacesContext facesContext)
+ {
+ if(facesContext instanceof CodiFacesContextWrapper)
+ {
+ return facesContext;
+ }
+ return new CodiFacesContextWrapper(facesContext);
+ }
}
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/request/CodiFacesContextWrapper.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/request/CodiFacesContextWrapper.java?rev=962963&r1=962962&r2=962963&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/request/CodiFacesContextWrapper.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/request/CodiFacesContextWrapper.java Sun Jul 11 01:00:10 2010
@@ -41,7 +41,7 @@ import java.util.Set;
*
* @author Gerhard Petracek
*/
-public class CodiFacesContextWrapper extends FacesContext
+class CodiFacesContextWrapper extends FacesContext
{
private FacesContext wrappedFacesContext;
@@ -49,7 +49,7 @@ public class CodiFacesContextWrapper ext
private BeforeAfterFacesRequestBroadcaster beforeAfterFacesRequestBroadcaster;
- public CodiFacesContextWrapper(FacesContext wrappedFacesContext)
+ CodiFacesContextWrapper(FacesContext wrappedFacesContext)
{
this.wrappedFacesContext = wrappedFacesContext;
//(currently) causes issue in combination with geronimo 3.0-m1
Modified: myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/AccessScopeAwareNavigationHandler.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/scope/conversation/AccessScopeAwareNavigationHandler.java?rev=962963&r1=962962&r2=962963&view=diff
==============================================================================
--- myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/AccessScopeAwareNavigationHandler.java (original)
+++ myfaces/extensions/cdi/trunk/jee-modules/jsf-module/impl/src/main/java/org/apache/myfaces/extensions/cdi/javaee/jsf/impl/scope/conversation/AccessScopeAwareNavigationHandler.java Sun Jul 11 01:00:10 2010
@@ -18,7 +18,7 @@
*/
package org.apache.myfaces.extensions.cdi.javaee.jsf.impl.scope.conversation;
-import org.apache.myfaces.extensions.cdi.javaee.jsf.impl.request.CodiFacesContextWrapper;
+import static org.apache.myfaces.extensions.cdi.javaee.jsf.impl.request.CodiFacesContextFactory.wrapFacesContext;
import javax.faces.application.NavigationHandler;
import javax.faces.context.FacesContext;
@@ -41,7 +41,8 @@ public class AccessScopeAwareNavigationH
public void handleNavigation(FacesContext facesContext, String s, String s1)
{
- facesContext = getWrappedFacesContext(facesContext);
+ //TODO check myfaces core - issue? facesContext is not wrapped here
+ facesContext = wrapFacesContext(facesContext);
String oldViewId = facesContext.getViewRoot().getViewId();
Map requestMap = facesContext.getExternalContext().getRequestMap();
@@ -54,14 +55,4 @@ public class AccessScopeAwareNavigationH
requestMap.put(NEW_VIEW_ID_KEY, newViewId);
}
-
- //TODO check myfaces core - issue? facesContext is not wrapped here
- private FacesContext getWrappedFacesContext(FacesContext facesContext)
- {
- if(facesContext instanceof CodiFacesContextWrapper)
- {
- return facesContext;
- }
- return new CodiFacesContextWrapper(facesContext);
- }
}