[jboss-cvs] jboss-seam/src/ui/org/jboss/seam/ui/facelet ...

[Peter Muir]

  User: pmuir   
  Date: 07/01/24 14:00:31

  Modified:    src/ui/org/jboss/seam/ui/facelet  FaceletsRenderer.java
  Log:
  Alter resourceUrl(viewId) to use Resources.getResource
  
  Revision  Changes    Path
  1.5       +7 -3      jboss-seam/src/ui/org/jboss/seam/ui/facelet/FaceletsRenderer.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: FaceletsRenderer.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/facelet/FaceletsRenderer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -b -r1.4 -r1.5
  --- FaceletsRenderer.java	24 Jan 2007 02:11:53 -0000	1.4
  +++ FaceletsRenderer.java	24 Jan 2007 19:00:31 -0000	1.5
  @@ -1,5 +1,6 @@
   package org.jboss.seam.ui.facelet;
   
  +import java.io.InputStream;
   import java.io.StringWriter;
   import java.io.Writer;
   import java.io.IOException;
  @@ -8,12 +9,14 @@
   import javax.faces.component.UIViewRoot;
   import javax.faces.context.FacesContext;
   import javax.faces.context.ResponseWriter;
  +import javax.servlet.ServletContext;
   
   import org.jboss.seam.*;
   import org.jboss.seam.annotations.*;
   import org.jboss.seam.core.Renderer;
   
   import org.jboss.seam.ui.JSF;
  +import org.jboss.seam.util.Resources;
   
   import com.sun.facelets.Facelet;
   import com.sun.facelets.compiler.SAXCompiler;
  @@ -46,7 +49,7 @@
               StringWriter stringWriter = new StringWriter();
               wrapResponseWriter(facesContext, stringWriter);
   
  -            renderFacelet(facesContext, faceletForURL(resourceURL(classLoader, viewId)));
  +            renderFacelet(facesContext, faceletForURL(resourceURL(viewId)));
   
               return stringWriter.getBuffer().toString();
           } 
  @@ -64,9 +67,10 @@
       }
   
   
  -    protected URL resourceURL(ClassLoader classLoader, String viewId) 
  +    protected URL resourceURL(String viewId) 
       {
  -        URL url = classLoader.getResource(viewId); 
  +       
  +        URL url = Resources.getResource(viewId);
   
           if (url == null) 
           {