From 01f1b9de8cb57153ab0bcdccf8a1fd8d5cc8645d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillermo=20Rodr=C3=ADguez?= Date: Tue, 31 Jul 2018 09:59:47 +0200 Subject: [PATCH 1/3] Add Java6-compatible implementation of Java7 APIs. --- java/io/nayuki/qrcodegen/Base64.java | 241 ++++++++++++++++++ java/io/nayuki/qrcodegen/BitBuffer.java | 2 +- java/io/nayuki/qrcodegen/Objects.java | 7 + java/io/nayuki/qrcodegen/QrCode.java | 2 +- .../nayuki/qrcodegen/QrCodeGeneratorDemo.java | 2 +- .../qrcodegen/QrCodeGeneratorWorker.java | 2 +- java/io/nayuki/qrcodegen/QrSegment.java | 4 +- .../nayuki/qrcodegen/QrSegmentAdvanced.java | 6 +- .../io/nayuki/qrcodegen/StandardCharsets.java | 8 + 9 files changed, 265 insertions(+), 9 deletions(-) create mode 100644 java/io/nayuki/qrcodegen/Base64.java create mode 100644 java/io/nayuki/qrcodegen/Objects.java create mode 100644 java/io/nayuki/qrcodegen/StandardCharsets.java diff --git a/java/io/nayuki/qrcodegen/Base64.java b/java/io/nayuki/qrcodegen/Base64.java new file mode 100644 index 0000000..22e5806 --- /dev/null +++ b/java/io/nayuki/qrcodegen/Base64.java @@ -0,0 +1,241 @@ +// Copyright 2003-2010 Christian d'Heureuse, Inventec Informatik AG, Zurich, Switzerland +// www.source-code.biz, www.inventec.ch/chdh +// +// This module is multi-licensed and may be used under the terms +// of any of the following licenses: +// +// EPL, Eclipse Public License, V1.0 or later, http://www.eclipse.org/legal +// LGPL, GNU Lesser General Public License, V2.1 or later, http://www.gnu.org/licenses/lgpl.html +// GPL, GNU General Public License, V2 or later, http://www.gnu.org/licenses/gpl.html +// AGPL, GNU Affero General Public License V3 or later, http://www.gnu.org/licenses/agpl.html +// AL, Apache License, V2.0 or later, http://www.apache.org/licenses +// BSD, BSD License, http://www.opensource.org/licenses/bsd-license.php +// MIT, MIT License, http://www.opensource.org/licenses/MIT +// +// Please contact the author if you need another license. +// This module is provided "as is", without warranties of any kind. +// +// Project home page: www.source-code.biz/base64coder/java + +//package biz.source_code.base64Coder; + +package io.nayuki.qrcodegen; + +public class Base64 { + + static Base64 getDecoder() { + return new Base64(); + } + + byte[] decode(String s) { + return Base64Coder.decode(s); + } +} + +/** +* A Base64 encoder/decoder. +* +*

