svn commit: r509639 - in /jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio: ./ protocol/ util/

[ol...@apache.org]

Author: olegk
Date: Tue Feb 20 08:47:52 2007
New Revision: 509639

URL: http://svn.apache.org/viewvc?view=rev&rev=509639
Log:
Renamed ContentIOControl to IOControl, which represents the purpose of the interface more precisely

Added:
    jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/IOControl.java
      - copied, changed from r509148, jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/ContentIOControl.java
Removed:
    jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/ContentIOControl.java
Modified:
    jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/NHttpConnection.java
    jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java
    jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/SharedInputBuffer.java
    jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/SharedOutputBuffer.java

Copied: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/IOControl.java (from r509148, jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/ContentIOControl.java)
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/IOControl.java?view=diff&rev=509639&p1=jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/ContentIOControl.java&r1=509148&p2=jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/IOControl.java&r2=509639
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/ContentIOControl.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/IOControl.java Tue Feb 20 08:47:52 2007
@@ -32,13 +32,13 @@
 package org.apache.http.nio;
 
 /**
- * Content input/output control interface. It can be used to request or
+ * Connection input/output control interface. It can be used to request or
  * temporarily suspend event notifications that are triggered when the underlying
  * channel is ready for input / output operations. 
  * 
  * @author <a href="mailto:oleg at ural.ru">Oleg Kalnichevski</a>
  */
-public interface ContentIOControl {
+public interface IOControl {
 
     /**
      * Requests event notifications to be triggered when the underlying

Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/NHttpConnection.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/NHttpConnection.java?view=diff&rev=509639&r1=509638&r2=509639
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/NHttpConnection.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/NHttpConnection.java Tue Feb 20 08:47:52 2007
@@ -43,7 +43,7 @@
  * 
  * @author <a href="mailto:oleg at ural.ru">Oleg Kalnichevski</a>
  */
-public interface NHttpConnection extends HttpConnection, ContentIOControl {
+public interface NHttpConnection extends HttpConnection, IOControl {
 
     /** 
      * Returns the current HTTP request if one is being received / transmitted.

Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java?view=diff&rev=509639&r1=509638&r2=509639
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpServiceHandler.java Tue Feb 20 08:47:52 2007
@@ -52,7 +52,7 @@
 import org.apache.http.entity.ByteArrayEntity;
 import org.apache.http.nio.ContentDecoder;
 import org.apache.http.nio.ContentEncoder;
-import org.apache.http.nio.ContentIOControl;
+import org.apache.http.nio.IOControl;
 import org.apache.http.nio.NHttpConnection;
 import org.apache.http.nio.NHttpServerConnection;
 import org.apache.http.nio.NHttpServiceHandler;
@@ -528,7 +528,7 @@
     
     private void commitResponse(
             final ServerConnState connState,
-            final ContentIOControl ioControl) throws IOException, HttpException {
+            final IOControl ioControl) throws IOException, HttpException {
 
         waitForOutput(connState, ServerConnState.READY);
         

Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/SharedInputBuffer.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/SharedInputBuffer.java?view=diff&rev=509639&r1=509638&r2=509639
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/SharedInputBuffer.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/SharedInputBuffer.java Tue Feb 20 08:47:52 2007
@@ -33,17 +33,17 @@
 import java.io.IOException;
 
 import org.apache.http.nio.ContentDecoder;
-import org.apache.http.nio.ContentIOControl;
+import org.apache.http.nio.IOControl;
 
 public class SharedInputBuffer extends ExpandableBuffer implements ContentInputBuffer {
 
-    private final ContentIOControl ioctrl;
+    private final IOControl ioctrl;
     private final Object mutex;
     
     private volatile boolean shutdown = false;
     private volatile boolean endOfStream = false;
     
-    public SharedInputBuffer(int buffersize, final ContentIOControl ioctrl) {
+    public SharedInputBuffer(int buffersize, final IOControl ioctrl) {
         super(buffersize);
         if (ioctrl == null) {
             throw new IllegalArgumentException("I/O content control may not be null");

Modified: jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/SharedOutputBuffer.java
URL: http://svn.apache.org/viewvc/jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/SharedOutputBuffer.java?view=diff&rev=509639&r1=509638&r2=509639
==============================================================================
--- jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/SharedOutputBuffer.java (original)
+++ jakarta/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/SharedOutputBuffer.java Tue Feb 20 08:47:52 2007
@@ -33,7 +33,7 @@
 import java.io.IOException;
 
 import org.apache.http.nio.ContentEncoder;
-import org.apache.http.nio.ContentIOControl;
+import org.apache.http.nio.IOControl;
 
 public class SharedOutputBuffer extends ExpandableBuffer implements ContentOutputBuffer {
 
@@ -42,13 +42,13 @@
     private static final int CLOSING    = 2;
     private static final int CLOSED     = 4;
     
-    private final ContentIOControl ioctrl;
+    private final IOControl ioctrl;
     private final Object mutex;
     
     private volatile boolean shutdown = false;
     private volatile int state;
     
-    public SharedOutputBuffer(int buffersize, final ContentIOControl ioctrl) {
+    public SharedOutputBuffer(int buffersize, final IOControl ioctrl) {
         super(buffersize);
         if (ioctrl == null) {
             throw new IllegalArgumentException("I/O content control may not be null");