svn commit: r1002714 - in /tomcat/trunk/java/org/apache/coyote/http11: AbstractHttp11Processor.java Http11AprProcessor.java Http11NioProcessor.java Http11Processor.java

[markt]

Author: markt
Date: Wed Sep 29 16:18:21 2010
New Revision: 1002714

URL: http://svn.apache.org/viewvc?rev=1002714&view=rev
Log:
Tweak the refactoring

Modified:
    tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
    tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
    tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
    tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java

Modified: 
tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java?rev=1002714&r1=1002713&r2=1002714&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/AbstractHttp11Processor.java Wed 
Sep 29 16:18:21 2010
@@ -25,6 +25,7 @@ import java.util.regex.PatternSyntaxExce
 
 import org.apache.catalina.core.AsyncContextImpl;
 import org.apache.coyote.ActionCode;
+import org.apache.coyote.ActionHook;
 import org.apache.coyote.Adapter;
 import org.apache.coyote.AsyncStateMachine;
 import org.apache.coyote.Processor;
@@ -50,7 +51,7 @@ import org.apache.tomcat.util.net.Abstra
 import org.apache.tomcat.util.net.AbstractEndpoint.Handler.SocketState;
 import org.apache.tomcat.util.res.StringManager;
 
-public abstract class AbstractHttp11Processor implements Processor {
+public abstract class AbstractHttp11Processor implements ActionHook, Processor 
{
 
     protected abstract Log getLog();
 
@@ -852,6 +853,7 @@ public abstract class AbstractHttp11Proc
      * @param actionCode Type of the action
      * @param param Action parameter
      */
+    @Override
     public final void action(ActionCode actionCode, Object param) {
         
         if (actionCode == ActionCode.COMMIT) {

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?rev=1002714&r1=1002713&r2=1002714&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java Wed Sep 
29 16:18:21 2010
@@ -26,7 +26,6 @@ import java.util.Locale;
 import java.util.concurrent.Executor;
 
 import org.apache.coyote.ActionCode;
-import org.apache.coyote.ActionHook;
 import org.apache.coyote.Request;
 import org.apache.coyote.RequestInfo;
 import org.apache.coyote.Response;
@@ -55,7 +54,7 @@ import org.apache.tomcat.util.net.Socket
  *
  * @author Remy Maucherat
  */
-public class Http11AprProcessor extends AbstractHttp11Processor implements 
ActionHook {
+public class Http11AprProcessor extends AbstractHttp11Processor {
 
 
     private static final Log log = LogFactory.getLog(Http11AprProcessor.class);

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java?rev=1002714&r1=1002713&r2=1002714&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java 
(original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProcessor.java Wed Sep 
29 16:18:21 2010
@@ -24,7 +24,6 @@ import java.util.Locale;
 import java.util.concurrent.Executor;
 
 import org.apache.coyote.ActionCode;
-import org.apache.coyote.ActionHook;
 import org.apache.coyote.Request;
 import org.apache.coyote.RequestInfo;
 import org.apache.coyote.Response;
@@ -52,7 +51,7 @@ import org.apache.tomcat.util.net.Socket
  * @author Remy Maucherat
  * @author Filip Hanik
  */
-public class Http11NioProcessor extends AbstractHttp11Processor implements 
ActionHook {
+public class Http11NioProcessor extends AbstractHttp11Processor {
 
     private static final Log log = LogFactory.getLog(Http11NioProcessor.class);
     @Override

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java?rev=1002714&r1=1002713&r2=1002714&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11Processor.java Wed Sep 29 
16:18:21 2010
@@ -25,7 +25,6 @@ import java.util.Locale;
 import java.util.concurrent.Executor;
 
 import org.apache.coyote.ActionCode;
-import org.apache.coyote.ActionHook;
 import org.apache.coyote.Request;
 import org.apache.coyote.RequestInfo;
 import org.apache.coyote.Response;
@@ -51,7 +50,7 @@ import org.apache.tomcat.util.net.Socket
  * @author Remy Maucherat
  * @author fhanik
  */
-public class Http11Processor extends AbstractHttp11Processor implements 
ActionHook {
+public class Http11Processor extends AbstractHttp11Processor {
 
     private static final Log log = LogFactory.getLog(Http11Processor.class);
     @Override



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org