Updated Java QrSegment fields from array to BitBuffer, changed methods and updated code that depended on this design.

java/io/nayuki/qrcodegen/BitBuffer.java

@@ -87,10 +87,9 @@ public final class BitBuffer implements Cloneable {
 	// Appends the data of the given segment to this bit buffer.
 	public void appendData(QrSegment seg) {
 		Objects.requireNonNull(seg);
-		for (int i = 0; i < seg.bitLength; i++, bitLength++) {  // Append bit by bit
+		BitBuffer bb = seg.data;
-			int bit = (seg.getByte(i >>> 3) >>> (7 - (i & 7))) & 1;
+		for (int i = 0; i < bb.bitLength; i++, bitLength++)  // Append bit by bit
-			data.set(bitLength, bit != 0);
+			data.set(bitLength, bb.data.get(i));
-		}
 	}
 	
 	

java/io/nayuki/qrcodegen/QrSegment.java

@@ -25,7 +25,6 @@ package io.nayuki.qrcodegen;
 
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
 import java.util.regex.Pattern;
@@ -162,11 +161,8 @@ public final class QrSegment {
 	/** The length of this segment's unencoded data, measured in characters. Always zero or positive. */
 	public final int numChars;
 	
-	/** The bits of this segment packed into a byte array in big endian. Accessed through {@link getByte(int)}. Not {@code null}. */
+	/** The data bits of this segment. Accessed through {@link getBits()}. Not {@code null}. */
-	private final byte[] data;
+	final BitBuffer data;
-	
-	/** The length of this segment's encoded data, measured in bits. Satisfies 0 ≤ {@code bitLength} ≤ {@code data.length} × 8. */
-	public final int bitLength;
 	
 	
 	/*---- Constructor ----*/
@@ -180,43 +176,24 @@ public final class QrSegment {
 	 * @throws IllegalArgumentException if the character count is negative
 	 */
 	public QrSegment(Mode md, int numCh, BitBuffer data) {
-		this(md, numCh, data.getBytes(), data.bitLength());
-	}
-	
-	
-	/**
-	 * Creates a new QR Code data segment with the specified parameters and data.
-	 * @param md the mode, which is not {@code null}
-	 * @param numCh the data length in characters, which is non-negative
-	 * @param bitLen the data length in bits, which is non-negative
-	 * @param b the bits packed into bytes, which is not {@code null}
-	 * @throws NullPointerException if the mode or array is {@code null}
-	 * @throws IllegalArgumentException if the character count or bit length are negative or invalid
-	 */
-	public QrSegment(Mode md, int numCh, byte[] b, int bitLen) {
 		Objects.requireNonNull(md);
-		Objects.requireNonNull(b);
+		Objects.requireNonNull(data);
-		if (numCh < 0 || bitLen < 0 || bitLen > b.length * 8L)
+		if (numCh < 0)
 			throw new IllegalArgumentException("Invalid value");
 		mode = md;
 		numChars = numCh;
-		data = Arrays.copyOf(b, (bitLen + 7) / 8);  // Trim to precise length and also make defensive copy
+		this.data = data.clone();  // Make defensive copy
-		bitLength = bitLen;
 	}
 	
 	
-	/*---- Method ----*/
+	/*---- Methods ----*/
 	
 	/**
-	 * Returns the data byte at the specified index.
+	 * Returns the data bits of this segment.
-	 * @param index the index to retrieve from, satisfying 0 &le; {@code index} &lt; ceil({@code bitLength} &divide; 8)
+	 * @return the data bits of this segment (not {@code null})
-	 * @return the data byte at the specified index
-	 * @throws IndexOutOfBoundsException if the index is out of bounds
 	 */
-	public byte getByte(int index) {
+	public BitBuffer getBits() {
-		if (index < 0 || index > data.length)
+		return data.clone();  // Make defensive copy
-			throw new IndexOutOfBoundsException();
-		return data[index];
 	}
 	
 	
@@ -233,7 +210,7 @@ public final class QrSegment {
 			// Fail if segment length value doesn't fit in the length field's bit-width
 			if (seg.numChars >= (1 << ccbits))
 				return -1;
-			result += 4L + ccbits + seg.bitLength;
+			result += 4L + ccbits + seg.data.bitLength();
 			if (result > Integer.MAX_VALUE)
 				return -1;
 		}