myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lu4...@apache.org
Subject svn commit: r1522131 - /myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResourceResolver.java
Date Thu, 12 Sep 2013 02:21:21 GMT
Author: lu4242
Date: Thu Sep 12 02:21:20 2013
New Revision: 1522131

URL: http://svn.apache.org/r1522131
Log:
MYFACES-3740 ResourceResolver "this" identifier applies for contracts too in JSF 2.2 (for
css resources)

Modified:
    myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResourceResolver.java

Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResourceResolver.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResourceResolver.java?rev=1522131&r1=1522130&r2=1522131&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResourceResolver.java
(original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/el/unified/resolver/ResourceResolver.java
Thu Sep 12 02:21:20 2013
@@ -29,6 +29,7 @@ import javax.faces.application.ResourceH
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.view.Location;
+import org.apache.myfaces.shared.renderkit.html.util.ResourceUtils;
 import org.apache.myfaces.shared.resource.ContractResource;
 
 import org.apache.myfaces.view.facelets.el.CompositeComponentELUtils;
@@ -121,6 +122,7 @@ public final class ResourceResolver exte
                             Resource ccResource = (Resource) cc.getAttributes().get(
                                     Resource.COMPONENT_RESOURCE_KEY); 
                             libraryName = ccResource.getLibraryName();
+                            contractName = ResourceUtils.getContractName(ccResource);
                         }
                         else
                         {



Mime
View raw message