hc-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject svn commit: r612997 - in /httpcomponents/httpcore/trunk/module-nio/src: main/java/org/apache/http/impl/nio/ main/java/org/apache/http/impl/nio/codecs/ main/java/org/apache/http/impl/nio/reactor/ main/java/org/apache/http/nio/entity/ main/java/org/apach...
Date Thu, 17 Jan 2008 22:42:39 GMT
Author: sebb
Date: Thu Jan 17 14:42:36 2008
New Revision: 612997

URL: http://svn.apache.org/viewvc?rev=612997&view=rev
Log:
Add @Override markers to overriding / implementing methods

Modified:
    httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpClientConnection.java
    httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpServerConnection.java
    httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/ChunkDecoder.java
    httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/ChunkEncoder.java
    httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/HttpRequestParser.java
    httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/HttpRequestWriter.java
    httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/HttpResponseParser.java
    httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/HttpResponseWriter.java
    httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/IdentityDecoder.java
    httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/IdentityEncoder.java
    httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/LengthDelimitedDecoder.java
    httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/LengthDelimitedEncoder.java
    httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/BaseIOReactor.java
    httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/IOSessionImpl.java
    httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/entity/ContentBufferEntity.java
    httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/entity/ContentInputStream.java
    httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/entity/ContentOutputStream.java
    httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/BufferingHttpClientHandler.java
    httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpClientHandler.java
    httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/ExpandableBuffer.java
    httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/HttpCoreNIOSSLTestBase.java
    httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/HttpCoreNIOTestBase.java
    httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/impl/nio/reactor/TestBaseIOReactorSSL.java
    httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactors.java
    httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactorsSSL.java
    httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/mockup/MockupEncoder.java
    httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/mockup/TestHttpClient.java
    httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/mockup/TestHttpSSLClient.java
    httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/mockup/TestHttpSSLServer.java
    httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/mockup/TestHttpServer.java
    httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/protocol/TestNIOHttp.java

Modified: httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpClientConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpClientConnection.java?rev=612997&r1=612996&r2=612997&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpClientConnection.java
(original)
+++ httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpClientConnection.java
Thu Jan 17 14:42:36 2008
@@ -217,7 +217,8 @@
         return this.request != null;
     }
 
