Simplified some Java code regarding Objects.requireNonNull().

pull/39/merge
Project Nayuki 6 years ago
parent c8f05d24d1
commit 1edde0571a

@ -213,7 +213,7 @@ public final class QrCode {
*/
public QrCode(int ver, Ecc ecl, byte[] dataCodewords, int mask) {
// Check arguments
Objects.requireNonNull(ecl);
errorCorrectionLevel = Objects.requireNonNull(ecl);
if (ver < MIN_VERSION || ver > MAX_VERSION || mask < -1 || mask > 7)
throw new IllegalArgumentException("Value out of range");
Objects.requireNonNull(dataCodewords);
@ -221,7 +221,6 @@ public final class QrCode {
// Initialize fields
version = ver;
size = ver * 4 + 17;
errorCorrectionLevel = ecl;
modules = new boolean[size][size]; // Entirely white grid
isFunction = new boolean[size][size];

@ -177,11 +177,10 @@ public final class QrSegment {
* @throws IllegalArgumentException if the character count is negative
*/
public QrSegment(Mode md, int numCh, BitBuffer data) {
Objects.requireNonNull(md);
mode = Objects.requireNonNull(md);
Objects.requireNonNull(data);
if (numCh < 0)
throw new IllegalArgumentException("Invalid value");
mode = md;
numChars = numCh;
this.data = data.clone(); // Make defensive copy
}

Loading…
Cancel
Save