Bugzilla #44412:

Improvements after Vincent's feedback:
Removal of the somewhat ugly Reference.
getBreakBefore() reduced to private visibility.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/fop-0_95@669478 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java b/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
index 533da5cfab830b1ebb906a9e35fc3339e2579b9c..bcf1a167c2fda4d3ff0fa8d4994b6630c69e85e6 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
@@ -21,7 +21,6 @@ package org.apache.fop.layoutmgr;
 
 import java.awt.Point;
 import java.awt.geom.Rectangle2D;
-import java.lang.ref.WeakReference;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
@@ -257,7 +256,6 @@ public class BlockContainerLayoutManager extends BlockStackingLayoutManager
             breakBeforeServed = true;
             if (!context.suppressBreakBefore()) {
                 if (addKnuthElementsForBreakBefore(returnList, context)) {
-                    this.childLMForBreakSkip = new WeakReference(getChildLM());
                     return returnList;
                 }
             }
@@ -283,7 +281,7 @@ public class BlockContainerLayoutManager extends BlockStackingLayoutManager
                 childLC.setStackLimitBP(MinOptMax.subtract(context.getStackLimitBP(), stackLimit));
                 childLC.setRefIPD(relDims.ipd);
                 childLC.setWritingMode(getBlockContainerFO().getWritingMode());
-                if (this.childLMForBreakSkip != null && curLM == this.childLMForBreakSkip.get()) {
+                if (curLM == this.childLMs.get(0)) {
                     childLC.setFlags(LayoutContext.SUPPRESS_BREAK_BEFORE);
                     //Handled already by the parent (break collapsing, see above)
                 }

diff --git a/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java b/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
index 27a19621ede02b7c434bad823a1d5eeb8d23f3ec..feee47ecaa2ccfaec1f8b8ef06ca63dfb14957e1 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
@@ -19,8 +19,6 @@
 
 package org.apache.fop.layoutmgr;
 
-import java.lang.ref.Reference;
-import java.lang.ref.WeakReference;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -70,11 +68,6 @@ public abstract class BlockStackingLayoutManager extends AbstractLayoutManager
     protected LinkedList storedList = null;
     /** Indicates whether break before has been served or not */
     protected boolean breakBeforeServed = false;
-    /**
-     * Holds a weak reference on the first layout manager for optionally skipping
-     * a break-before that has already been handled by the parent.
-     */
-    protected Reference childLMForBreakSkip;
     /** Indicates whether the first visible mark has been returned by this LM, yet */
     protected boolean firstVisibleMarkServed = false;
     /** Reference IPD available */
@@ -258,7 +251,6 @@ public abstract class BlockStackingLayoutManager extends AbstractLayoutManager
             breakBeforeServed = true;
             if (!context.suppressBreakBefore()) {
                 if (addKnuthElementsForBreakBefore(returnList, context)) {
-                    this.childLMForBreakSkip = new WeakReference(getChildLM());
                     return returnList;
                 }
             }
@@ -293,7 +285,7 @@ public abstract class BlockStackingLayoutManager extends AbstractLayoutManager
                 childLC.setStackLimitBP(context.getStackLimitBP());
                 childLC.setRefIPD(referenceIPD);
             }
-            if (this.childLMForBreakSkip != null && curLM == this.childLMForBreakSkip.get()) {
+            if (curLM == this.childLMs.get(0)) {
                 childLC.setFlags(LayoutContext.SUPPRESS_BREAK_BEFORE);
                 //Handled already by the parent (break collapsing, see above)
             }
@@ -959,7 +951,7 @@ public abstract class BlockStackingLayoutManager extends AbstractLayoutManager
      */
     protected boolean addKnuthElementsForBreakBefore(LinkedList returnList, 
             LayoutContext context) {
-        int breakBefore = getBreakBefore(true);
+        int breakBefore = getBreakBefore();
         if (breakBefore == EN_PAGE
                 || breakBefore == EN_COLUMN 
                 || breakBefore == EN_EVEN_PAGE 
@@ -975,35 +967,25 @@ public abstract class BlockStackingLayoutManager extends AbstractLayoutManager
 
     /**
      * Returns the break-before value of the current formatting object.
-     * @param mergedWithChildren true if any break-before on first children should be checked, too
      * @return the break-before value (Constants.EN_*)
      */
-    protected int getBreakBefore(boolean mergedWithChildren) {
-        int breakBefore = getBreakBefore();
-        if (mergedWithChildren /* uncomment to only partially merge: && breakBefore != EN_AUTO*/) {
+    private int getBreakBefore() {
+        int breakBefore = EN_AUTO;
+        if (fobj instanceof BreakPropertySet) {
+            breakBefore = ((BreakPropertySet)fobj).getBreakBefore();
+        }
+        if (true /* uncomment to only partially merge: && breakBefore != EN_AUTO*/) {
             LayoutManager lm = getChildLM();
             //It is assumed this is only called when the first LM is active.
             if (lm instanceof BlockStackingLayoutManager) {
                 BlockStackingLayoutManager bslm = (BlockStackingLayoutManager)lm;
                 breakBefore = BreakUtil.compareBreakClasses(
-                        breakBefore, bslm.getBreakBefore(true));
+                        breakBefore, bslm.getBreakBefore());
             }
         }
         return breakBefore;
     }
     
-    /**
-     * Returns the break-before value of the current formatting object.
-     * @return the break-before value (Constants.EN_*)
-     */
-    protected int getBreakBefore() {
-        int breakBefore = EN_AUTO;
-        if (fobj instanceof BreakPropertySet) {
-            breakBefore = ((BreakPropertySet)fobj).getBreakBefore();
-        }
-        return breakBefore;
-    }
-
     /**
      * Creates Knuth elements for break-after and adds them to the return list.
      * @param returnList return list to add the additional elements to