svn commit: r956614 - in /myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context: FacesContextFactoryImpl.java servlet/FacesContextImpl.java

[ja...@apache.org]

Author: jakobk
Date: Mon Jun 21 14:59:21 2010
New Revision: 956614

URL: http://svn.apache.org/viewvc?rev=956614&view=rev
Log:
MYFACES-2759 Clean up FacesContextImpl (reverted changes from revision 955770)

Modified:
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/FacesContextFactoryImpl.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/FacesContextFactoryImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/FacesContextFactoryImpl.java?rev=956614&r1=956613&r2=956614&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/FacesContextFactoryImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/FacesContextFactoryImpl.java Mon Jun 21 14:59:21 2010
@@ -151,7 +151,7 @@ public class FacesContextFactoryImpl ext
         
         if (context instanceof ServletContext)
         {
-            FacesContext facesContext = new FacesContextImpl(externalContext, this);
+            FacesContext facesContext = new FacesContextImpl(externalContext, null, this);
             
             facesContext.setExceptionHandler(_exceptionHandlerFactory.getExceptionHandler());
             

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java?rev=956614&r1=956613&r2=956614&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/context/servlet/FacesContextImpl.java Mon Jun 21 14:59:21 2010
@@ -18,6 +18,7 @@
  */
 package org.apache.myfaces.context.servlet;
 
+import java.lang.String;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -96,14 +97,20 @@ public class FacesContextImpl extends Fa
         init(new ServletExternalContextImpl(servletContext, servletRequest, servletResponse));
     }
     
-    public FacesContextImpl(final ExternalContext externalContext, 
+    public FacesContextImpl(final ExternalContext externalContext,
+            final ReleaseableExternalContext defaultExternalContext , 
             final ReleaseableFacesContextFactory facesContextFactory)
     {
         _facesContextFactory = facesContextFactory;
-        init(externalContext);
+        init(externalContext, defaultExternalContext);
     }
 
-    private void init(final ExternalContext externalContext)
+    private void init(final ReleaseableExternalContext externalContext)
+    {
+        init((ExternalContext) externalContext, externalContext);
+    }
+
+    private void init(final ExternalContext externalContext, final ReleaseableExternalContext defaultExternalContext)
     {       
         _externalContext = externalContext;
         FacesContext.setCurrentInstance(this);  //protected method, therefore must be called from here
@@ -489,6 +496,17 @@ public class FacesContextImpl extends Fa
         _exceptionHandler = exceptionHandler;
     }
 
+    // Portlet need to do this to change from ActionRequest/Response to
+    // RenderRequest/Response
+    /* This code comes from jsf 1.1 and is not valid anymore
+    public final void setExternalContext(ReleaseableExternalContext extContext)
+    {
+        assertNotReleased();
+
+        _externalContext = extContext;
+        FacesContext.setCurrentInstance(this); // TODO: figure out if I really need to do this
+    }*/
+
     @Override
     public final ELContext getELContext()
     {