Add default colors for 1D barcode images

Feature added to mitigate potential NPE if null is passed to createAwtImage().

Refactored tests to use new ColorConstants class.

Author: JonPReilly

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

@@ -713,8 +713,8 @@ public void setCode(String code) {
      */
     @Override
     public java.awt.Image createAwtImage(java.awt.Color foreground, java.awt.Color background) {
-        int f = foreground.getRGB();
-        int g = background.getRGB();
+        int f = (foreground == null) ? DEFAULT_BAR_FOREGROUND_COLOR.getRGB() : foreground.getRGB();
+        int g = (background == null) ? DEFAULT_BAR_BACKGROUND_COLOR.getRGB() : background.getRGB();
         java.awt.Canvas canvas = new java.awt.Canvas();
         String bCode;
         if (codeType == CODE128_RAW) {

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

@@ -502,8 +502,8 @@ public void setAltText(String altText) {
      * Creates a <CODE>java.awt.Image</CODE>. This image only
      * contains the bars without any text.
      *
-     * @param foreground the color of the bars
-     * @param background the color of the background
+     * @param foreground the color of the bars. If <CODE>null</CODE> defaults to {@link Barcode1D#DEFAULT_BAR_FOREGROUND_COLOR}
+     * @param background the color of the background. If <CODE>null</CODE> defaults to {@link Barcode1D#DEFAULT_BAR_BACKGROUND_COLOR}
      * @return the image
      */
     public abstract java.awt.Image createAwtImage(java.awt.Color foreground, java.awt.Color background);

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

@@ -384,8 +384,8 @@ public Rectangle placeBarcode(PdfCanvas canvas, Color barColor, Color textColor)
      */
     @Override
     public Image createAwtImage(java.awt.Color foreground, java.awt.Color background) {
-        int f = foreground.getRGB();
-        int g = background.getRGB();
+        int f = (foreground == null) ? DEFAULT_BAR_FOREGROUND_COLOR.getRGB() : foreground.getRGB();
+        int g = (background == null) ? DEFAULT_BAR_BACKGROUND_COLOR.getRGB() : background.getRGB();
         java.awt.Canvas canvas = new java.awt.Canvas();
         String bCode = code;
         if (extended) {

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

@@ -313,8 +313,8 @@ public Rectangle placeBarcode(PdfCanvas canvas, Color barColor, Color textColor)
      * @return the image
      */
     public java.awt.Image createAwtImage(java.awt.Color foreground, java.awt.Color background) {
-        int f = foreground.getRGB();
-        int g = background.getRGB();
+        int f = (foreground == null) ? DEFAULT_BAR_FOREGROUND_COLOR.getRGB() : foreground.getRGB();
+        int g = (background == null) ? DEFAULT_BAR_BACKGROUND_COLOR.getRGB() : background.getRGB();
         java.awt.Canvas canvas = new java.awt.Canvas();
 
         byte[] bars = getBarsCodabar(generateChecksum ? calculateChecksum(code) : code);

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

@@ -731,8 +731,8 @@ public Rectangle placeBarcode(PdfCanvas canvas, Color barColor, Color textColor)
      */
     @Override
     public Image createAwtImage(java.awt.Color foreground, java.awt.Color background) {
-        int f = foreground.getRGB();
-        int g = background.getRGB();
+        int f = (foreground == null) ? DEFAULT_BAR_FOREGROUND_COLOR.getRGB() : foreground.getRGB();
+        int g = (background == null) ? DEFAULT_BAR_BACKGROUND_COLOR.getRGB() : background.getRGB();
         java.awt.Canvas canvas = new java.awt.Canvas();
 
         int width;

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

@@ -331,8 +331,8 @@ public Rectangle placeBarcode(PdfCanvas canvas, Color barColor, Color textColor)
      */
     @Override
     public Image createAwtImage(java.awt.Color foreground, java.awt.Color background) {
-        int f = foreground.getRGB();
-        int g = background.getRGB();
+        int f = (foreground == null) ? DEFAULT_BAR_FOREGROUND_COLOR.getRGB() : foreground.getRGB();
+        int g = (background == null) ? DEFAULT_BAR_BACKGROUND_COLOR.getRGB() : background.getRGB();
         java.awt.Canvas canvas = new java.awt.Canvas();
         String bCode = keepNumbers(code);
         if (generateChecksum) {

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

@@ -260,20 +260,8 @@ public Rectangle placeBarcode(PdfCanvas canvas, Color barColor, Color textColor)
      */
     @Override
     public Image createAwtImage(java.awt.Color foreground, java.awt.Color background) {
-        int foregroundColor;
-        int backgroundColor;
-        if (foreground == null) {
-            foregroundColor = DEFAULT_BAR_FOREGROUND_COLOR.getRGB();
-        } else {
-            foregroundColor = foreground.getRGB();
-        }
-
-        if (background == null) {
-            backgroundColor = DEFAULT_BAR_BACKGROUND_COLOR.getRGB();
-        } else {
-            backgroundColor = background.getRGB();
-        }
-
+        int foregroundColor = (foreground == null) ? DEFAULT_BAR_FOREGROUND_COLOR.getRGB() : foreground.getRGB();
+        int backgroundColor = (background == null) ? DEFAULT_BAR_BACKGROUND_COLOR.getRGB() : background.getRGB();
         java.awt.Canvas canvas = new java.awt.Canvas();
         String bCode = this.code;
         if (this.generateChecksum) {

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

@@ -139,8 +139,8 @@ public Rectangle placeBarcode(PdfCanvas canvas, Color barColor, Color textColor)
 
     @Override
     public Image createAwtImage(java.awt.Color foreground, java.awt.Color background) {
-        int f = foreground.getRGB();
-        int g = background.getRGB();
+        int f = (foreground == null) ? DEFAULT_BAR_FOREGROUND_COLOR.getRGB() : foreground.getRGB();
+        int g = (background == null) ? DEFAULT_BAR_BACKGROUND_COLOR.getRGB() : background.getRGB();
         java.awt.Canvas canvas = new java.awt.Canvas();
         int barWidth = (int)x;
         if (barWidth <= 0)

barcodes/src/test/java/com/itextpdf/barcodes/BarcodeMSITest.java

@@ -43,7 +43,7 @@ This file is part of the iText (R) project.
 package com.itextpdf.barcodes;
 
 import com.itextpdf.kernel.PdfException;
-import com.itextpdf.kernel.color.Color;
+import com.itextpdf.kernel.color.ColorConstants;
 import com.itextpdf.kernel.pdf.PdfDocument;
 import com.itextpdf.kernel.pdf.PdfPage;
 import com.itextpdf.kernel.pdf.PdfReader;
@@ -82,7 +82,7 @@ public void barcode01Test() throws IOException, PdfException, InterruptedExcepti
         barcode.setCode("123456789");
         barcode.setGenerateChecksum(true);
         barcode.setTextAlignment(Barcode1D.ALIGN_LEFT);
-        barcode.placeBarcode(canvas, Color.BLACK, Color.WHITE);
+        barcode.placeBarcode(canvas, ColorConstants.BLACK, ColorConstants.WHITE);
         document.close();
         Assert.assertNull(new CompareTool().compareByContent(destinationFolder + filename, sourceFolder + "cmp_" + filename, destinationFolder, "diff01_"));
     }
@@ -98,7 +98,7 @@ public void barcode02Test() throws IOException, InterruptedException {
         Barcode1D barcode = new BarcodeMSI(document);
         barcode.setCode("9781935182610");
         barcode.setTextAlignment(Barcode1D.ALIGN_LEFT);
-        barcode.placeBarcode(canvas, Color.BLACK, Color.WHITE);
+        barcode.placeBarcode(canvas, ColorConstants.BLACK, ColorConstants.WHITE);
         document.close();
         Assert.assertNull(new CompareTool().compareByContent(destinationFolder + filename, sourceFolder + "cmp_" + filename, destinationFolder, "diff02_"));
     }