+* This class is used to encode and decode data in Base64 format as described in RFC 1521. +* +* @author +* Christian d'Heureuse, Inventec Informatik AG, Zurich, Switzerland, www.source-code.biz +*/ +/*public*/ class Base64Coder { + +// The line separator string of the operating system. +private static final String systemLineSeparator = System.getProperty("line.separator"); + +// Mapping table from 6-bit nibbles to Base64 characters. +private static final char[] map1 = new char[64]; + static { + int i=0; + for (char c='A'; c<='Z'; c++) map1[i++] = c; + for (char c='a'; c<='z'; c++) map1[i++] = c; + for (char c='0'; c<='9'; c++) map1[i++] = c; + map1[i++] = '+'; map1[i++] = '/'; } + +// Mapping table from Base64 characters to 6-bit nibbles. +private static final byte[] map2 = new byte[128]; + static { + for (int i=0; isun.misc.BASE64Encoder.encodeBuffer(byte[]). +* @param in An array containing the data bytes to be encoded. +* @return A String containing the Base64 encoded data, broken into lines. +*/ +public static String encodeLines (byte[] in) { + return encodeLines(in, 0, in.length, 76, systemLineSeparator); } + +/** +* Encodes a byte array into Base 64 format and breaks the output into lines. +* @param in An array containing the data bytes to be encoded. +* @param iOff Offset of the first byte in in to be processed. +* @param iLen Number of bytes to be processed in in, starting at iOff. +* @param lineLen Line length for the output data. Should be a multiple of 4. +* @param lineSeparator The line separator to be used to separate the output lines. +* @return A String containing the Base64 encoded data, broken into lines. +*/ +public static String encodeLines (byte[] in, int iOff, int iLen, int lineLen, String lineSeparator) { + int blockLen = (lineLen*3) / 4; + if (blockLen <= 0) throw new IllegalArgumentException(); + int lines = (iLen+blockLen-1) / blockLen; + int bufLen = ((iLen+2)/3)*4 + lines*lineSeparator.length(); + StringBuilder buf = new StringBuilder(bufLen); + int ip = 0; + while (ip < iLen) { + int l = Math.min(iLen-ip, blockLen); + buf.append(encode(in, iOff+ip, l)); + buf.append(lineSeparator); + ip += l; } + return buf.toString(); } + +/** +* Encodes a byte array into Base64 format. +* No blanks or line breaks are inserted in the output. +* @param in An array containing the data bytes to be encoded. +* @return A character array containing the Base64 encoded data. +*/ +public static char[] encode (byte[] in) { + return encode(in, 0, in.length); } + +/** +* Encodes a byte array into Base64 format. +* No blanks or line breaks are inserted in the output. +* @param in An array containing the data bytes to be encoded. +* @param iLen Number of bytes to process in in. +* @return A character array containing the Base64 encoded data. +*/ +public static char[] encode (byte[] in, int iLen) { + return encode(in, 0, iLen); } + +/** +* Encodes a byte array into Base64 format. +* No blanks or line breaks are inserted in the output. +* @param in An array containing the data bytes to be encoded. +* @param iOff Offset of the first byte in in to be processed. +* @param iLen Number of bytes to process in in, starting at iOff. +* @return A character array containing the Base64 encoded data. +*/ +public static char[] encode (byte[] in, int iOff, int iLen) { + int oDataLen = (iLen*4+2)/3; // output length without padding + int oLen = ((iLen+2)/3)*4; // output length including padding + char[] out = new char[oLen]; + int ip = iOff; + int iEnd = iOff + iLen; + int op = 0; + while (ip < iEnd) { + int i0 = in[ip++] & 0xff; + int i1 = ip < iEnd ? in[ip++] & 0xff : 0; + int i2 = ip < iEnd ? in[ip++] & 0xff : 0; + int o0 = i0 >>> 2; + int o1 = ((i0 & 3) << 4) | (i1 >>> 4); + int o2 = ((i1 & 0xf) << 2) | (i2 >>> 6); + int o3 = i2 & 0x3F; + out[op++] = map1[o0]; + out[op++] = map1[o1]; + out[op] = op < oDataLen ? map1[o2] : '='; op++; + out[op] = op < oDataLen ? map1[o3] : '='; op++; } + return out; } + +/** +* Decodes a string from Base64 format. +* No blanks or line breaks are allowed within the Base64 encoded input data. +* @param s A Base64 String to be decoded. +* @return A String containing the decoded data. +* @throws IllegalArgumentException If the input is not valid Base64 encoded data. +*/ +public static String decodeString (String s) { + return new String(decode(s)); } + +/** +* Decodes a byte array from Base64 format and ignores line separators, tabs and blanks. +* CR, LF, Tab and Space characters are ignored in the input data. +* This method is compatible with sun.misc.BASE64Decoder.decodeBuffer(String). +* @param s A Base64 String to be decoded. +* @return An array containing the decoded data bytes. +* @throws IllegalArgumentException If the input is not valid Base64 encoded data. +*/ +public static byte[] decodeLines (String s) { + char[] buf = new char[s.length()]; + int p = 0; + for (int ip = 0; ip < s.length(); ip++) { + char c = s.charAt(ip); + if (c != ' ' && c != '\r' && c != '\n' && c != '\t') + buf[p++] = c; } + return decode(buf, 0, p); } + +/** +* Decodes a byte array from Base64 format. +* No blanks or line breaks are allowed within the Base64 encoded input data. +* @param s A Base64 String to be decoded. +* @return An array containing the decoded data bytes. +* @throws IllegalArgumentException If the input is not valid Base64 encoded data. +*/ +public static byte[] decode (String s) { + return decode(s.toCharArray()); } + +/** +* Decodes a byte array from Base64 format. +* No blanks or line breaks are allowed within the Base64 encoded input data. +* @param in A character array containing the Base64 encoded data. +* @return An array containing the decoded data bytes. +* @throws IllegalArgumentException If the input is not valid Base64 encoded data. +*/ +public static byte[] decode (char[] in) { + return decode(in, 0, in.length); } + +/** +* Decodes a byte array from Base64 format. +* No blanks or line breaks are allowed within the Base64 encoded input data. +* @param in A character array containing the Base64 encoded data. +* @param iOff Offset of the first character in in to be processed. +* @param iLen Number of characters to process in in, starting at iOff. +* @return An array containing the decoded data bytes. +* @throws IllegalArgumentException If the input is not valid Base64 encoded data. +*/ +public static byte[] decode (char[] in, int iOff, int iLen) { + if (iLen%4 != 0) throw new IllegalArgumentException("Length of Base64 encoded input string is not a multiple of 4."); + while (iLen > 0 && in[iOff+iLen-1] == '=') iLen--; + int oLen = (iLen*3) / 4; + byte[] out = new byte[oLen]; + int ip = iOff; + int iEnd = iOff + iLen; + int op = 0; + while (ip < iEnd) { + int i0 = in[ip++]; + int i1 = in[ip++]; + int i2 = ip < iEnd ? in[ip++] : 'A'; + int i3 = ip < iEnd ? in[ip++] : 'A'; + if (i0 > 127 || i1 > 127 || i2 > 127 || i3 > 127) + throw new IllegalArgumentException("Illegal character in Base64 encoded data."); + int b0 = map2[i0]; + int b1 = map2[i1]; + int b2 = map2[i2]; + int b3 = map2[i3]; + if (b0 < 0 || b1 < 0 || b2 < 0 || b3 < 0) + throw new IllegalArgumentException("Illegal character in Base64 encoded data."); + int o0 = ( b0 <<2) | (b1>>>4); + int o1 = ((b1 & 0xf)<<4) | (b2>>>2); + int o2 = ((b2 & 3)<<6) | b3; + out[op++] = (byte)o0; + if (op Date: Tue, 31 Jul 2018 10:16:17 +0200 Subject: [PATCH 2/3] Replace Java7+ code constructs with Java6 equivalents. --- java/io/nayuki/qrcodegen/QrCodeGeneratorDemo.java | 7 +++++-- java/io/nayuki/qrcodegen/QrCodeGeneratorWorker.java | 8 ++++---- java/io/nayuki/qrcodegen/QrSegment.java | 2 +- java/io/nayuki/qrcodegen/QrSegmentAdvanced.java | 2 +- 4 files changed, 11 insertions(+), 8 deletions(-) diff --git a/java/io/nayuki/qrcodegen/QrCodeGeneratorDemo.java b/java/io/nayuki/qrcodegen/QrCodeGeneratorDemo.java index 2fb66ab..42ae55e 100644 --- a/java/io/nayuki/qrcodegen/QrCodeGeneratorDemo.java +++ b/java/io/nayuki/qrcodegen/QrCodeGeneratorDemo.java @@ -64,10 +64,13 @@ public final class QrCodeGeneratorDemo { ImageIO.write(img, "png", imgFile); // Write image to file String svg = qr.toSvgString(4); // Convert to SVG XML code - try (Writer out = new OutputStreamWriter( + Writer out = new OutputStreamWriter( new FileOutputStream("hello-world-QR.svg"), - StandardCharsets.UTF_8)) { + StandardCharsets.UTF_8); + try { out.write(svg); // Create/overwrite file and write SVG data + } finally { + try { out.close(); } catch (IOException e) { } } } diff --git a/java/io/nayuki/qrcodegen/QrCodeGeneratorWorker.java b/java/io/nayuki/qrcodegen/QrCodeGeneratorWorker.java index 74091e8..dd08f59 100644 --- a/java/io/nayuki/qrcodegen/QrCodeGeneratorWorker.java +++ b/java/io/nayuki/qrcodegen/QrCodeGeneratorWorker.java @@ -38,10 +38,10 @@ public final class QrCodeGeneratorWorker { public static void main(String[] args) { // Set up input stream and start loop - try (Scanner input = new Scanner(System.in, "US-ASCII")) { - input.useDelimiter("\r\n|\n|\r"); - while (processCase(input)); - } + Scanner input = new Scanner(System.in, "US-ASCII"); + input.useDelimiter("\r\n|\n|\r"); + while (processCase(input)); + input.close(); } diff --git a/java/io/nayuki/qrcodegen/QrSegment.java b/java/io/nayuki/qrcodegen/QrSegment.java index 4d2f55d..f851ff3 100644 --- a/java/io/nayuki/qrcodegen/QrSegment.java +++ b/java/io/nayuki/qrcodegen/QrSegment.java @@ -118,7 +118,7 @@ public final class QrSegment { Objects.requireNonNull(text); // Select the most efficient segment encoding automatically - List result = new ArrayList<>(); + List result = new ArrayList(); if (text.equals("")); // Leave result empty else if (NUMERIC_REGEX.matcher(text).matches()) result.add(makeNumeric(text)); diff --git a/java/io/nayuki/qrcodegen/QrSegmentAdvanced.java b/java/io/nayuki/qrcodegen/QrSegmentAdvanced.java index c7e987a..50e358f 100644 --- a/java/io/nayuki/qrcodegen/QrSegmentAdvanced.java +++ b/java/io/nayuki/qrcodegen/QrSegmentAdvanced.java @@ -174,7 +174,7 @@ public final class QrSegmentAdvanced { private static List splitIntoSegments(byte[] data, QrSegment.Mode[] charModes) { - List result = new ArrayList<>(); + List result = new ArrayList(); if (data.length == 0) return result; From 4ac3973d0e139c81fc470da66ed2fbb5646883c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guillermo=20Rodr=C3=ADguez?= Date: Wed, 1 Aug 2018 09:53:55 +0200 Subject: [PATCH 3/3] Remove unused imports rather than commenting them out. --- java/io/nayuki/qrcodegen/BitBuffer.java | 1 - java/io/nayuki/qrcodegen/QrCode.java | 1 - java/io/nayuki/qrcodegen/QrCodeGeneratorDemo.java | 1 - java/io/nayuki/qrcodegen/QrCodeGeneratorWorker.java | 1 - java/io/nayuki/qrcodegen/QrSegment.java | 2 -- java/io/nayuki/qrcodegen/QrSegmentAdvanced.java | 2 -- 6 files changed, 8 deletions(-) diff --git a/java/io/nayuki/qrcodegen/BitBuffer.java b/java/io/nayuki/qrcodegen/BitBuffer.java index 2c96aef..ec89762 100644 --- a/java/io/nayuki/qrcodegen/BitBuffer.java +++ b/java/io/nayuki/qrcodegen/BitBuffer.java @@ -24,7 +24,6 @@ package io.nayuki.qrcodegen; import java.util.BitSet; -//import java.util.Objects; /** diff --git a/java/io/nayuki/qrcodegen/QrCode.java b/java/io/nayuki/qrcodegen/QrCode.java index fbe329e..3465331 100644 --- a/java/io/nayuki/qrcodegen/QrCode.java +++ b/java/io/nayuki/qrcodegen/QrCode.java @@ -26,7 +26,6 @@ package io.nayuki.qrcodegen; import java.awt.image.BufferedImage; import java.util.Arrays; import java.util.List; -//import java.util.Objects; /** diff --git a/java/io/nayuki/qrcodegen/QrCodeGeneratorDemo.java b/java/io/nayuki/qrcodegen/QrCodeGeneratorDemo.java index 42ae55e..089d416 100644 --- a/java/io/nayuki/qrcodegen/QrCodeGeneratorDemo.java +++ b/java/io/nayuki/qrcodegen/QrCodeGeneratorDemo.java @@ -32,7 +32,6 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStreamWriter; import java.io.Writer; -//import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.List; import javax.imageio.ImageIO; diff --git a/java/io/nayuki/qrcodegen/QrCodeGeneratorWorker.java b/java/io/nayuki/qrcodegen/QrCodeGeneratorWorker.java index dd08f59..d182b74 100644 --- a/java/io/nayuki/qrcodegen/QrCodeGeneratorWorker.java +++ b/java/io/nayuki/qrcodegen/QrCodeGeneratorWorker.java @@ -28,7 +28,6 @@ package io.nayuki.qrcodegen; -//import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.List; import java.util.Scanner; diff --git a/java/io/nayuki/qrcodegen/QrSegment.java b/java/io/nayuki/qrcodegen/QrSegment.java index f851ff3..e41c780 100644 --- a/java/io/nayuki/qrcodegen/QrSegment.java +++ b/java/io/nayuki/qrcodegen/QrSegment.java @@ -23,10 +23,8 @@ package io.nayuki.qrcodegen; -//import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; -//import java.util.Objects; import java.util.regex.Pattern; diff --git a/java/io/nayuki/qrcodegen/QrSegmentAdvanced.java b/java/io/nayuki/qrcodegen/QrSegmentAdvanced.java index 50e358f..066ff6b 100644 --- a/java/io/nayuki/qrcodegen/QrSegmentAdvanced.java +++ b/java/io/nayuki/qrcodegen/QrSegmentAdvanced.java @@ -26,12 +26,10 @@ package io.nayuki.qrcodegen; import static io.nayuki.qrcodegen.QrSegment.Mode.ALPHANUMERIC; import static io.nayuki.qrcodegen.QrSegment.Mode.BYTE; import static io.nayuki.qrcodegen.QrSegment.Mode.NUMERIC; -//import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; //import java.util.Base64; import java.util.List; -//import java.util.Objects; public final class QrSegmentAdvanced {