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

[Gavin King]

  User: gavin   
  Date: 07/06/13 17:10:15

  Modified:    src/ui/org/jboss/seam/ui/graphicImage 
                        GraphicImageResource.java
  Log:
  refactor
  
  Revision  Changes    Path
  1.4       +28 -42    jboss-seam/src/ui/org/jboss/seam/ui/graphicImage/GraphicImageResource.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: GraphicImageResource.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/ui/org/jboss/seam/ui/graphicImage/GraphicImageResource.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -b -r1.3 -r1.4
  --- GraphicImageResource.java	13 Jun 2007 16:43:04 -0000	1.3
  +++ GraphicImageResource.java	13 Jun 2007 21:10:15 -0000	1.4
  @@ -6,7 +6,7 @@
   
   import java.io.IOException;
   
  -import javax.faces.event.PhaseId;
  +import javax.servlet.ServletException;
   import javax.servlet.ServletOutputStream;
   import javax.servlet.http.HttpServletRequest;
   import javax.servlet.http.HttpServletResponse;
  @@ -16,11 +16,8 @@
   import org.jboss.seam.annotations.Name;
   import org.jboss.seam.annotations.Scope;
   import org.jboss.seam.annotations.Startup;
  -import org.jboss.seam.contexts.Lifecycle;
  -import org.jboss.seam.core.ConversationPropagation;
  -import org.jboss.seam.core.Manager;
  +import org.jboss.seam.contexts.ContextualHttpServletRequest;
   import org.jboss.seam.servlet.AbstractResource;
  -import org.jboss.seam.servlet.ServletRequestSessionMap;
   import org.jboss.seam.ui.graphicImage.GraphicImageStore.ImageWrapper;
   
   @Startup
  @@ -42,23 +39,26 @@
      }
      
      @Override
  -   public void getResource(HttpServletRequest request, HttpServletResponse response)
  -      throws IOException
  +   public void getResource(final HttpServletRequest request, final HttpServletResponse response)
  +      throws ServletException, IOException
      {
  -      String pathInfo = request.getPathInfo().substring(getResourcePath().length() + 1,
  -               request.getPathInfo().lastIndexOf("."));
   
  -      // Set up Seam contexts
  -      Lifecycle.setPhaseId(PhaseId.INVOKE_APPLICATION);
  -      Lifecycle.setServletRequest(request);
  -      Lifecycle.beginRequest( getServletContext(), request );
  -      ConversationPropagation.instance().restoreConversationId( request.getParameterMap() );
  -      Manager.instance().restoreConversation();
  -      Lifecycle.resumeConversation(request);
  -      Manager.instance().handleConversationPropagation( request.getParameterMap() );
  +      new ContextualHttpServletRequest(request, getServletContext())
  +      {
  +         @Override
  +         public void process() throws IOException 
  +         {
  +            doWork(request, response);
  +         }
  +      }.run();
  +      
  +   }
         
  -      try
  +   private void doWork(HttpServletRequest request, HttpServletResponse response)
  +      throws IOException
         {
  +      String pathInfo = request.getPathInfo().substring(getResourcePath().length() + 1,
  +               request.getPathInfo().lastIndexOf("."));
            ImageWrapper image = GraphicImageStore.instance().remove(pathInfo);
            if (image != null)
            {
  @@ -73,20 +73,6 @@
            {
               response.sendError(HttpServletResponse.SC_NOT_FOUND);
            }
  -
  -         // TODO: conversation timeout
  -         Manager.instance().endRequest( new ServletRequestSessionMap(request) );
  -         Lifecycle.endRequest(request);
  -      }
  -      catch (Exception e)
  -      {
  -         Lifecycle.endRequest();
  -      }
  -      finally
  -      {
  -         Lifecycle.setServletRequest(null);
  -         Lifecycle.setPhaseId(null);
  -      }      
      }
   
   }