refactor v2 code

Author: karlnicholas

src/main/java/org/hdf5javalib/hdffile/infrastructure/fractalheap/BitReader.java

@@ -0,0 +1,28 @@
+package org.hdf5javalib.hdffile.infrastructure.fractalheap;
+
+//##############################################################################
+//### HDF5 UTILITY CLASSES
+//##############################################################################
+class BitReader {
+    private final byte[] data;
+    private int bitPosition;
+
+    public BitReader(byte[] data) {
+        this.data = data;
+        this.bitPosition = 0;
+    }
+
+    public long read(int numBits) {
+        if (numBits == 0) return 0;
+        long value = 0;
+        for (int i = 0; i < numBits; i++) {
+            int currentBitPos = bitPosition++;
+            int byteIndex = currentBitPos / 8;
+            int bitIndexInByte = currentBitPos % 8;
+            if ((data[byteIndex] & (1 << bitIndexInByte)) != 0) {
+                value |= (1L << i);
+            }
+        }
+        return value;
+    }
+}

…ucture/fractalheap/grok/FractalHeap.java …rastructure/fractalheap/FractalHeap.javasrc/main/java/org/hdf5javalib/hdffile/infrastructure/fractalheap/grok/FractalHeap.java renamed to src/main/java/org/hdf5javalib/hdffile/infrastructure/fractalheap/FractalHeap.java src/main/java/org/hdf5javalib/hdffile/infrastructure/fractalheap/grok/FractalHeap.java renamed to src/main/java/org/hdf5javalib/hdffile/infrastructure/fractalheap/FractalHeap.java

@@ -0,0 +1,50 @@
+package org.hdf5javalib.hdffile.infrastructure.fractalheap;
+
+//##############################################################################
+//### HEAP ID PARSER
+//##############################################################################
+public class ParsedHeapId {
+    public final int type;
+    public final int version;
+    public final int offset;
+    public final int length;
+
+    public ParsedHeapId(byte[] rawId, FractalHeap fractalHeap) {
+        BitReader reader = new BitReader(rawId);
+        FractalHeap.FractalHeapHeader header = fractalHeap.getHeader();
+        int reserved = (int) reader.read(4);
+        this.type = (int) reader.read(2);
+        this.version = (int) reader.read(2);
+        if ( fractalHeap.getHeader().maximumHeapSize == 8 ) {
+            this.offset = (int) reader.read(8);
+        } else if ( header.maximumHeapSize == 16 ) {
+            this.offset = (int) reader.read(16);
+        } else if ( header.maximumHeapSize == 24 ) {
+            this.offset = (int) reader.read(24);
+        } else if ( header.maximumHeapSize == 32 ) {
+            this.offset = (int) reader.read(32);
+        } else if ( header.maximumHeapSize == 40 ) {
+            this.offset = (int) reader.read(40);
+        } else {
+            throw new IllegalStateException("Cannot parse heap id: header.maximumHeapSize == " +  header.maximumHeapSize);
+        }
+        long minOfMaxs = Math.min(header.maximumDirectBlockSize, header.sizeOfManagedObjects);
+        if (  minOfMaxs < (1<<8) ) {
+            this.length = (int) reader.read(8);
+        } else if ( minOfMaxs < (1<<16) ) {
+            this.length = (int) reader.read(16);
+        } else if ( minOfMaxs < (1<<24) ) {
+            this.length = (int) reader.read(24);
+        } else {
+            this.length = (int) reader.read(32);
+        }
+    }
+
+    @Override
+    public String toString() {
+        return "ParsedHeapId{" + "type=" + type + ", offset=" + offset +
+                ", length=" + length  + '}';
+    }
+
+}
+