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

[Gavin King]

  User: gavin   
  Date: 07/01/10 12:17:35

  Modified:    src/ui/org/jboss/seam/ui/facelet  FaceletsRenderer.java
  Log:
  ws
  
  Revision  Changes    Path
  1.2       +20 -13    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.1
  retrieving revision 1.2
  diff -u -b -r1.1 -r1.2
  --- FaceletsRenderer.java	10 Jan 2007 14:36:34 -0000	1.1
  +++ FaceletsRenderer.java	10 Jan 2007 17:17:35 -0000	1.2
  @@ -1,4 +1,4 @@
  -package orb.jboss.seam.ui.facelet;
  +package org.jboss.seam.ui.facelet;
   
   import java.io.StringWriter;
   import java.io.Writer;
  @@ -24,11 +24,11 @@
   @Intercept(InterceptionType.NEVER)
   @Name("renderer")
   @Install(value=true, precedence=Install.BUILT_IN)
  -public class FaceletsRenderer
  -    extends Renderer
  +public class FaceletsRenderer extends Renderer
   {
   
  -    public String render(String viewId) {
  +    public String render(String viewId) 
  +    {
           return render(viewId,
                         Thread.currentThread().getContextClassLoader());
       }
  @@ -39,27 +39,35 @@
   
           ResponseWriter originalWriter = null;
   
  -        try {
  +        try 
  +        {
               StringWriter stringWriter = new StringWriter();
               wrapResponseWriter(facesContext, stringWriter);
   
               renderFacelet(facesContext, faceletForURL(resourceURL(classLoader, viewId)));
   
               return stringWriter.getBuffer().toString();
  -        } catch (IOException e) {
  +        } 
  +        catch (IOException e) 
  +        {
               throw new RuntimeException(e);
  -        } finally {
  -            if (originalWriter != null) {
  +        } 
  +        finally 
  +        {
  +            if (originalWriter != null) 
  +            {
                   facesContext.setResponseWriter(originalWriter);
               }
           }
       }
   
   
  -    protected URL resourceURL(ClassLoader classLoader, String viewId) {
  +    protected URL resourceURL(ClassLoader classLoader, String viewId) 
  +    {
           URL url = classLoader.getResource(viewId); 
   
  -        if (url == null) {
  +        if (url == null) 
  +        {
               throw new IllegalArgumentException("resource doesn't exist: " + viewId);
           }
   
  @@ -74,8 +82,8 @@
       }
   
   
  -    protected void wrapResponseWriter(FacesContext facesContext, 
  -                                      Writer writer) {
  +    protected void wrapResponseWriter(FacesContext facesContext, Writer writer) 
  +    {
           ResponseWriter responseWriter = 
               facesContext.getRenderKit().createResponseWriter(writer, null, null);
   
  @@ -90,5 +98,4 @@
           JSF.renderChildren(facesContext, root);
       }
   
  -
   }