Reduce memory garbage created by MaxiCode symbols

Author: gredler

src/main/java/uk/org/okapibarcode/backend/MaxiCode.java

@@ -936,10 +936,14 @@ protected void plotSymbol() {
         }
 
         // circles
-        double[] radii = { 10.85, 8.97, 7.10, 5.22, 3.31, 1.43 };
-        for (int i = 0; i < radii.length; i++) {
-            target.add(new Circle(35.76 * m, 35.60 * m, radii[i] * m));
-        }
+        double x = 35.76 * m;
+        double y = 35.60 * m;
+        target.add(new Circle(x, y, 10.85 * m));
+        target.add(new Circle(x, y, 8.97 * m));
+        target.add(new Circle(x, y, 7.10 * m));
+        target.add(new Circle(x, y, 5.22 * m));
+        target.add(new Circle(x, y, 3.31 * m));
+        target.add(new Circle(x, y, 1.43 * m));
     }
 
     /** {@inheritDoc} */

src/main/java/uk/org/okapibarcode/graphics/Hexagon.java

@@ -32,16 +32,26 @@ public final class Hexagon {
 
     public final double centreX;
     public final double centreY;
-    public final double[] pointX = new double[6];
-    public final double[] pointY = new double[6];
+    public final int factor;
 
     public Hexagon(double centreX, double centreY, int factor) {
         this.centreX = centreX;
         this.centreY = centreY;
-        for (int i = 0; i < 6; i++) {
-            pointX[i] = centreX + (OFFSET_X[i] * INK_SPREAD * factor);
-            pointY[i] = centreY + (OFFSET_Y[i] * INK_SPREAD * factor);
+        this.factor = factor;
+    }
+
+    public double getX(int vertex) {
+        if (vertex < 0 || vertex > 5) {
+            throw new IllegalArgumentException("Vertex must be between 0 and 5");
+        }
+        return centreX + (OFFSET_X[vertex] * INK_SPREAD * factor);
+    }
+
+    public double getY(int vertex) {
+        if (vertex < 0 || vertex > 5) {
+            throw new IllegalArgumentException("Vertex must be between 0 and 5");
         }
+        return centreY + (OFFSET_Y[vertex] * INK_SPREAD * factor);
     }
 
     /** {@inheritDoc} */
@@ -51,18 +61,18 @@ public boolean equals(Object other) {
             return false;
         }
         Hexagon h = (Hexagon) other;
-        return centreX == h.centreX && centreY == h.centreY;
+        return centreX == h.centreX && centreY == h.centreY && factor == h.factor;
     }
 
     /** {@inheritDoc} */
     @Override
     public int hashCode() {
-        return Objects.hash(centreX, centreY);
+        return Objects.hash(centreX, centreY, factor);
     }
 
     /** {@inheritDoc} */
     @Override
     public String toString() {
-        return "Hexagon[centreX=" + centreX + ", centreY=" + centreY + "]";
+        return "Hexagon[centreX=" + centreX + ", centreY=" + centreY + ", factor=" + factor + "]";
     }
 }

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

@@ -135,8 +135,8 @@ public void render(Symbol symbol) {
             Polygon polygon = new Polygon();
             for (Hexagon hexagon : symbol.getHexagons()) {
                 for (int j = 0; j < 6; j++) {
-                    polygon.addPoint((int) ((hexagon.pointX[j] * magnification) + marginX),
-                                     (int) ((hexagon.pointY[j] * magnification) + marginY));
+                    polygon.addPoint((int) ((hexagon.getX(j) * magnification) + marginX),
+                                     (int) ((hexagon.getY(j) * magnification) + marginY));
                 }
                 g2d.fill(polygon);
                 polygon.reset();

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

@@ -229,8 +229,8 @@ public void render(Symbol symbol) throws IOException {
             // Because MaxiCode size is fixed, this ignores magnification
             for (Hexagon hexagon : symbol.getHexagons()) {
                 for (int j = 0; j < 6; j++) {
-                    writer.append(hexagon.pointX[j] + marginX).append(" ")
-                          .append((height - hexagon.pointY[j]) - marginY).append(" ");
+                    writer.append(hexagon.getX(j) + marginX).append(" ")
+                          .append((height - hexagon.getY(j)) - marginY).append(" ");
                 }
                 writer.append(" TH\n");
             }

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

@@ -201,8 +201,8 @@ public void render(Symbol symbol) throws IOException {
                     } else {
                         writer.append("L ");
                     }
-                    writer.append((hexagon.pointX[j] * magnification) + marginX).append(" ")
-                          .append((hexagon.pointY[j] * magnification) + marginY).append(" ");
+                    writer.append((hexagon.getX(j) * magnification) + marginX).append(" ")
+                          .append((hexagon.getY(j) * magnification) + marginY).append(" ");
                 }
                 writer.append("Z\" />\n");
             }

src/test/java/uk/org/okapibarcode/graphics/HexagonTest.java

@@ -16,7 +16,6 @@
 
 package uk.org.okapibarcode.graphics;
 
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
 
@@ -33,7 +32,7 @@ public void testHexagon() {
         Hexagon hex1 = new Hexagon(1, 2, 1);
         assertEquals(1, hex1.centreX, 0.001);
         assertEquals(2, hex1.centreY, 0.001);
-        assertEquals("Hexagon[centreX=1.0, centreY=2.0]", hex1.toString());
+        assertEquals("Hexagon[centreX=1.0, centreY=2.0, factor=1]", hex1.toString());
 
         Hexagon hex2 = new Hexagon(1, 2, 1);
         assertEqual(hex1, hex2);
@@ -49,11 +48,13 @@ public void testHexagon() {
     private static void assertEqual(Hexagon hex1, Hexagon hex2) {
         assertEquals(hex1.centreX, hex2.centreX);
         assertEquals(hex1.centreY, hex2.centreY);
-        assertArrayEquals(hex1.pointX, hex2.pointX);
-        assertArrayEquals(hex1.pointY, hex2.pointY);
         assertEquals(hex1, hex2);
         assertEquals(hex1.hashCode(), hex2.hashCode());
         assertEquals(hex1.toString(), hex2.toString());
+        for (int i = 0; i < 6; i++) {
+            assertEquals(hex1.getX(i), hex2.getX(i));
+            assertEquals(hex1.getY(i), hex2.getY(i));
+        }
     }
 
     private static void assertNotEqual(Hexagon hex1, Hexagon hex2) {