Code cleanup and formatting. Migrated to java 1.8.

[svjatoslav_commons.git] / src / main / java / eu / svjatoslav / commons / data / BitInputStream.java

diff --git a/src/main/java/eu/svjatoslav/commons/data/BitInputStream.java b/src/main/java/eu/svjatoslav/commons/data/BitInputStream.java
index 3ecff98..a6ac691 100755 (executable)
--- a/src/main/java/eu/svjatoslav/commons/data/BitInputStream.java
+++ b/src/main/java/eu/svjatoslav/commons/data/BitInputStream.java
@@ -1,10 +1,10 @@
 /*
  * Svjatoslav Commons - shared library of common functionality.
- * Copyright (C) 2012, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
- * 
+ * Copyright ©2012-2014, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
+ *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public License
- * as published by the Free Software Foundation.
+ * modify it under the terms of version 3 of the GNU Lesser General Public License
+ * or later as published by the Free Software Foundation.
  */
 
 package eu.svjatoslav.commons.data;
@@ -18,47 +18,37 @@ import java.io.InputStream;
 
 public class BitInputStream {
 
-       int currentByte;
-       int currentBytePointer = -1;
+    private final InputStream inputStream;
+    private int currentByte;
+    private int currentBytePointer = -1;
 
-       InputStream inputStream;
+    public BitInputStream(final InputStream inputStream) {
+        this.inputStream = inputStream;
+    }
 
-       public BitInputStream(final InputStream inputStream) {
-               this.inputStream = inputStream;
-       }
+    public int readBits(final int bitCount) throws IOException {
 
-       public int readBits(final int bitCount) throws IOException {
+        int readableByte = 0;
+        for (int i = 0; i < bitCount; i++) {
 
-               int readableByte = 0;
-               for (int i = 0; i < bitCount; i++) {
+            readableByte = readableByte << 1;
 
-                       readableByte = readableByte << 1;
+            if (currentBytePointer == -1) {
+                currentBytePointer = 7;
+                currentByte = inputStream.read();
+            }
 
-                       if (currentBytePointer == -1) {
-                               currentBytePointer = 7;
-                               currentByte = inputStream.read();
-                       }
+            int mask = 1;
+            mask = mask << currentBytePointer;
 
-                       int mask = 1;
-                       mask = mask << currentBytePointer;
+            final int currentBit = currentByte & mask;
 
-                       final int currentBit = currentByte & mask;
+            if (currentBit != 0)
+                readableByte = readableByte | 1;
 
-                       if (currentBit != 0) {
-                               readableByte = readableByte | 1;
-                       }
-
-                       currentBytePointer--;
-               }
-               return readableByte;
-       }
-
-       public int readIntegerCompressed8() throws IOException {
-               if (readBits(1) == 0) {
-                       return readBits(8);
-               } else {
-                       return readBits(32);
-               }
-       }
+            currentBytePointer--;
+        }
+        return readableByte;
+    }
 
 }