#429 [refactor] make class JustificationInfo immutable

flyingsaucerproject · Oct 30, 2024 · 89ca3d1 · 89ca3d1
1 parent 00b4cc4
commit 89ca3d1
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 46 deletions.
diff --git a/flying-saucer-core/src/main/java/org/xhtmlrenderer/render/InlineText.java b/flying-saucer-core/src/main/java/org/xhtmlrenderer/render/InlineText.java
@@ -327,9 +327,9 @@ public float calcTotalAdjustment(JustificationInfo info) {
         for (int i = 0; i < len; i++) {
             char c = s.charAt(i);
             if (c == ' ' || c == '\u00a0' || c == '\u3000') {
-                result += info.getSpaceAdjust();
+                result += info.spaceAdjust();
             } else {
-                result += info.getNonSpaceAdjust();
+                result += info.nonSpaceAdjust();
             }
         }
 

diff --git a/flying-saucer-core/src/main/java/org/xhtmlrenderer/render/JustificationInfo.java b/flying-saucer-core/src/main/java/org/xhtmlrenderer/render/JustificationInfo.java
@@ -19,23 +19,5 @@
  */
 package org.xhtmlrenderer.render;
 
-public class JustificationInfo {
-    private float _nonSpaceAdjust;
-    private float _spaceAdjust;
-
-    public float getNonSpaceAdjust() {
-        return _nonSpaceAdjust;
-    }
-
-    public void setNonSpaceAdjust(float nonSpaceAdjust) {
-        _nonSpaceAdjust = nonSpaceAdjust;
-    }
-
-    public float getSpaceAdjust() {
-        return _spaceAdjust;
-    }
-
-    public void setSpaceAdjust(float spaceAdjust) {
-        _spaceAdjust = spaceAdjust;
-    }
+public record JustificationInfo(float nonSpaceAdjust, float spaceAdjust) {
 }
diff --git a/flying-saucer-core/src/main/java/org/xhtmlrenderer/render/LineBox.java b/flying-saucer-core/src/main/java/org/xhtmlrenderer/render/LineBox.java
@@ -44,6 +44,8 @@
 
 import static java.lang.System.lineSeparator;
 import static java.util.Collections.emptyList;
+import static org.xhtmlrenderer.css.constants.CSSName.LETTER_SPACING;
+import static org.xhtmlrenderer.css.constants.IdentValue.NORMAL;
 import static org.xhtmlrenderer.render.Box.Dump.RENDER;
 
 /**
@@ -228,31 +230,28 @@ public void justify() {
 
                 CharCounts counts = countJustifiableChars();
 
-                JustificationInfo info = new JustificationInfo();
-                if (! getParent().getStyle().isIdent(CSSName.LETTER_SPACING, IdentValue.NORMAL)) {
-                    info.setNonSpaceAdjust(0.0f);
-                    info.setSpaceAdjust((float)toAdd / counts.getSpaceCount());
-                } else {
-                    if (counts.getNonSpaceCount() > 1) {
-                        info.setNonSpaceAdjust(toAdd * JUSTIFY_NON_SPACE_SHARE / (counts.getNonSpaceCount()-1));
-                    } else {
-                        info.setNonSpaceAdjust(0.0f);
-                    }
-
-                    if (counts.getSpaceCount() > 0) {
-                        info.setSpaceAdjust(toAdd * JUSTIFY_SPACE_SHARE / counts.getSpaceCount());
-                    } else {
-                        info.setSpaceAdjust(0.0f);
-                    }
-                }
+                JustificationInfo info = !getParent().getStyle().isIdent(LETTER_SPACING, NORMAL) ?
+                        new JustificationInfo(0.0f, (float) toAdd / counts.getSpaceCount()) :
+                        justificationInfo(counts, toAdd);
 
                 adjustChildren(info);
-
                 setJustificationInfo(info);
             }
         }
     }
 
+    private static JustificationInfo justificationInfo(CharCounts counts, int toAdd) {
+        float nonSpaceAdjust = counts.getNonSpaceCount() > 1 ?
+                toAdd * JUSTIFY_NON_SPACE_SHARE / (counts.getNonSpaceCount() - 1) :
+                0.0f;
+
+        float spaceAdjust = counts.getSpaceCount() > 0 ?
+                toAdd * JUSTIFY_SPACE_SHARE / counts.getSpaceCount() :
+                0.0f;
+
+        return new JustificationInfo(nonSpaceAdjust, spaceAdjust);
+    }
+
     private void adjustChildren(JustificationInfo info) {
         float adjust = 0.0f;
         for (Box b : getChildren()) {
@@ -499,7 +498,7 @@ public void trimTrailingSpace(LayoutContext c) {
         if (text != null) {
             InlineLayoutBox iB = text.getParent();
             IdentValue whitespace = iB.getStyle().getWhitespace();
-            if (whitespace == IdentValue.NORMAL || whitespace == IdentValue.NOWRAP) {
+            if (whitespace == NORMAL || whitespace == IdentValue.NOWRAP) {
                 text.trimTrailingSpace(c);
             }
         }

diff --git a/flying-saucer-core/src/main/java/org/xhtmlrenderer/swing/Java2DOutputDevice.java b/flying-saucer-core/src/main/java/org/xhtmlrenderer/swing/Java2DOutputDevice.java
@@ -127,9 +127,9 @@ private void drawSelectedText(RenderingContext c, InlineText inlineText, InlineL
                                 i, new Point2D.Double(point.getX() + adjust, point.getY()));
                     }
                     if (ch == ' ' || ch == '\u00a0' || ch == '\u3000') {
-                        adjust += info.getSpaceAdjust();
+                        adjust += info.spaceAdjust();
                     } else {
-                        adjust += info.getNonSpaceAdjust();
+                        adjust += info.nonSpaceAdjust();
                     }
                 }
 

diff --git a/flying-saucer-core/src/main/java/org/xhtmlrenderer/swing/Java2DTextRenderer.java b/flying-saucer-core/src/main/java/org/xhtmlrenderer/swing/Java2DTextRenderer.java
@@ -136,9 +136,9 @@ private void adjustGlyphPositions(
                         i, new Point2D.Double(point.getX() + adjust, point.getY()));
             }
             if (c == ' ' || c == '\u00a0' || c == '\u3000') {
-                adjust += info.getSpaceAdjust();
+                adjust += info.spaceAdjust();
             } else {
-                adjust += info.getNonSpaceAdjust();
+                adjust += info.nonSpaceAdjust();
             }
         }
     }

diff --git a/flying-saucer-pdf/src/main/java/org/xhtmlrenderer/pdf/ITextOutputDevice.java b/flying-saucer-pdf/src/main/java/org/xhtmlrenderer/pdf/ITextOutputDevice.java
@@ -588,9 +588,9 @@ private PdfTextArray makeJustificationArray(String s, JustificationInfo info) {
             if (i != len - 1) {
                 float offset;
                 if (c == ' ' || c == '\u00a0' || c == '\u3000') {
-                    offset = info.getSpaceAdjust();
+                    offset = info.spaceAdjust();
                 } else {
-                    offset = info.getNonSpaceAdjust();
+                    offset = info.nonSpaceAdjust();
                 }
                 array.add((-offset / _dotsPerPoint) * 1000 / (_font.getSize2D() / _dotsPerPoint));
             }