-    public String toString() {
+    @Override
+	public String toString() {
         StringBuffer buffer = new StringBuffer();
         buffer.append("[");
         if (isOpen()) {

Modified: httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpServerConnection.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpServerConnection.java?rev=612997&r1=612996&r2=612997&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpServerConnection.java
(original)
+++ httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/DefaultNHttpServerConnection.java
Thu Jan 17 14:42:36 2008
@@ -219,7 +219,8 @@
         return this.response != null;
     }
 
-    public String toString() {
+    @Override
+	public String toString() {
         StringBuffer buffer = new StringBuffer();
         buffer.append("[");
         if (isOpen()) {

Modified: httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/ChunkDecoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/ChunkDecoder.java?rev=612997&r1=612996&r2=612997&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/ChunkDecoder.java
(original)
+++ httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/ChunkDecoder.java
Thu Jan 17 14:42:36 2008
@@ -238,7 +238,8 @@
         }
     }
 
-    public String toString() {
+    @Override
+	public String toString() {
         StringBuffer buffer = new StringBuffer();
         buffer.append("[chunk-coded; completed: ");
         buffer.append(this.completed);

Modified: httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/ChunkEncoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/ChunkEncoder.java?rev=612997&r1=612996&r2=612997&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/ChunkEncoder.java
(original)
+++ httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/ChunkEncoder.java
Thu Jan 17 14:42:36 2008
@@ -69,17 +69,19 @@
         return chunk;
     }
 
-    public void complete() throws IOException {
+    @Override
+	public void complete() throws IOException {
         assertNotCompleted();
         this.lineBuffer.clear();
         this.lineBuffer.append("0");
         this.buffer.writeLine(this.lineBuffer);
         this.lineBuffer.clear();
         this.buffer.writeLine(this.lineBuffer);
-        this.completed = true;
+        this.completed = true; // == super.complete()
     }
     
-    public String toString() {
+    @Override
+	public String toString() {
         StringBuffer buffer = new StringBuffer();
         buffer.append("[chunk-coded; completed: ");
         buffer.append(this.completed);

Modified: httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/HttpRequestParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/HttpRequestParser.java?rev=612997&r1=612996&r2=612997&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/HttpRequestParser.java
(original)
+++ httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/HttpRequestParser.java
Thu Jan 17 14:42:36 2008
@@ -58,7 +58,8 @@
         this.requestFactory = requestFactory;
     }
 
-    protected HttpMessage createMessage(final CharArrayBuffer buffer) 
+    @Override
+	protected HttpMessage createMessage(final CharArrayBuffer buffer) 
             throws HttpException, ParseException {
         ParserCursor cursor = new ParserCursor(0, buffer.length());
         RequestLine requestLine = lineParser.parseRequestLine(buffer, cursor);

Modified: httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/HttpRequestWriter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/HttpRequestWriter.java?rev=612997&r1=612996&r2=612997&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/HttpRequestWriter.java
(original)
+++ httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/HttpRequestWriter.java
Thu Jan 17 14:42:36 2008
@@ -48,7 +48,8 @@
         super(buffer, formatter, params);
     }
     
-    protected void writeHeadLine(final HttpMessage message)
+    @Override
+	protected void writeHeadLine(final HttpMessage message)
         throws IOException {
 
         final CharArrayBuffer buffer = lineFormatter.formatRequestLine

Modified: httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/HttpResponseParser.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/HttpResponseParser.java?rev=612997&r1=612996&r2=612997&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/HttpResponseParser.java
(original)
+++ httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/HttpResponseParser.java
Thu Jan 17 14:42:36 2008
@@ -58,7 +58,8 @@
         this.responseFactory = responseFactory;
     }
 
-    protected HttpMessage createMessage(final CharArrayBuffer buffer) 
+    @Override
+	protected HttpMessage createMessage(final CharArrayBuffer buffer) 
             throws HttpException, ParseException {
         ParserCursor cursor = new ParserCursor(0, buffer.length());
         StatusLine statusline = lineParser.parseStatusLine(buffer, cursor);

Modified: httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/HttpResponseWriter.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/HttpResponseWriter.java?rev=612997&r1=612996&r2=612997&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/HttpResponseWriter.java
(original)
+++ httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/HttpResponseWriter.java
Thu Jan 17 14:42:36 2008
@@ -48,7 +48,8 @@
         super(buffer, formatter, params);
     }
     
-    protected void writeHeadLine(final HttpMessage message)
+    @Override
+	protected void writeHeadLine(final HttpMessage message)
         throws IOException {
 
         final CharArrayBuffer buffer = lineFormatter.formatStatusLine

Modified: httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/IdentityDecoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/IdentityDecoder.java?rev=612997&r1=612996&r2=612997&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/IdentityDecoder.java
(original)
+++ httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/IdentityDecoder.java
Thu Jan 17 14:42:36 2008
@@ -114,7 +114,8 @@
         return bytesRead;
     }
 
-    public String toString() {
+    @Override
+	public String toString() {
         StringBuffer buffer = new StringBuffer();
         buffer.append("[identity; completed: ");
         buffer.append(this.completed);

Modified: httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/IdentityEncoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/IdentityEncoder.java?rev=612997&r1=612996&r2=612997&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/IdentityEncoder.java
(original)
+++ httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/IdentityEncoder.java
Thu Jan 17 14:42:36 2008
@@ -88,7 +88,8 @@
         return bytesWritten;
     } 
     
-    public String toString() {
+    @Override
+	public String toString() {
         StringBuffer buffer = new StringBuffer();
         buffer.append("[identity; completed: ");
         buffer.append(this.completed);

Modified: httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/LengthDelimitedDecoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/LengthDelimitedDecoder.java?rev=612997&r1=612996&r2=612997&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/LengthDelimitedDecoder.java
(original)
+++ httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/LengthDelimitedDecoder.java
Thu Jan 17 14:42:36 2008
@@ -149,7 +149,8 @@
         return bytesRead;
     }
 
-    public String toString() {
+    @Override
+	public String toString() {
         StringBuffer buffer = new StringBuffer();
         buffer.append("[content length: ");
         buffer.append(this.contentLength);

Modified: httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/LengthDelimitedEncoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/LengthDelimitedEncoder.java?rev=612997&r1=612996&r2=612997&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/LengthDelimitedEncoder.java
(original)
+++ httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/codecs/LengthDelimitedEncoder.java
Thu Jan 17 14:42:36 2008
@@ -123,7 +123,8 @@
         return bytesWritten;
     }
     
-    public String toString() {
+    @Override
+	public String toString() {
         StringBuffer buffer = new StringBuffer();
         buffer.append("[content length: ");
         buffer.append(this.contentLength);

Modified: httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/BaseIOReactor.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/BaseIOReactor.java?rev=612997&r1=612996&r2=612997&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/BaseIOReactor.java
(original)
+++ httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/BaseIOReactor.java
Thu Jan 17 14:42:36 2008
@@ -80,13 +80,16 @@
         }
     }
 
-    protected void acceptable(final SelectionKey key) {
+    @Override
+	protected void acceptable(final SelectionKey key) {
     }
 
-    protected void connectable(final SelectionKey key) {
+    @Override
+	protected void connectable(final SelectionKey key) {
     }
 
-    protected void readable(final SelectionKey key) {
+    @Override
+	protected void readable(final SelectionKey key) {
         SessionHandle handle = (SessionHandle) key.attachment();
         IOSession session = handle.getSession();
         handle.resetLastRead();
@@ -101,7 +104,8 @@
         }
     }
 
-    protected void writable(final SelectionKey key) {
+    @Override
+	protected void writable(final SelectionKey key) {
         SessionHandle handle = (SessionHandle) key.attachment();
         IOSession session = handle.getSession();
         handle.resetLastWrite();
@@ -113,7 +117,8 @@
         }
     }
     
-    protected void validate(final Set<SelectionKey> keys) {
+    @Override
+	protected void validate(final Set<SelectionKey> keys) {
         long currentTime = System.currentTimeMillis();
         if( (currentTime - this.lastTimeoutCheck) >= this.timeoutCheckInterval) {
             this.lastTimeoutCheck = currentTime;
@@ -150,7 +155,8 @@
         }
     }
 
-    protected void timeoutCheck(final SelectionKey key, long now) {
+    @Override
+	protected void timeoutCheck(final SelectionKey key, long now) {
         Object attachment = key.attachment();
         if (attachment instanceof SessionHandle) {
             SessionHandle handle = (SessionHandle) key.attachment();
@@ -168,7 +174,8 @@
         }
     }
 
-    protected void keyCreated(final SelectionKey key, final IOSession session) {
+    @Override
+	protected void keyCreated(final SelectionKey key, final IOSession session) {
         SessionHandle handle = new SessionHandle(session); 
         key.attach(handle);
         try {
@@ -178,7 +185,8 @@
         }
     }
     
-    protected IOSession keyCancelled(final SelectionKey key) {
+    @Override
+	protected IOSession keyCancelled(final SelectionKey key) {
         Object attachment = key.attachment();
         if (attachment instanceof SessionHandle) {
             SessionHandle handle = (SessionHandle) attachment;
@@ -188,7 +196,8 @@
         }
     }
 
-    protected void sessionClosed(final IOSession session) {
+    @Override
+	protected void sessionClosed(final IOSession session) {
         try {
             this.eventDispatch.disconnected(session);
         } catch (RuntimeException ex) {

Modified: httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/IOSessionImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/IOSessionImpl.java?rev=612997&r1=612996&r2=612997&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/IOSessionImpl.java
(original)
+++ httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/impl/nio/reactor/IOSessionImpl.java
Thu Jan 17 14:42:36 2008
@@ -210,7 +210,8 @@
         buffer.append(']');
     }
     
-    public String toString() {
+    @Override
+	public String toString() {
         StringBuffer buffer = new StringBuffer();
         buffer.append("[");
         if (this.key.isValid()) {

Modified: httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/entity/ContentBufferEntity.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/entity/ContentBufferEntity.java?rev=612997&r1=612996&r2=612997&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/entity/ContentBufferEntity.java
(original)
+++ httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/entity/ContentBufferEntity.java
Thu Jan 17 14:42:36 2008
@@ -50,19 +50,23 @@
         setContent(new ContentInputStream(buffer));
     }
 
-    public boolean isChunked() {
+    @Override
+	public boolean isChunked() {
         return this.wrappedEntity.isChunked();
     }
 
-    public long getContentLength() {
+    @Override
+	public long getContentLength() {
         return this.wrappedEntity.getContentLength();
     }
 
-    public Header getContentType() {
+    @Override
+	public Header getContentType() {
         return this.wrappedEntity.getContentType();
     }
 
-    public Header getContentEncoding() {
+    @Override
+	public Header getContentEncoding() {
         return this.wrappedEntity.getContentEncoding();
     }
     

Modified: httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/entity/ContentInputStream.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/entity/ContentInputStream.java?rev=612997&r1=612996&r2=612997&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/entity/ContentInputStream.java
(original)
+++ httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/entity/ContentInputStream.java
Thu Jan 17 14:42:36 2008
@@ -48,18 +48,21 @@
         this.buffer = buffer;
     }
     
-    public int read(final byte[] b, int off, int len) throws IOException {
+    @Override
+	public int read(final byte[] b, int off, int len) throws IOException {
         return this.buffer.read(b, off, len);
     }
     
-    public int read(final byte[] b) throws IOException {
+    @Override
+	public int read(final byte[] b) throws IOException {
         if (b == null) {
             return 0;
         }
         return this.buffer.read(b, 0, b.length);
     }
     
-    public int read() throws IOException {
+    @Override
+	public int read() throws IOException {
         return this.buffer.read();
     }
 

Modified: httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/entity/ContentOutputStream.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/entity/ContentOutputStream.java?rev=612997&r1=612996&r2=612997&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/entity/ContentOutputStream.java
(original)
+++ httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/entity/ContentOutputStream.java
Thu Jan 17 14:42:36 2008
@@ -48,26 +48,31 @@
         this.buffer = buffer;
     }
 
-    public void close() throws IOException {
+    @Override
+	public void close() throws IOException {
         this.buffer.writeCompleted();
     }
 
-    public void flush() throws IOException {
+    @Override
+	public void flush() throws IOException {
         this.buffer.flush();
     }
 
-    public void write(byte[] b, int off, int len) throws IOException {
+    @Override
+	public void write(byte[] b, int off, int len) throws IOException {
         this.buffer.write(b, off, len);
     }
 
-    public void write(byte[] b) throws IOException {
+    @Override
+	public void write(byte[] b) throws IOException {
         if (b == null) {
             return;
         }
         this.buffer.write(b, 0, b.length);
     }
 
-    public void write(int b) throws IOException {
+    @Override
+	public void write(int b) throws IOException {
         this.buffer.write(b);
     }
 

Modified: httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/BufferingHttpClientHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/BufferingHttpClientHandler.java?rev=612997&r1=612996&r2=612997&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/BufferingHttpClientHandler.java
(original)
+++ httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/BufferingHttpClientHandler.java
Thu Jan 17 14:42:36 2008
@@ -104,11 +104,13 @@
         requestReady(conn);        
     }
 
-    public void closed(final NHttpClientConnection conn) {
+    @Override
+	public void closed(final NHttpClientConnection conn) {
         HttpContext context = conn.getContext();
 
         this.execHandler.finalizeContext(context);
         
+        // TODO - replace with super.closed(conn); ?
         if (this.eventListener != null) {
             this.eventListener.connectionClosed(conn);
         }

Modified: httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpClientHandler.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpClientHandler.java?rev=612997&r1=612996&r2=612997&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpClientHandler.java
(original)
+++ httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/protocol/ThrottlingHttpClientHandler.java
Thu Jan 17 14:42:36 2008
@@ -126,11 +126,13 @@
         requestReady(conn);        
     }
 
-    public void closed(final NHttpClientConnection conn) {
+    @Override
+	public void closed(final NHttpClientConnection conn) {
         HttpContext context = conn.getContext();
 
         this.execHandler.finalizeContext(context);
         
+        // TODO - replace with super.closed(conn); ?
         if (this.eventListener != null) {
             this.eventListener.connectionClosed(conn);
         }

Modified: httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/ExpandableBuffer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/ExpandableBuffer.java?rev=612997&r1=612996&r2=612997&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/ExpandableBuffer.java
(original)
+++ httpcomponents/httpcore/trunk/module-nio/src/main/java/org/apache/http/nio/util/ExpandableBuffer.java
Thu Jan 17 14:42:36 2008
@@ -114,7 +114,8 @@
         this.mode = INPUT_MODE;
     }
 
-    public String toString() {
+    @Override
+	public String toString() {
         StringBuffer sb = new StringBuffer();
         sb.append("[mode=");
         int mode = getMode();

Modified: httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/HttpCoreNIOSSLTestBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/HttpCoreNIOSSLTestBase.java?rev=612997&r1=612996&r2=612997&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/HttpCoreNIOSSLTestBase.java
(original)
+++ httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/HttpCoreNIOSSLTestBase.java
Thu Jan 17 14:42:36 2008
@@ -1,7 +1,7 @@
 /*
- * $HeadURL:$
- * $Revision:$
- * $Date:$
+ * $HeadURL$
+ * $Revision$
+ * $Date$
  * ====================================================================
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -75,7 +75,8 @@
     protected TestHttpSSLServer server;
     protected TestHttpSSLClient client;
     
-    protected void setUp() throws Exception {
+    @Override
+	protected void setUp() throws Exception {
         HttpParams serverParams = new BasicHttpParams();
         serverParams
             .setIntParameter(CoreConnectionPNames.SO_TIMEOUT, 5000)
@@ -98,7 +99,8 @@
         this.client = new TestHttpSSLClient(clientParams);
     }
 
-    protected void tearDown() throws Exception {
+    @Override
+	protected void tearDown() throws Exception {
         this.server.shutdown();
         this.client.shutdown();
     }

Modified: httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/HttpCoreNIOTestBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/HttpCoreNIOTestBase.java?rev=612997&r1=612996&r2=612997&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/HttpCoreNIOTestBase.java
(original)
+++ httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/HttpCoreNIOTestBase.java
Thu Jan 17 14:42:36 2008
@@ -74,7 +74,8 @@
     protected TestHttpServer server;
     protected TestHttpClient client;
     
-    protected void setUp() throws Exception {
+    @Override
+	protected void setUp() throws Exception {
         HttpParams serverParams = new BasicHttpParams();
         serverParams
             .setIntParameter(CoreConnectionPNames.SO_TIMEOUT, 5000)
@@ -97,7 +98,8 @@
         this.client = new TestHttpClient(clientParams);
     }
 
-    protected void tearDown() throws Exception {
+    @Override
+	protected void tearDown() throws Exception {
         this.server.shutdown();
         this.client.shutdown();
     }

Modified: httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/impl/nio/reactor/TestBaseIOReactorSSL.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/impl/nio/reactor/TestBaseIOReactorSSL.java?rev=612997&r1=612996&r2=612997&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/impl/nio/reactor/TestBaseIOReactorSSL.java
(original)
+++ httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/impl/nio/reactor/TestBaseIOReactorSSL.java
Thu Jan 17 14:42:36 2008
@@ -73,7 +73,8 @@
 
     private TestHttpSSLServer server;
 
-    protected void setUp() throws Exception {
+    @Override
+	protected void setUp() throws Exception {
         HttpParams serverParams = new BasicHttpParams();
         serverParams
             .setIntParameter(CoreConnectionPNames.SO_TIMEOUT, 5000)
@@ -85,7 +86,8 @@
         this.server = new TestHttpSSLServer(serverParams);
     }
 
-    protected void tearDown() throws Exception {
+    @Override
+	protected void tearDown() throws Exception {
         this.server.shutdown();
     }
 

Modified: httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactors.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactors.java?rev=612997&r1=612996&r2=612997&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactors.java
(original)
+++ httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactors.java
Thu Jan 17 14:42:36 2008
@@ -127,7 +127,8 @@
      
         EventListener serverEventListener = new SimpleEventListener() {
 
-            public void connectionClosed(NHttpConnection conn) {
+            @Override
+			public void connectionClosed(NHttpConnection conn) {
                 closedServerConns.decrement();
                 super.connectionClosed(conn);
             }
@@ -141,7 +142,8 @@
         
         EventListener clientEventListener = new SimpleEventListener() {
 
-            public void connectionClosed(NHttpConnection conn) {
+            @Override
+			public void connectionClosed(NHttpConnection conn) {
                 closedClientConns.decrement();
                 super.connectionClosed(conn);
             }

Modified: httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactorsSSL.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactorsSSL.java?rev=612997&r1=612996&r2=612997&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactorsSSL.java
(original)
+++ httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/impl/nio/reactor/TestDefaultIOReactorsSSL.java
Thu Jan 17 14:42:36 2008
@@ -137,7 +137,8 @@
      
         EventListener serverEventListener = new SimpleEventListener() {
 
-            public void connectionClosed(NHttpConnection conn) {
+            @Override
+			public void connectionClosed(NHttpConnection conn) {
                 closedServerConns.decrement();
                 super.connectionClosed(conn);
             }
@@ -151,7 +152,8 @@
         
         EventListener clientEventListener = new SimpleEventListener() {
 
-            public void connectionClosed(NHttpConnection conn) {
+            @Override
+			public void connectionClosed(NHttpConnection conn) {
                 closedClientConns.decrement();
                 super.connectionClosed(conn);
             }

Modified: httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/mockup/MockupEncoder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/mockup/MockupEncoder.java?rev=612997&r1=612996&r2=612997&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/mockup/MockupEncoder.java
(original)
+++ httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/mockup/MockupEncoder.java
Thu Jan 17 14:42:36 2008
@@ -41,6 +41,7 @@
 
 public class MockupEncoder extends AbstractContentEncoder {
     
+	// TODO? remove this field and the complete() and isCompleted() methods
     private boolean completed;
     
     public MockupEncoder(
@@ -50,11 +51,13 @@
         super(channel, buffer, metrics);
     }
 
-    public boolean isCompleted() {
+    @Override
+	public boolean isCompleted() {
         return this.completed;
     }
     
-    public void complete() throws IOException {
+    @Override
+	public void complete() throws IOException {
         this.completed = true;
     }
     

Modified: httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/mockup/TestHttpClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/mockup/TestHttpClient.java?rev=612997&r1=612996&r2=612997&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/mockup/TestHttpClient.java
(original)
+++ httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/mockup/TestHttpClient.java
Thu Jan 17 14:42:36 2008
@@ -117,7 +117,8 @@
             this.clientHandler = clientHandler;
         }
         
-        public void run() {
+        @Override
+		public void run() {
             try {
                 execute(this.clientHandler);
             } catch (IOException ex) {

Modified: httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/mockup/TestHttpSSLClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/mockup/TestHttpSSLClient.java?rev=612997&r1=612996&r2=612997&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/mockup/TestHttpSSLClient.java
(original)
+++ httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/mockup/TestHttpSSLClient.java
Thu Jan 17 14:42:36 2008
@@ -114,7 +114,8 @@
             this.clientHandler = clientHandler;
         }
         
-        public void run() {
+        @Override
+		public void run() {
             try {
                 execute(this.clientHandler);
             } catch (IOException ex) {

Modified: httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/mockup/TestHttpSSLServer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/mockup/TestHttpSSLServer.java?rev=612997&r1=612996&r2=612997&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/mockup/TestHttpSSLServer.java
(original)
+++ httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/mockup/TestHttpSSLServer.java
Thu Jan 17 14:42:36 2008
@@ -121,7 +121,8 @@
             this.serviceHandler = serviceHandler;
         }
         
-        public void run() {
+        @Override
+		public void run() {
             try {
                 execute(this.serviceHandler);
             } catch (IOException ex) {

Modified: httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/mockup/TestHttpServer.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/mockup/TestHttpServer.java?rev=612997&r1=612996&r2=612997&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/mockup/TestHttpServer.java
(original)
+++ httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/mockup/TestHttpServer.java
Thu Jan 17 14:42:36 2008
@@ -129,7 +129,8 @@
             this.serviceHandler = serviceHandler;
         }
         
-        public void run() {
+        @Override
+		public void run() {
             try {
                 execute(this.serviceHandler);
             } catch (IOException ex) {

Modified: httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/protocol/TestNIOHttp.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/protocol/TestNIOHttp.java?rev=612997&r1=612996&r2=612997&view=diff
==============================================================================
--- httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/protocol/TestNIOHttp.java
(original)
+++ httpcomponents/httpcore/trunk/module-nio/src/test/java/org/apache/http/nio/protocol/TestNIOHttp.java
Thu Jan 17 14:42:36 2008
@@ -116,7 +116,8 @@
     private TestHttpServer server;
     private TestHttpClient client;
     
-    protected void setUp() throws Exception {
+    @Override
+	protected void setUp() throws Exception {
         HttpParams serverParams = new BasicHttpParams();
         serverParams
             .setIntParameter(CoreConnectionPNames.SO_TIMEOUT, 5000)
@@ -139,7 +140,8 @@
         this.client = new TestHttpClient(clientParams);
     }
 
-    protected void tearDown() throws Exception {
+    @Override
+	protected void tearDown() throws Exception {
         this.server.shutdown();
         this.client.shutdown();
     }



Mime
View raw message