Usage of new API, cleanups (reduced)

src/org/adblockplus/ChunkedOutputStream.java

Index: src/org/adblockplus/ChunkedOutputStream.java
diff --git a/src/org/adblockplus/ChunkedOutputStream.java b/src/org/adblockplus/ChunkedOutputStream.java
index f4f26d120ef5c1ca6ba9230fb3f63e868358daf6..c841ce13d5048ea9bdadd72482a344196bfaa16e 100644
--- a/src/org/adblockplus/ChunkedOutputStream.java
+++ b/src/org/adblockplus/ChunkedOutputStream.java
@@ -28,12 +28,12 @@ import java.io.OutputStream;
 public class ChunkedOutputStream extends FilterOutputStream
 {
   private static final int MAX_CHUNK_SIZE = 2048;
+  private static final byte[] CRLF = { '\r', '\n' };
+  private static final byte[] FINAL_CHUNK = new byte[] { '0', '\r', '\n', '\r', '\n' };

[Felix Dahlke, 2014/04/28 07:29:01]

Space after { and before } is optional in the Java conventions, so please don't
change it here.

[René Jeschke, 2014/04/28 08:34:32]

Done.

 
-  private static final byte[] CRLF = {'\r', '\n'};
-  private static final byte[] FINAL_CHUNK = new byte[] {'0', '\r', '\n', '\r', '\n'};
   private boolean wroteFinalChunk = false;
 
-  public ChunkedOutputStream(OutputStream out)
+  public ChunkedOutputStream(final OutputStream out)
   {
     super(out);
   }
@@ -47,13 +47,13 @@ public class ChunkedOutputStream extends FilterOutputStream
   }
 
   @Override
-  public void write(byte[] buffer, int offset, int length) throws IOException
+  public void write(final byte[] buffer, final int offset, final int length) throws IOException
   {
     writeChunk(buffer, offset, length);
   }
 
   @Override
-  public void write(byte[] buffer) throws IOException
+  public void write(final byte[] buffer) throws IOException
   {
     int offset = 0;
     int remain = buffer.length;
@@ -69,7 +69,7 @@ public class ChunkedOutputStream extends FilterOutputStream
   }
 
   @Override
-  public void write(int oneByte) throws IOException
+  public void write(final int oneByte) throws IOException
   {
     throw new UnsupportedOperationException("Not implemented");
   }
@@ -81,7 +81,7 @@ public class ChunkedOutputStream extends FilterOutputStream
     wroteFinalChunk = true;
   }
 
-  private void writeChunk(byte buffer[], int offset, int length) throws IOException
+  private void writeChunk(final byte buffer[], final int offset, final int length) throws IOException
   {
     // Zero sized buffers are ok on slow connections but not in our case - zero
     // chunk is used to indicate the end of transfer.
@@ -98,7 +98,7 @@ public class ChunkedOutputStream extends FilterOutputStream
     }
   }
 
-  private void writeHex(int i) throws IOException
+  private void writeHex(final int i) throws IOException
   {
     out.write(Integer.toHexString(i).getBytes());
     out.write(CRLF);