[jboss-cvs] jboss-seam/src/main/org/jboss/seam/servlet ...

[Shane Bryzak]

  User: sbryzak2
  Date: 07/02/14 02:32:38

  Modified:    src/main/org/jboss/seam/servlet    ResourceServlet.java
  Added:       src/main/org/jboss/seam/servlet    AbstractResource.java
  Removed:     src/main/org/jboss/seam/servlet   
                        AbstractResourceProvider.java
  Log:
  refactored resource providers
  
  Revision  Changes    Path
  1.3       +5 -8      jboss-seam/src/main/org/jboss/seam/servlet/ResourceServlet.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ResourceServlet.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/servlet/ResourceServlet.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- ResourceServlet.java	14 Feb 2007 00:36:48 -0000	1.2
  +++ ResourceServlet.java	14 Feb 2007 07:32:38 -0000	1.3
  @@ -11,7 +11,6 @@
   import javax.servlet.http.HttpServletRequest;
   import javax.servlet.http.HttpServletResponse;
   
  -import org.jboss.seam.annotations.ResourceProvider;
   import org.jboss.seam.contexts.Context;
   import org.jboss.seam.contexts.WebApplicationContext;
   import org.jboss.seam.core.Init;
  @@ -25,7 +24,7 @@
   {
      private ServletContext context;
         
  -   private Map<String,AbstractResourceProvider> providers = new HashMap<String,AbstractResourceProvider>();
  +   private Map<String,AbstractResource> providers = new HashMap<String,AbstractResource>();
      
      @Override
      public void init(ServletConfig config)
  @@ -43,13 +42,11 @@
         Init init = (Init) tempApplicationContext.get(Init.class);
         for ( String name: init.getResourceProviders() )
         {
  -         AbstractResourceProvider provider = (AbstractResourceProvider) tempApplicationContext.get(name);
  +         AbstractResource provider = (AbstractResource) tempApplicationContext.get(name);
            if (provider != null)
            {
  -            ResourceProvider p = provider.getClass().getAnnotation(ResourceProvider.class);      
  -            
               provider.setServletContext(context);
  -            providers.put(p.value(), provider);
  +            providers.put(provider.getResourcePath(), provider);
            }
         }      
      }
  @@ -73,7 +70,7 @@
            int index = path.indexOf('/', 1);
            if (index != -1) path = path.substring(0, index);
            
  -         AbstractResourceProvider provider = providers.get(path);
  +         AbstractResource provider = providers.get(path);
            if (provider != null)
            {
               provider.getResource(request, response);
  
  
  
  1.1      date: 2007/02/14 07:32:38;  author: sbryzak2;  state: Exp;jboss-seam/src/main/org/jboss/seam/servlet/AbstractResource.java
  
  Index: AbstractResource.java
  ===================================================================
  package org.jboss.seam.servlet;
  
  import java.io.IOException;
  
  import javax.servlet.ServletContext;
  import javax.servlet.http.HttpServletRequest;
  import javax.servlet.http.HttpServletResponse;
  
  public abstract class AbstractResource
  {
     private ServletContext context;
     
     protected ServletContext getServletContext()
     {
        return context;
     }
     
     protected void setServletContext(ServletContext context)
     {
        this.context = context;
     }
           
     public abstract void getResource(HttpServletRequest request, HttpServletResponse response)
         throws IOException;
     
     protected abstract String getResourcePath();
  }