svn commit: r424376 - in /incubator/adffaces/trunk/adf-faces/adf-faces-impl/src: main/java/org/apache/myfaces/adfinternal/context/ main/java/org/apache/myfaces/adfinternal/renderkit/core/xhtml/ test/java/org/apache/myfaces/adfinternal/renderkit/

[matzew]

Author: matzew
Date: Fri Jul 21 09:29:05 2006
New Revision: 424376

URL: http://svn.apache.org/viewvc?rev=424376&view=rev
Log:
ADFFACES-70

Modified:
    
incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/context/AdfFacesContextImpl.java
    
incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/renderkit/core/xhtml/PartialPageUtils.java
    
incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/test/java/org/apache/myfaces/adfinternal/renderkit/MAdfFacesContext.java

Modified: 
incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/context/AdfFacesContextImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/context/AdfFacesContextImpl.java?rev=424376&r1=424375&r2=424376&view=diff
==============================================================================
--- 
incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/context/AdfFacesContextImpl.java
 (original)
+++ 
incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/context/AdfFacesContextImpl.java
 Fri Jul 21 09:29:05 2006
@@ -57,6 +57,7 @@
 import org.apache.myfaces.adfinternal.metadata.RegionMetadata;
 
 import org.apache.myfaces.adfinternal.renderkit.core.ppr.PartialPageContext;
+import org.apache.myfaces.adfinternal.renderkit.core.xhtml.XhtmlConstants;
 import org.apache.myfaces.adfinternal.renderkit.AdfRenderingContext;
 import org.apache.myfaces.adfinternal.share.config.UIXCookie;
 
@@ -173,6 +174,20 @@
 
     return true;
   }
+  
+  public boolean isPartialRequest(FacesContext context)
+  {
+    Map requestMap = context.getExternalContext().getRequestMap();
+    if (Boolean.TRUE.equals(requestMap.get(XhtmlConstants.PARTIAL_PARAM)))
+      return true;
+    
+    Map parameters = context.getExternalContext().getRequestParameterMap();
+    if ("true".equals(parameters.get("partial")))
+      return true;
+
+    return false;
+  }
+
 
   public boolean isDebugOutput()
   {

Modified: 
incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/renderkit/core/xhtml/PartialPageUtils.java
URL: 
http://svn.apache.org/viewvc/incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/renderkit/core/xhtml/PartialPageUtils.java?rev=424376&r1=424375&r2=424376&view=diff
==============================================================================
--- 
incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/renderkit/core/xhtml/PartialPageUtils.java
 (original)
+++ 
incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/main/java/org/apache/myfaces/adfinternal/renderkit/core/xhtml/PartialPageUtils.java
 Fri Jul 21 09:29:05 2006
@@ -20,9 +20,9 @@
 import javax.faces.context.FacesContext;
 
 import org.apache.myfaces.adf.context.AdfFacesContext;
-import org.apache.myfaces.adf.util.PartitialPageRenderingUtils;
 
 import org.apache.myfaces.adfinternal.agent.AdfFacesAgent;
+import org.apache.myfaces.adfinternal.context.AdfFacesContextBean;
 
 import org.apache.myfaces.adfinternal.renderkit.AdfRenderingContext;
 import org.apache.myfaces.adfinternal.renderkit.core.ppr.PartialPageContext;
@@ -41,7 +41,7 @@
 
   public static boolean isPartialRequest(FacesContext context)
   {
-    return PartitialPageRenderingUtils.isPartialRequest(context);
+    return AdfFacesContext.getCurrentInstance().isPartialRequest(context);
   }
 
 

Modified: 
incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/test/java/org/apache/myfaces/adfinternal/renderkit/MAdfFacesContext.java
URL: 
http://svn.apache.org/viewvc/incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/test/java/org/apache/myfaces/adfinternal/renderkit/MAdfFacesContext.java?rev=424376&r1=424375&r2=424376&view=diff
==============================================================================
--- 
incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/test/java/org/apache/myfaces/adfinternal/renderkit/MAdfFacesContext.java
 (original)
+++ 
incubator/adffaces/trunk/adf-faces/adf-faces-impl/src/test/java/org/apache/myfaces/adfinternal/renderkit/MAdfFacesContext.java
 Fri Jul 21 09:29:05 2006
@@ -19,6 +19,8 @@
 import java.util.TimeZone;
 import javax.faces.component.UIComponent;
 import javax.faces.component.UIViewRoot;
+import javax.faces.context.FacesContext;
+
 import org.apache.myfaces.adf.change.ChangeManager;
 import org.apache.myfaces.adf.config.RegionManager;
 import org.apache.myfaces.adf.context.AdfFacesContext;
@@ -86,7 +88,12 @@
   public boolean isPostback()
   {
     return false;
-  }
+  }
+  
+  public boolean isPartialRequest(FacesContext context)
+  {
+    return false;
+  }
 
   public boolean isDebugOutput()
   {
@@ -218,5 +225,6 @@
   private Agent _agent;
   private boolean _rtl = false;
   static private TimeZone _FIXED_TIME_ZONE =
-    TimeZone.getTimeZone("America/Los_Angeles");
-}
+    TimeZone.getTimeZone("America/Los_Angeles");
+  
+}
\ No newline at end of file