[RELEASE] merging 'release/7.0.1' into 'master'

Author: amedee

BUILDING.md

@@ -2,24 +2,34 @@ To build iText 7, [Maven][1] must be installed.
 
 Running install without a profile will generate the iText 7 jars:
 ```bash
-$ mvn clean install -Dmaven.test.skip=true | tee mvn.log
+$ mvn clean install \
+    -Dmaven.test.skip=true \
+    -Dmaven.javadoc.failOnError=false \
+    | tee mvn.log
 ```
 
 To run the tests, [Ghostscript][2] and [Imagemagick][3] must be installed.
 ```bash
-$ mvn clean install -Dmaven.test.failure.ignore=false -DgsExec=$(which gs) -DcompareExec=$(which compare) | tee mvn.log
+$ mvn clean install \
+    -Dmaven.test.failure.ignore=false \
+    -DgsExec=$(which gs) \
+    -DcompareExec=$(which compare) \
+    -Dmaven.javadoc.failOnError=false \
+    | tee mvn.log
 ```
 
 You can use the supplied `Vagrantfile` to get a [Vagrant][4] VM ([Ubuntu][5] 14.04 LTS - Trusty Tahr, with [VirtualBox][6]) with all the required software installed.
 ```bash
 $ vagrant box add ubuntu/trusty64
 $ vagrant up
-$ vagrant ssh -- 'cd /vagrant ; mvn clean install -Dmaven.test.skip=true' | tee mvn.log
+$ vagrant ssh -- \
+    'cd /vagrant ; mvn clean install -Dmaven.test.skip=true -Dmaven.javadoc.failOnError=false' \
+    | tee mvn.log
 ```
 
 [1]: http://maven.apache.org/
 [2]: http://www.ghostscript.com/
 [3]: http://www.imagemagick.org/
 [4]: https://www.vagrantup.com/
 [5]: http://www.ubuntu.com/
-[6]: https://www.virtualbox.org/
+[6]: https://www.virtualbox.org/

barcodes/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.itextpdf</groupId>
         <artifactId>root</artifactId>
-        <version>7.0.0</version>
+        <version>7.0.1</version>
     </parent>
 
     <artifactId>barcodes</artifactId>

barcodes/src/main/java/com/itextpdf/barcodes/Barcode128.java

@@ -1,5 +1,4 @@
 /*
-    $Id$
 
     This file is part of the iText (R) project.
     Copyright (c) 1998-2016 iText Group NV
@@ -44,15 +43,16 @@ This file is part of the iText (R) project.
  */
 package com.itextpdf.barcodes;
 
-import com.itextpdf.kernel.PdfException;
 import com.itextpdf.io.font.FontConstants;
 import com.itextpdf.io.font.PdfEncodings;
-import com.itextpdf.kernel.geom.Rectangle;
-import com.itextpdf.kernel.font.PdfFontFactory;
-import com.itextpdf.kernel.pdf.canvas.PdfCanvas;
+import com.itextpdf.kernel.PdfException;
 import com.itextpdf.kernel.color.Color;
+import com.itextpdf.kernel.font.PdfFontFactory;
+import com.itextpdf.kernel.geom.Rectangle;
 import com.itextpdf.kernel.pdf.PdfDocument;
+import com.itextpdf.kernel.pdf.canvas.PdfCanvas;
 
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -237,8 +237,8 @@ public Barcode128(PdfDocument document) {
             barHeight = size * 3;
             textAlignment = ALIGN_CENTER;
             codeType = CODE128;
-        } catch (Exception e) {
-            throw new RuntimeException(e);
+        } catch (IOException e) {
+            throw new RuntimeException("Cannot create font", e);
         }
     }
 
