You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2011/10/04 16:23:09 UTC
svn commit: r1178810 - in /myfaces/tobago/trunk: tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/ tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/

Author: bommel
Date: Tue Oct  4 14:23:08 2011
New Revision: 1178810

URL: http://svn.apache.org/viewvc?rev=1178810&view=rev
Log:
(TOBAGO-1033) Replace usages of TobagoFacesContext with FacesContext.getAttributes or ExternalContext.getRequestMap (jsf < 2.0)

Modified:
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/FacesContextUtils.java
    myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/FacesContextUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/FacesContextUtils.java?rev=1178810&r1=1178809&r2=1178810&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/FacesContextUtils.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/util/FacesContextUtils.java Tue Oct  4 14:23:08 2011
@@ -29,18 +29,18 @@ import java.util.List;
 import java.util.Set;
 
 public final class FacesContextUtils {
-  private final static String TOBAGO_AJAX = "org.apache.myfaces.tobago.ajax";
-  private final static String TOBAGO_AJAX_COMPONENT_ID = "org.apache.myfaces.tobago.ajaxComponentId";
-  private final static String TOBAGO_ENCTYPE = "org.apache.myfaces.tobago.enctype";
-  private final static String TOBAGO_SCRIPT_FILES = "org.apache.myfaces.tobago.scriptFiles";
-  private final static String TOBAGO_SCRIPT_BLOCKS = "org.apache.myfaces.tobago.scriptBlocks";
-  private final static String TOBAGO_STYLE_FILES = "org.apache.myfaces.tobago.styleFiles";
-  private final static String TOBAGO_STYLE_BLOCKS = "org.apache.myfaces.tobago.styleBlocks";
-  private final static String TOBAGO_ONLOAD_SCRIPTS = "org.apache.myfaces.tobago.onloadScripts";
-  private final static String TOBAGO_ONUNLOAD_SCRIPTS = "org.apache.myfaces.tobago.onunloadScripts";
-  private final static String TOBAGO_ONEXIT_SCRIPTS = "org.apache.myfaces.tobago.onexitScripts";
-  private final static String TOBAGO_ONSUBMIT_SCRIPTS = "org.apache.myfaces.tobago.onsubmitScripts";
-  private final static String TOBAGO_POPUPS = "org.apache.myfaces.tobago.popups";
+  private static final String TOBAGO_AJAX = "org.apache.myfaces.tobago.ajax";
+  private static final String TOBAGO_AJAX_COMPONENT_ID = "org.apache.myfaces.tobago.ajaxComponentId";
+  private static final String TOBAGO_ENCTYPE = "org.apache.myfaces.tobago.enctype";
+  private static final String TOBAGO_SCRIPT_FILES = "org.apache.myfaces.tobago.scriptFiles";
+  private static final String TOBAGO_SCRIPT_BLOCKS = "org.apache.myfaces.tobago.scriptBlocks";
+  private static final String TOBAGO_STYLE_FILES = "org.apache.myfaces.tobago.styleFiles";
+  private static final String TOBAGO_STYLE_BLOCKS = "org.apache.myfaces.tobago.styleBlocks";
+  private static final String TOBAGO_ONLOAD_SCRIPTS = "org.apache.myfaces.tobago.onloadScripts";
+  private static final String TOBAGO_ONUNLOAD_SCRIPTS = "org.apache.myfaces.tobago.onunloadScripts";
+  private static final String TOBAGO_ONEXIT_SCRIPTS = "org.apache.myfaces.tobago.onexitScripts";
+  private static final String TOBAGO_ONSUBMIT_SCRIPTS = "org.apache.myfaces.tobago.onsubmitScripts";
+  private static final String TOBAGO_POPUPS = "org.apache.myfaces.tobago.popups";
           
   
   public static boolean isAjax(FacesContext context) {

Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java?rev=1178810&r1=1178809&r2=1178810&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/java/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/tag/SheetRenderer.java Tue Oct  4 14:23:08 2011
@@ -128,7 +128,8 @@ public class SheetRenderer extends Layou
 
     writer.endElement(HtmlElements.DIV);
     // TODO check ajax id
-    if (!(FacesContextUtils.isAjax(facesContext) && sheetId.equals(FacesContextUtils.getAjaxComponentId(facesContext)))) {
+    if (!(FacesContextUtils.isAjax(facesContext)
+        && sheetId.equals(FacesContextUtils.getAjaxComponentId(facesContext)))) {
 
       Integer frequency = null;
       UIComponent facetReload = sheet.getFacet(Facets.RELOAD);