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

Gavin King gavin.king at jboss.com
Wed Oct 25 11:14:36 EDT 2006


  User: gavin   
  Date: 06/10/25 11:14:36

  Modified:    src/main/org/jboss/seam/remoting      ExecutionHandler.java
                        InterfaceGenerator.java PollHandler.java
                        SeamRemotingServlet.java SubscriptionHandler.java
  Log:
  many minor
  
  Revision  Changes    Path
  1.17      +3 -2      jboss-seam/src/main/org/jboss/seam/remoting/ExecutionHandler.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: ExecutionHandler.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/remoting/ExecutionHandler.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -b -r1.16 -r1.17
  --- ExecutionHandler.java	10 Oct 2006 22:09:05 -0000	1.16
  +++ ExecutionHandler.java	25 Oct 2006 15:14:36 -0000	1.17
  @@ -5,6 +5,7 @@
   import java.util.ArrayList;
   import java.util.Iterator;
   import java.util.List;
  +
   import javax.faces.event.PhaseId;
   import javax.servlet.ServletContext;
   import javax.servlet.http.HttpServletRequest;
  @@ -19,7 +20,6 @@
   import org.jboss.seam.contexts.ContextAdaptor;
   import org.jboss.seam.contexts.Lifecycle;
   import org.jboss.seam.core.Manager;
  -import org.jboss.seam.remoting.wrapper.BeanWrapper;
   import org.jboss.seam.remoting.wrapper.Wrapper;
   
   /**
  @@ -42,6 +42,7 @@
   
     private ServletContext servletContext;
   
  +  @Override
     public void setServletContext(ServletContext ctx)
     {
       this.servletContext = ctx;
  @@ -70,7 +71,7 @@
         RequestContext ctx = unmarshalContext(env);
   
         // Reinstate the Seam conversation
  -      HttpSession session = ( (HttpServletRequest) request).getSession(true);
  +      HttpSession session = request.getSession(true);
         Lifecycle.setPhaseId(PhaseId.INVOKE_APPLICATION);
         Lifecycle.setServletRequest(request);
         Lifecycle.beginRequest(servletContext, session, request);
  
  
  
  1.24      +2 -1      jboss-seam/src/main/org/jboss/seam/remoting/InterfaceGenerator.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: InterfaceGenerator.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/remoting/InterfaceGenerator.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -b -r1.23 -r1.24
  --- InterfaceGenerator.java	13 Oct 2006 10:14:27 -0000	1.23
  +++ InterfaceGenerator.java	25 Oct 2006 15:14:36 -0000	1.24
  @@ -55,6 +55,7 @@
   
     private ServletContext servletContext;
   
  +  @Override
     public void setServletContext(ServletContext ctx)
     {
       this.servletContext = ctx;
  @@ -505,7 +506,7 @@
           for (Type t : ((ParameterizedType) propertyType).getActualTypeArguments())
           {
             if (t instanceof Class)
  -            appendTypeSource(out, (Class) t, types);
  +            appendTypeSource(out, t, types);
           }
         }
   
  
  
  
  1.8       +2 -1      jboss-seam/src/main/org/jboss/seam/remoting/PollHandler.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: PollHandler.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/remoting/PollHandler.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- PollHandler.java	11 Oct 2006 04:35:46 -0000	1.7
  +++ PollHandler.java	25 Oct 2006 15:14:36 -0000	1.8
  @@ -53,6 +53,7 @@
   
     private ServletContext servletContext;
   
  +  @Override
     public void setServletContext(ServletContext ctx)
     {
       this.servletContext = ctx;
  @@ -73,7 +74,7 @@
   
       try
       {
  -      HttpSession session = ((HttpServletRequest) request).getSession(true);
  +      HttpSession session = request.getSession(true);
         Lifecycle.setPhaseId(PhaseId.INVOKE_APPLICATION);
         Lifecycle.setServletRequest(request);
         Lifecycle.beginRequest(servletContext, session, request);
  
  
  
  1.11      +3 -2      jboss-seam/src/main/org/jboss/seam/remoting/SeamRemotingServlet.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SeamRemotingServlet.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/remoting/SeamRemotingServlet.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -b -r1.10 -r1.11
  --- SeamRemotingServlet.java	6 Aug 2006 10:11:48 -0000	1.10
  +++ SeamRemotingServlet.java	25 Oct 2006 15:14:36 -0000	1.11
  @@ -32,8 +32,6 @@
   
     private static final Pattern pathPattern = Pattern.compile("/(.*?)/([^/]+)");
   
  -  private static final String PARAM_ALLOWABLE_TOPICS = "allowableTopics";
  -
     private static final String RESOURCE_PATH = "resource";
   
     private ServletContext servletContext;
  @@ -50,18 +48,21 @@
      * @param config ServletConfig
      * @throws ServletException
      */
  +  @Override
     public void init(ServletConfig config)
         throws ServletException
     {
       servletContext = config.getServletContext();
     }
   
  +  @Override
     protected void doGet(HttpServletRequest request, HttpServletResponse response)
         throws ServletException, IOException
     {
       doPost(request, response);
     }
   
  +  @Override
     protected void doPost(HttpServletRequest request,
                           HttpServletResponse response)
         throws ServletException, IOException
  
  
  
  1.9       +2 -1      jboss-seam/src/main/org/jboss/seam/remoting/SubscriptionHandler.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: SubscriptionHandler.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/remoting/SubscriptionHandler.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -b -r1.8 -r1.9
  --- SubscriptionHandler.java	10 Oct 2006 22:09:05 -0000	1.8
  +++ SubscriptionHandler.java	25 Oct 2006 15:14:36 -0000	1.9
  @@ -29,6 +29,7 @@
   
     private ServletContext servletContext;
   
  +  @Override
     public void setServletContext(ServletContext ctx)
     {
       this.servletContext = ctx;
  @@ -65,7 +66,7 @@
   
       try
       {
  -      HttpSession session = ((HttpServletRequest) request).getSession(true);
  +      HttpSession session = request.getSession(true);
         Lifecycle.setPhaseId(PhaseId.INVOKE_APPLICATION);
         Lifecycle.setServletRequest(request);
         Lifecycle.beginRequest(servletContext, session, request);
  
  
  



More information about the jboss-cvs-commits mailing list