Fix that preserves the final status of the fobj member variable.

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@653144 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/src/java/org/apache/fop/layoutmgr/AbstractBaseLayoutManager.java b/src/java/org/apache/fop/layoutmgr/AbstractBaseLayoutManager.java
index 67ef4d911963f03408b6f09795e5689995e884e7..7fd289c0596f117d5ee4d897f1ee06ff9f48f91f 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/AbstractBaseLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/AbstractBaseLayoutManager.java
@@ -39,7 +39,7 @@ public abstract class AbstractBaseLayoutManager
     /** Indicator if this LM generates block areas */
     protected boolean generatesBlockArea = false;
     /** The formatting object for this LM */
-    protected FObj fobj;
+    protected final FObj fobj;
 
     /**
      * logging instance
@@ -59,7 +59,7 @@ public abstract class AbstractBaseLayoutManager
      * @param fo the formatting object for this layout manager
      */
     public AbstractBaseLayoutManager(FObj fo) {
-        fobj = fo;
+        this.fobj = fo;
         setGeneratesReferenceArea(fo.generatesReferenceAreas());
         if (getGeneratesReferenceArea()) {
             setGeneratesBlockArea(true);

diff --git a/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java b/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
index 430356bec1282ca60292f02dd075888c4782ec9e..6afb57dcaa05e8577259197705ce95736ba562e2 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/table/TableCellLayoutManager.java
@@ -83,7 +83,6 @@ public class TableCellLayoutManager extends BlockStackingLayoutManager
      */
     public TableCellLayoutManager(TableCell node, PrimaryGridUnit pgu) {
         super(node);
-        fobj = node;
         this.primaryGridUnit = pgu;
     }