Allow Java2DRenderer ink to be null (uses current Graphics2D color)

Author: gredler

src/main/java/uk/org/okapibarcode/output/Java2DRenderer.java

@@ -32,6 +32,7 @@
 import java.awt.geom.Rectangle2D;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 
 import uk.org.okapibarcode.backend.OkapiInternalException;
 import uk.org.okapibarcode.backend.Symbol;
@@ -82,11 +83,11 @@ public Java2DRenderer(Graphics2D g2d, double magnification, Color paper, Color i
      * @param g2d the graphics to render to
      * @param magnification the magnification factor to apply
      * @param paper the paper (background) color (may be {@code null})
-     * @param ink the ink (foreground) color
+     * @param ink the ink (foreground) color (may be {@code null})
      * @param rotation the clockwise rotation of the symbol in degrees (must be a multiple of 90)
      */
     public Java2DRenderer(Graphics2D g2d, double magnification, Color paper, Color ink, int rotation) {
-        this.g2d = g2d;
+        this.g2d = Objects.requireNonNull(g2d);
         this.magnification = magnification;
         this.paper = paper;
         this.ink = ink;
@@ -135,9 +136,12 @@ public void render(Symbol symbol) {
         if (paper != null) {
             g2d.setColor(new java.awt.Color(paper.red, paper.green, paper.blue));
             g2d.fillRect(0, 0, width, height);
+            g2d.setColor(oldColor);
         }
 
-        g2d.setColor(new java.awt.Color(ink.red, ink.green, ink.blue));
+        if (ink != null) {
+            g2d.setColor(new java.awt.Color(ink.red, ink.green, ink.blue));
+        }
 
         for (Rectangle rect : symbol.getRectangles()) {
             double x = (rect.x * magnification) + marginX;

src/main/java/uk/org/okapibarcode/output/PostScriptRenderer.java

@@ -23,6 +23,7 @@
 
 import java.io.IOException;
 import java.io.OutputStream;
+import java.util.Objects;
 
 import uk.org.okapibarcode.backend.OkapiInternalException;
 import uk.org.okapibarcode.backend.Symbol;
@@ -78,10 +79,10 @@ public PostScriptRenderer(OutputStream out, double magnification, Color paper, C
      * @param rotation the clockwise rotation of the symbol in degrees (must be a multiple of 90)
      */
     public PostScriptRenderer(OutputStream out, double magnification, Color paper, Color ink, int rotation) {
-        this.out = out;
+        this.out = Objects.requireNonNull(out);
         this.magnification = magnification;
-        this.paper = paper;
-        this.ink = ink;
+        this.paper = Objects.requireNonNull(paper);
+        this.ink = Objects.requireNonNull(ink);
         this.rotation = normalizeRotation(rotation);
     }
 

src/main/java/uk/org/okapibarcode/output/SvgRenderer.java

@@ -23,6 +23,7 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.io.StringWriter;
+import java.util.Objects;
 
 import javax.xml.parsers.DocumentBuilderFactory;
 import javax.xml.parsers.ParserConfigurationException;
@@ -98,10 +99,10 @@ public SvgRenderer(OutputStream out, double magnification, Color paper, Color in
      * @param rotation the clockwise rotation of the symbol in degrees (must be a multiple of 90)
      */
     public SvgRenderer(OutputStream out, double magnification, Color paper, Color ink, boolean xmlProlog, int rotation) {
-        this.out = out;
+        this.out = Objects.requireNonNull(out);
         this.magnification = magnification;
-        this.paper = paper;
-        this.ink = ink;
+        this.paper = Objects.requireNonNull(paper);
+        this.ink = Objects.requireNonNull(ink);
         this.xmlProlog = xmlProlog;
         this.rotation = normalizeRotation(rotation);
     }

src/test/java/uk/org/okapibarcode/output/Java2DRendererTest.java

@@ -46,7 +46,7 @@
 public class Java2DRendererTest {
 
     @Test
-    public void testPaperColor() throws Exception {
+    public void testPaperAndInkColor() throws Exception {
 
         Code128 code128 = new Code128();
         code128.setFontName(SymbolTest.DEJA_VU_SANS.getFontName());
@@ -66,22 +66,25 @@ public void testPaperColor() throws Exception {
         Graphics2D g2d = image.createGraphics();
         g2d.setPaint(new GradientPaint(0, 0, java.awt.Color.ORANGE, width, height, java.awt.Color.GREEN));
         g2d.fillRect(0, 0, width, height);
+        g2d.setColor(java.awt.Color.BLACK);
 
-        Java2DRenderer renderer = new Java2DRenderer(g2d, 4, null, Color.BLACK);
+        Java2DRenderer renderer1 = new Java2DRenderer(g2d, 4, null, Color.BLACK); // null paper -> no background drawn
+        Java2DRenderer renderer2 = new Java2DRenderer(g2d, 4, null, null); // null paper -> no background drawn, null ink -> uses g2d color
         g2d.translate(25, 25);
-        renderer.render(code128);
+        renderer1.render(code128);
         g2d.translate(300, 0);
-        renderer.render(datamatrix);
+        renderer1.render(datamatrix);
         g2d.translate(100, 0);
-        renderer.render(maxicode);
+        renderer2.render(maxicode);
 
-        Java2DRenderer renderer2 = new Java2DRenderer(g2d, 4, Color.WHITE, Color.BLACK);
+        Java2DRenderer renderer3 = new Java2DRenderer(g2d, 4, Color.WHITE, Color.BLACK);
+        Java2DRenderer renderer4 = new Java2DRenderer(g2d, 4, Color.WHITE, null); // null ink -> uses g2d color
         g2d.translate(-400, 300);
-        renderer2.render(code128);
+        renderer3.render(code128);
         g2d.translate(300, 0);
-        renderer2.render(datamatrix);
+        renderer3.render(datamatrix);
         g2d.translate(100, 0);
-        renderer2.render(maxicode);
+        renderer4.render(maxicode);
 
         String filename = "java-2d-paper-color.png";
         BufferedImage expected = ImageIO.read(getClass().getResourceAsStream(filename));