status-im
/
QR-Code-generator
mirror of https://github.com/status-im/QR-Code-generator.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Simplified some Java code regarding Objects.requireNonNull().

This commit is contained in:
Project Nayuki 2018-08-26 02:33:36 +00:00
parent c8f05d24d1
commit 1edde0571a
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
java/io/nayuki/qrcodegen/QrCode.java
View File

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

3
java/io/nayuki/qrcodegen/QrSegment.java
View File

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