[refactor] convert Box constants NOTHING/FLUX/CHILDREN_FLUX/DONE to e…

…num `State`
flyingsaucerproject · Oct 11, 2024 · 31c9726 · 31c9726
1 parent 85bb516
commit 31c9726
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 15 deletions.
diff --git a/flying-saucer-core/src/main/java/org/xhtmlrenderer/newtable/TableRowBox.java b/flying-saucer-core/src/main/java/org/xhtmlrenderer/newtable/TableRowBox.java
@@ -194,7 +194,7 @@ private void calcExtraSpaceBottom(LayoutContext c) {
 
     @Override
     protected void layoutChildren(LayoutContext c, int contentStart) {
-        setState(Box.CHILDREN_FLUX);
+        setState(State.CHILDREN_FLUX);
         ensureChildren(c);
 
         TableSectionBox section = getSection();
@@ -212,7 +212,7 @@ protected void layoutChildren(LayoutContext c, int contentStart) {
             }
         }
 
-        setState(Box.DONE);
+        setState(State.DONE);
     }
 
     private void alignBaselineAlignedCells(LayoutContext c) {

diff --git a/flying-saucer-core/src/main/java/org/xhtmlrenderer/render/BlockBox.java b/flying-saucer-core/src/main/java/org/xhtmlrenderer/render/BlockBox.java
@@ -863,7 +863,7 @@ public void layout(LayoutContext c, int contentStart) {
         if (! isReplaced())
             layoutChildren(c, contentStart);
         else {
-            setState(Box.DONE);
+            setState(State.DONE);
         }
         c.translate(-getTx(), -getTy());
 
@@ -966,7 +966,7 @@ public void ensureChildren(LayoutContext c) {
     }
 
     protected void layoutChildren(LayoutContext c, int contentStart) {
-        setState(Box.CHILDREN_FLUX);
+        setState(State.CHILDREN_FLUX);
         ensureChildren(c);
 
         if (getFirstLetterStyle() != null) {
@@ -992,7 +992,7 @@ protected void layoutChildren(LayoutContext c, int contentStart) {
             c.getFirstLinesTracker().removeLast();
         }
 
-        setState(Box.DONE);
+        setState(State.DONE);
     }
 
     protected void layoutInlineChildren(

diff --git a/flying-saucer-core/src/main/java/org/xhtmlrenderer/render/Box.java b/flying-saucer-core/src/main/java/org/xhtmlrenderer/render/Box.java
@@ -48,6 +48,7 @@
 import java.util.logging.Level;
 
 import static java.util.Objects.requireNonNullElseGet;
+import static org.xhtmlrenderer.render.Box.State.NOTHING;
 
 public abstract class Box implements Styleable {
     @Nullable
@@ -239,32 +240,33 @@ public List<Box> getChildren() {
         return _boxes;
     }
 
-    public static final int NOTHING = 0;
-    public static final int FLUX = 1;
-    public static final int CHILDREN_FLUX = 2;
-    public static final int DONE = 3;
+    public enum State {
+        NOTHING,
+        FLUX,
+        CHILDREN_FLUX,
+        DONE
+    }
 
-    private volatile int _state = NOTHING;
+    private volatile State _state = NOTHING;
 
     public static final int DUMP_RENDER = 2;
 
     public static final int DUMP_LAYOUT = 1;
 
-    public int getState() {
+    public State getState() {
         return _state;
     }
 
-    public void setState(int state) {
+    public void setState(State state) {
         _state = state;
     }
 
-    public static String stateToString(int state) {
+    public static String stateToString(State state) {
         return switch (state) {
             case NOTHING -> "NOTHING";
             case FLUX -> "FLUX";
             case CHILDREN_FLUX -> "CHILDREN_FLUX";
             case DONE -> "DONE";
-            default -> "unknown";
         };
     }
 

diff --git a/flying-saucer-core/src/main/java/org/xhtmlrenderer/render/InlineLayoutBox.java b/flying-saucer-core/src/main/java/org/xhtmlrenderer/render/InlineLayoutBox.java
@@ -81,7 +81,7 @@ public InlineLayoutBox(LayoutContext c, Element elem, CalculatedStyle style, int
     }
 
     private InlineLayoutBox() {
-        setState(Box.DONE);
+        setState(State.DONE);
     }
 
     public InlineLayoutBox copyOf() {