You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2011/10/12 20:38:03 UTC
svn commit: r1182517 - in /myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/renderkit/html: HtmlScriptRenderer.java HtmlStylesheetRenderer.java

Author: lu4242
Date: Wed Oct 12 18:38:03 2011
New Revision: 1182517

URL: http://svn.apache.org/viewvc?rev=1182517&view=rev
Log:
MYFACES-3355 Allow relocation of library name / resource name using a Resource wrapper

Modified:
    myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlScriptRenderer.java
    myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlStylesheetRenderer.java

Modified: myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlScriptRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlScriptRenderer.java?rev=1182517&r1=1182516&r2=1182517&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlScriptRenderer.java (original)
+++ myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlScriptRenderer.java Wed Oct 12 18:38:03 2011
@@ -227,8 +227,14 @@ public class HtmlScriptRenderer extends 
                     " It will be silenty ignored.");
             return;
         } else {
+            if (ResourceUtils.isRenderedScript(facesContext, resource.getLibraryName(), resource.getResourceName())) {
+                //Resource already founded
+                return;
+            }
+            
             // Rendering resource
             ResourceUtils.markScriptAsRendered(facesContext, libraryName, resourceName);
+            ResourceUtils.markStylesheetAsRendered(facesContext, resource.getLibraryName(), resource.getResourceName());
             ResponseWriter writer = facesContext.getResponseWriter();
             writer.startElement(HTML.SCRIPT_ELEM, component);
 // We can't render the content type, because usually it returns "application/x-javascript"

Modified: myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlStylesheetRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlStylesheetRenderer.java?rev=1182517&r1=1182516&r2=1182517&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlStylesheetRenderer.java (original)
+++ myfaces/core/branches/2.0.x/impl/src/main/java/org/apache/myfaces/renderkit/html/HtmlStylesheetRenderer.java Wed Oct 12 18:38:03 2011
@@ -214,8 +214,15 @@ public class HtmlStylesheetRenderer exte
         }
         else
         {
+            if (ResourceUtils.isRenderedStylesheet(facesContext, resource.getLibraryName(), resource.getResourceName()))
+            {
+                //Resource already founded
+                return;
+            }
+
             // Rendering resource
             ResourceUtils.markStylesheetAsRendered(facesContext, libraryName, resourceName);
+            ResourceUtils.markStylesheetAsRendered(facesContext, resource.getLibraryName(), resource.getResourceName());
             ResponseWriter writer = facesContext.getResponseWriter();
             writer.startElement(HTML.LINK_ELEM, component);
             writer.writeAttribute(HTML.REL_ATTR, HTML.STYLESHEET_VALUE,null );