You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ta...@apache.org on 2017/09/02 11:10:36 UTC
svn commit: r1807038 - in
/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/faces:
ApplicationScopeObjectProducer.java FacesScopeObjectProducer.java
Author: tandraschko
Date: Sat Sep 2 11:10:36 2017
New Revision: 1807038
URL: http://svn.apache.org/viewvc?rev=1807038&view=rev
Log:
MYFACES-4079 fixed FlowMap scope
Modified:
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/faces/ApplicationScopeObjectProducer.java
myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/faces/FacesScopeObjectProducer.java
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/faces/ApplicationScopeObjectProducer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/faces/ApplicationScopeObjectProducer.java?rev=1807038&r1=1807037&r2=1807038&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/faces/ApplicationScopeObjectProducer.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/faces/ApplicationScopeObjectProducer.java Sat Sep 2 11:10:36 2017
@@ -23,7 +23,6 @@ import java.util.Map;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.inject.Produces;
import javax.faces.annotation.ApplicationMap;
-import javax.faces.annotation.FlowMap;
import javax.faces.annotation.InitParameterMap;
import javax.faces.application.Application;
import javax.faces.application.ResourceHandler;
@@ -69,13 +68,4 @@ public class ApplicationScopeObjectProdu
{
return FacesContext.getCurrentInstance().getApplication().getResourceHandler();
}
-
- @Produces
- @Named("flowScope")
- @FlowMap
- @ApplicationScoped
- public Map<Object, Object> getFlowMap()
- {
- return FacesContext.getCurrentInstance().getApplication().getFlowHandler().getCurrentFlowScope();
- }
}
Modified: myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/faces/FacesScopeObjectProducer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/faces/FacesScopeObjectProducer.java?rev=1807038&r1=1807037&r2=1807038&view=diff
==============================================================================
--- myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/faces/FacesScopeObjectProducer.java (original)
+++ myfaces/core/branches/2.3.x/impl/src/main/java/org/apache/myfaces/cdi/faces/FacesScopeObjectProducer.java Sat Sep 2 11:10:36 2017
@@ -22,6 +22,7 @@ package org.apache.myfaces.cdi.faces;
import java.util.Map;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.inject.Produces;
+import javax.faces.annotation.FlowMap;
import javax.faces.annotation.HeaderMap;
import javax.faces.annotation.HeaderValuesMap;
import javax.faces.annotation.RequestCookieMap;
@@ -147,9 +148,10 @@ public class FacesScopeObjectProducer
/*
- Don't use CDI for now as this results in bad performance.
- Also @Inject UIComponent doesn't make sense.
- See ImplicitObjectResolver#makeResolverForFacesCDI().
+ The spec actually forces us the use producers for "cc" and "component but it leads to a bad performance.
+ Also @Inject UIComponent doesn't make sense and wouldn't work correctly if we don't create a own "ComponentScoped"
+ or something.
+ We will still use ELResolvers for this - see ImplicitObjectResolver#makeResolverForFacesCDI().
@Produces
@Named("component")
@@ -167,5 +169,13 @@ public class FacesScopeObjectProducer
return UIComponent.getCurrentCompositeComponent(FacesContext.getCurrentInstance());
}
*/
-
+
+ @Produces
+ @Named("flowScope")
+ @FlowMap
+ @ApplicationScoped
+ public Map<Object, Object> getFlowMap()
+ {
+ return FacesContext.getCurrentInstance().getApplication().getFlowHandler().getCurrentFlowScope();
+ }
}