@@ -294,8 +294,8 @@ public static String getHumanReadableUCCEAN(String code) {
             for (int k = 2; k < 5; ++k) {
                 if (code.length() < k)
                     break;
-                Integer subcode = Integer.parseInt(code.substring(0, k));
-                n = ais.containsKey(subcode) ? ais.get(subcode) : 0;
+                int subcode = Integer.parseInt(code.substring(0, k));
+                n = ais.containsKey(subcode) ? (int)ais.get(subcode) : 0;
                 if (n != 0) {
                     idlen = k;
                     break;
@@ -685,7 +685,7 @@ public void setCode(String code) {
                     throw new IllegalArgumentException("AI is too short");
                 }
                 int ai = Integer.parseInt(sai);
-                int len = ais.get(ai);
+                int len = (int)ais.get(ai);
                 if (len == 0) {
                     throw new IllegalArgumentException("AI not found");
                 }

barcodes/src/main/java/com/itextpdf/barcodes/Barcode1D.java

@@ -1,5 +1,4 @@
 /*
-    $Id$
 
     This file is part of the iText (R) project.
     Copyright (c) 1998-2016 iText Group NV

barcodes/src/main/java/com/itextpdf/barcodes/Barcode2D.java

@@ -1,5 +1,4 @@
 /*
-    $Id$
 
     This file is part of the iText (R) project.
     Copyright (c) 1998-2016 iText Group NV

barcodes/src/main/java/com/itextpdf/barcodes/Barcode39.java

@@ -1,5 +1,4 @@
 /*
-    $Id$
 
     This file is part of the iText (R) project.
     Copyright (c) 1998-2016 iText Group NV

barcodes/src/main/java/com/itextpdf/barcodes/BarcodeCodabar.java

@@ -1,5 +1,4 @@
 /*
-    $Id$
 
     This file is part of the iText (R) project.
     Copyright (c) 1998-2016 iText Group NV
@@ -55,7 +54,7 @@ This file is part of the iText (R) project.
 
 public class BarcodeCodabar extends Barcode1D {
 
-     /**
+    /**
      * The index chars to <CODE>BARS</CODE>.
      */
     private static final String CHARS = "0123456789-$:/.+ABCD";
@@ -120,19 +119,19 @@ public static byte[] getBarsCodabar(String text) {
         text = text.toUpperCase();
         int len = text.length();
         if (len < 2) {
-            throw new IllegalArgumentException(PdfException.CodabarMustHaveAtLeastAStartAndStopCharacter);
+            throw new IllegalArgumentException(PdfException.CodabarMustHaveAtLeastStartAndStopCharacter);
         }
         if (CHARS.indexOf(text.charAt(0)) < START_STOP_IDX || CHARS.indexOf(text.charAt(len - 1)) < START_STOP_IDX) {
             throw new IllegalArgumentException(PdfException.CodabarMustHaveOneAbcdAsStartStopCharacter);
         }
-        byte[] bars= new byte[text.length() * 8 - 1];
+        byte[] bars = new byte[text.length() * 8 - 1];
         for (int k = 0; k < len; ++k) {
             int idx = CHARS.indexOf(text.charAt(k));
             if (idx >= START_STOP_IDX && k > 0 && k < len - 1) {
-                throw new IllegalArgumentException(PdfException.CodabarStartStopCharacterAreOnlyExtremes);
+                throw new IllegalArgumentException(PdfException.InCodabarStartStopCharactersAreOnlyAllowedAtTheExtremes);
             }
             if (idx < 0) {
-                throw new IllegalArgumentException(PdfException.CodabarCharacterOneIsIllegal);
+                throw new IllegalArgumentException(PdfException.IllegalCharacterInCodabarBarcode);
             }
             System.arraycopy(BARS[idx], 0, bars, k * 8, 7);
         }

barcodes/src/main/java/com/itextpdf/barcodes/BarcodeDataMatrix.java

@@ -1,5 +1,4 @@
 /*
-    $Id$
 
     This file is part of the iText (R) project.
     Copyright (c) 1998-2016 iText Group NV

barcodes/src/main/java/com/itextpdf/barcodes/BarcodeEAN.java

@@ -1,5 +1,4 @@
 /*
-    $Id$
 
     This file is part of the iText (R) project.
     Copyright (c) 1998-2016 iText Group NV

barcodes/src/main/java/com/itextpdf/barcodes/BarcodeEANSUPP.java

@@ -1,5 +1,4 @@
 /*
-    $Id$
 
     This file is part of the iText (R) project.
     Copyright (c) 1998-2016 iText Group NV

barcodes/src/main/java/com/itextpdf/barcodes/BarcodeInter25.java

@@ -1,5 +1,4 @@
 /*
-    $Id$
 
     This file is part of the iText (R) project.
     Copyright (c) 1998-2016 iText Group NV

barcodes/src/main/java/com/itextpdf/barcodes/BarcodePDF417.java

@@ -1,5 +1,4 @@
 /*
-    $Id$
 
     This file is part of the iText (R) project.
     Copyright (c) 1998-2016 iText Group NV

barcodes/src/main/java/com/itextpdf/barcodes/BarcodePostnet.java

@@ -1,5 +1,4 @@
 /*
-    $Id$
 
     This file is part of the iText (R) project.
     Copyright (c) 1998-2016 iText Group NV

barcodes/src/main/java/com/itextpdf/barcodes/BarcodeQRCode.java

@@ -1,5 +1,4 @@
 /*
-    $Id$
 
     This file is part of the iText (R) project.
     Copyright (c) 1998-2016 iText Group NV

barcodes/src/main/java/com/itextpdf/barcodes/dmcode/DmParams.java

@@ -1,5 +1,4 @@
 /*
-    $Id$
 
     This file is part of the iText (R) project.
     Copyright (c) 1998-2016 iText Group NV

barcodes/src/main/java/com/itextpdf/barcodes/dmcode/Placement.java

@@ -1,5 +1,4 @@
 /*
-    $Id$
 
     This file is part of the iText (R) project.
     Copyright (c) 1998-2016 iText Group NV

barcodes/src/main/java/com/itextpdf/barcodes/dmcode/ReedSolomon.java

@@ -1,5 +1,4 @@
 /*
-    $Id$
 
     This file is part of the iText (R) project.
     Copyright (c) 1998-2016 iText Group NV

barcodes/src/main/java/com/itextpdf/barcodes/qrcode/BitArray.java

@@ -1,5 +1,4 @@
 /*
-    $Id$
 
     This file is part of the iText (R) project.
     Copyright (c) 1998-2016 iText Group NV

barcodes/src/main/java/com/itextpdf/barcodes/qrcode/BitMatrix.java

@@ -1,5 +1,4 @@
 /*
-    $Id$
 
     This file is part of the iText (R) project.
     Copyright (c) 1998-2016 iText Group NV

barcodes/src/main/java/com/itextpdf/barcodes/qrcode/BitVector.java

@@ -1,5 +1,4 @@
 /*
-    $Id$
 
     This file is part of the iText (R) project.
     Copyright (c) 1998-2016 iText Group NV

barcodes/src/main/java/com/itextpdf/barcodes/qrcode/BlockPair.java

@@ -1,5 +1,4 @@
 /*
-    $Id$
 
     This file is part of the iText (R) project.
     Copyright (c) 1998-2016 iText Group NV

barcodes/src/main/java/com/itextpdf/barcodes/qrcode/ByteArray.java

@@ -1,5 +1,4 @@
 /*
-    $Id$
 
     This file is part of the iText (R) project.
     Copyright (c) 1998-2016 iText Group NV

barcodes/src/main/java/com/itextpdf/barcodes/qrcode/ByteMatrix.java

@@ -1,5 +1,4 @@
 /*
-    $Id$
 
     This file is part of the iText (R) project.
     Copyright (c) 1998-2016 iText Group NV

barcodes/src/main/java/com/itextpdf/barcodes/qrcode/CharacterSetECI.java

@@ -1,5 +1,4 @@
 /*
-    $Id$
 
     This file is part of the iText (R) project.
     Copyright (c) 1998-2016 iText Group NV

barcodes/src/main/java/com/itextpdf/barcodes/qrcode/EncodeHintType.java

@@ -1,5 +1,4 @@
 /*
-    $Id$
 
     This file is part of the iText (R) project.
     Copyright (c) 1998-2016 iText Group NV
@@ -61,6 +60,11 @@ public final class EncodeHintType {
      */
     public static final EncodeHintType CHARACTER_SET = new EncodeHintType();
 
+    /**
+    * Specifies the minimal version level to use, for example in QR Codes (type Integer).
+    */
+    public static final EncodeHintType MIN_VERSION_NR = new EncodeHintType();
+
     private EncodeHintType() {
     }
 

barcodes/src/main/java/com/itextpdf/barcodes/qrcode/Encoder.java

@@ -1,5 +1,4 @@
 /*
-    $Id$
 
     This file is part of the iText (R) project.
     Copyright (c) 1998-2016 iText Group NV
@@ -104,7 +103,10 @@ public static void encode(String content, ErrorCorrectionLevel ecLevel, Map<Enco
         if (encoding == null) {
             encoding = DEFAULT_BYTE_MODE_ENCODING;
         }
-
+        int desiredMinVersion = (hints == null || hints.get(EncodeHintType.MIN_VERSION_NR) == null) ? 1 : (int) hints.get(EncodeHintType.MIN_VERSION_NR);
+        //Check if desired level is within bounds of [1,40]
+        if(desiredMinVersion<1)desiredMinVersion = 1;
+        if(desiredMinVersion>40)desiredMinVersion = 40;
         // Step 1: Choose the mode (encoding).
         Mode mode = chooseMode(content, encoding);
 
@@ -113,7 +115,7 @@ public static void encode(String content, ErrorCorrectionLevel ecLevel, Map<Enco
         appendBytes(content, mode, dataBits, encoding);
         // Step 3: Initialize QR code that can contain "dataBits".
         int numInputBytes = dataBits.sizeInBytes();
-        initQRCode(numInputBytes, ecLevel, mode, qrCode);
+        initQRCode(numInputBytes, ecLevel, desiredMinVersion, mode, qrCode);
 
         // Step 4: Build another bit vector that contains header and data.
         BitVector headerAndDataBits = new BitVector();
@@ -240,13 +242,13 @@ private static int chooseMaskPattern(BitVector bits, ErrorCorrectionLevel ecLeve
      * Initialize "qrCode" according to "numInputBytes", "ecLevel", and "mode". On success,
      * modify "qrCode".
      */
-    private static void initQRCode(int numInputBytes, ErrorCorrectionLevel ecLevel, Mode mode,
+    private static void initQRCode(int numInputBytes, ErrorCorrectionLevel ecLevel, int desiredMinVersion, Mode mode,
                                    QRCode qrCode) throws WriterException {
         qrCode.setECLevel(ecLevel);
         qrCode.setMode(mode);
 
         // In the following comments, we use numbers of Version 7-H.
-        for (int versionNum = 1; versionNum <= 40; versionNum++) {
+        for (int versionNum = desiredMinVersion; versionNum <= 40; versionNum++) {
             Version version = Version.getVersionForNumber(versionNum);
             // numBytes = 196
             int numBytes = version.getTotalCodewords();

barcodes/src/main/java/com/itextpdf/barcodes/qrcode/ErrorCorrectionLevel.java

@@ -1,5 +1,4 @@
 /*
-    $Id$
 
     This file is part of the iText (R) project.
     Copyright (c) 1998-2016 iText Group NV

barcodes/src/main/java/com/itextpdf/barcodes/qrcode/FormatInformation.java

@@ -1,5 +1,4 @@
 /*
-    $Id$
 
     This file is part of the iText (R) project.
     Copyright (c) 1998-2016 iText Group NV

barcodes/src/main/java/com/itextpdf/barcodes/qrcode/GF256.java

@@ -1,5 +1,4 @@
 /*
-    $Id$
 
     This file is part of the iText (R) project.
     Copyright (c) 1998-2016 iText Group NV

barcodes/src/main/java/com/itextpdf/barcodes/qrcode/GF256Poly.java

@@ -1,5 +1,4 @@
 /*
-    $Id$
 
     This file is part of the iText (R) project.
     Copyright (c) 1998-2016 iText Group NV

barcodes/src/main/java/com/itextpdf/barcodes/qrcode/MaskUtil.java

@@ -1,5 +1,4 @@
 /*
-    $Id$
 
     This file is part of the iText (R) project.
     Copyright (c) 1998-2016 iText Group NV

barcodes/src/main/java/com/itextpdf/barcodes/qrcode/MatrixUtil.java

@@ -1,5 +1,4 @@
 /*
-    $Id$
 
     This file is part of the iText (R) project.
     Copyright (c) 1998-2016 iText Group NV
@@ -154,7 +153,7 @@ private MatrixUtil() {
     // JAVAPORT: We shouldn't need to do this at all. The code should be rewritten to begin encoding
     // with the ByteMatrix initialized all to zero.
     public static void clearMatrix(ByteMatrix matrix) {
-        matrix.clear((byte) -1);
+        matrix.clear((byte) 0xff);
     }
 
     // Build 2D matrix of QR Code from "dataBits" with "ecLevel", "version" and "getMaskPattern". On
@@ -382,13 +381,13 @@ public static void makeVersionInfoBits(int version, BitVector bits) throws Write
     }
 
     // Check if "value" is empty.
-    private static boolean isEmpty(int value) {
-        return value == -1;
+    private static boolean isEmpty(byte value) {
+        return value == (byte)0xff;
     }
 
     // Check if "value" is valid.
-    private static boolean isValidValue(int value) {
-        return (value == -1 ||  // Empty.
+    private static boolean isValidValue(byte value) {
+        return (value == (byte)0xff ||  // Empty.
                 value == 0 ||  // Light (white).
                 value == 1);  // Dark (black).
     }

barcodes/src/main/java/com/itextpdf/barcodes/qrcode/Mode.java

@@ -1,5 +1,4 @@
 /*
-    $Id$
 
     This file is part of the iText (R) project.
     Copyright (c) 1998-2016 iText Group NV