remove unneeded field fo/flow/Leader.leaderArea

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

diff --git a/src/java/org/apache/fop/fo/flow/Character.java b/src/java/org/apache/fop/fo/flow/Character.java
index 67149586b7a969dd71c44fd204c757b4e1f67641..720249dbe8c7ee47c75b6a86c02b8135bde398ce 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/Character.java
+++ b/src/java/org/apache/fop/fo/flow/Character.java
@@ -63,7 +63,6 @@ import org.apache.fop.fo.properties.CommonHyphenation;
 import org.apache.fop.fo.properties.CommonMarginInline;
 import org.apache.fop.fo.properties.CommonRelativePosition;
 import org.apache.fop.apps.FOPException;
-import org.apache.fop.area.inline.InlineArea;
 
 /**
  * This class represents the flow object 'fo:character'. Its use is defined by

diff --git a/src/java/org/apache/fop/fo/flow/ExternalGraphic.java b/src/java/org/apache/fop/fo/flow/ExternalGraphic.java
index 5fb3f8c319912b2b26e789d12e4d923728c9512b..e00bbffd9695243e23ed2347544322eec4816afd 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/ExternalGraphic.java
+++ b/src/java/org/apache/fop/fo/flow/ExternalGraphic.java
@@ -60,12 +60,10 @@ import org.apache.fop.fo.properties.DisplayAlign;
 import org.apache.fop.fo.properties.Scaling;
 import org.apache.fop.image.ImageFactory;
 import org.apache.fop.image.FopImage;
-import org.apache.fop.area.inline.InlineArea;
 import org.apache.fop.datatypes.Length;
 
 // Java
 import java.awt.geom.Rectangle2D;
-import org.apache.fop.apps.*;
 
 /**
  * External graphic formatting object.

diff --git a/src/java/org/apache/fop/fo/flow/Leader.java b/src/java/org/apache/fop/fo/flow/Leader.java
index 945b8eb1e03c6864e834049982618b7a88b640c7..be9770ea8f29210820314c44a0a56b77d66d95e9 100644 (file)
--- a/src/java/org/apache/fop/fo/flow/Leader.java
+++ b/src/java/org/apache/fop/fo/flow/Leader.java
@@ -51,7 +51,6 @@
 package org.apache.fop.fo.flow;
 
 // FOP
-import org.apache.fop.area.inline.InlineArea;
 import org.apache.fop.datatypes.ColorType;
 import org.apache.fop.datatypes.Length;
 import org.apache.fop.datatypes.PercentLength;
@@ -85,7 +84,6 @@ public class Leader extends FObjMixed {
     protected FOTreeControl fontInfo = null;
     /** FontState for this object */
     protected Font fontState;
-    public InlineArea leaderArea = null;
 
     /**
      * @param parent FONode that is the parent of this object

diff --git a/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java b/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java
index 7b5b4988c3e3d3ee0e1a61153c55efcebbe4c9f3..d1ce46a52605181ca5a3474a888eb8368e7e53ba 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java
+++ b/src/java/org/apache/fop/layoutmgr/AddLMVisitor.java
@@ -294,24 +294,16 @@ public class AddLMVisitor extends FOTreeVisitor {
      }
 
      private InlineArea getLeaderInlineArea(Leader node) {
-         if (node.leaderArea == null) {
-             createLeaderArea(node);
-         }
-         return node.leaderArea;
-     }
-
-     protected void createLeaderArea(Leader node) {
          node.setup();
+         InlineArea leaderArea = null;
 
          if (node.getLeaderPattern() == LeaderPattern.RULE) {
              org.apache.fop.area.inline.Leader leader = new org.apache.fop.area.inline.Leader();
-
              leader.setRuleStyle(node.getRuleStyle());
              leader.setRuleThickness(node.getRuleThickness());
-
-             node.leaderArea = leader;
+             leaderArea = leader;
          } else if (node.getLeaderPattern() == LeaderPattern.SPACE) {
-             node.leaderArea = new Space();
+             leaderArea = new Space();
          } else if (node.getLeaderPattern() == LeaderPattern.DOTS) {
              Word w = new Word();
              char dot = '.'; // userAgent.getLeaderDotCharacter();
@@ -337,11 +329,11 @@ public class AddLMVisitor extends FOTreeVisitor {
              }
              fa.setHeight(node.getFontState().getAscender());
 
-             node.leaderArea = fa;
+             leaderArea = fa;
          } else if (node.getLeaderPattern() == LeaderPattern.USECONTENT) {
              if (node.getChildren() == null) {
                  node.getLogger().error("Leader use-content with no content");
-                 return;
+                 return null;
              }
              InlineStackingLayoutManager lm;
              lm = new InlineStackingLayoutManager();
@@ -369,8 +361,9 @@ public class AddLMVisitor extends FOTreeVisitor {
              if (spacer != null) {
                  fa.addChild(spacer);
              }
-             node.leaderArea = fa;
+             leaderArea = fa;
          }
+         return leaderArea;
      }
 
      public void serveVisitor(RetrieveMarker node) {