myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lu4...@apache.org
Subject svn commit: r905409 - in /myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets: FaceletViewDeclarationLanguage.java tag/jsf/ComponentTagHandlerDelegate.java
Date Mon, 01 Feb 2010 20:46:08 GMT
Author: lu4242
Date: Mon Feb  1 20:46:08 2010
New Revision: 905409

URL: http://svn.apache.org/viewvc?rev=905409&view=rev
Log:
move org.apache.myfaces.REFRESH_TRANSIENT_BUILD_ON_PSS to MyfacesConfig (and small fix)

Modified:
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentTagHandlerDelegate.java

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java?rev=905409&r1=905408&r2=905409&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java
(original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/FaceletViewDeclarationLanguage.java
Mon Feb  1 20:46:08 2010
@@ -82,6 +82,7 @@
 import org.apache.myfaces.config.RuntimeConfig;
 import org.apache.myfaces.shared_impl.application.DefaultViewHandlerSupport;
 import org.apache.myfaces.shared_impl.application.ViewHandlerSupport;
+import org.apache.myfaces.shared_impl.config.MyfacesConfig;
 import org.apache.myfaces.shared_impl.util.ClassUtils;
 import org.apache.myfaces.shared_impl.util.StringUtils;
 import org.apache.myfaces.shared_impl.view.ViewDeclarationLanguageBase;
@@ -170,9 +171,6 @@
     @JSFWebConfigParam(since="2.0")
     private final static String PARAM_SKIP_COMMENTS_DEPRECATED = "facelets.SKIP_COMMENTS";
 
-    @JSFWebConfigParam(since="2.0")
-    public final static String PARAM_REFRESH_TRANSIENT_BUILD_ON_PSS = "org.apache.myfaces.PARAM_REFRESH_TRANSIENT_BUILD_ON_PSS";

-
     //public final static String PARAM_VIEW_MAPPINGS = "javax.faces.FACELETS_VIEW_MAPPINGS";
     
     //private final static String PARAM_VIEW_MAPPINGS_DEPRECATED = "facelets.VIEW_MAPPINGS";
@@ -222,7 +220,7 @@
     private boolean _refreshTransientBuildOnPSS;
     
     private boolean _refreshTransientBuildOnPSSAuto;
-    
+        
     private Set<String> _viewIds;
 
     /**
@@ -1869,11 +1867,8 @@
         
         if (_partialStateSaving)
         {
-            String refreshTransientBuildOnPSSAuto = _getStringParameter(context,
-                PARAM_REFRESH_TRANSIENT_BUILD_ON_PSS, null);
-            _refreshTransientBuildOnPSS = ("true".equalsIgnoreCase(refreshTransientBuildOnPSSAuto)
|| 
-                    "auto".equalsIgnoreCase(refreshTransientBuildOnPSSAuto));
-            _refreshTransientBuildOnPSSAuto = "auto".equalsIgnoreCase(refreshTransientBuildOnPSSAuto);
+            _refreshTransientBuildOnPSS = MyfacesConfig.getCurrentInstance(context).isRefreshTransientBuildOnPSS();
+            _refreshTransientBuildOnPSSAuto = MyfacesConfig.getCurrentInstance(context).isRefreshTransientBuildOnPSSAuto();
         }
     }
     

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentTagHandlerDelegate.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentTagHandlerDelegate.java?rev=905409&r1=905408&r2=905409&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentTagHandlerDelegate.java
(original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/jsf/ComponentTagHandlerDelegate.java
Mon Feb  1 20:46:08 2010
@@ -142,7 +142,7 @@
         // composite:insertChildren or composite:insertFacet
         boolean componentFoundInserted = false;
 
-        if (c == null && UIComponent.isCompositeComponent(parent))
+        if (c == null && actx.isRefreshingTransientBuild() && UIComponent.isCompositeComponent(parent))
         {
             if (facetName == null)
             {



Mime
View raw message