Changed from addChild(Area) to clearer addChildArea(Area).

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

diff --git a/src/java/org/apache/fop/area/Area.java b/src/java/org/apache/fop/area/Area.java
index e8848dc7b6a1361ddcddb90952fdc1f53aa9e6e2..da00665d289661c36a2be75c5dd4c99b78983fe7 100644 (file)
--- a/src/java/org/apache/fop/area/Area.java
+++ b/src/java/org/apache/fop/area/Area.java
@@ -305,7 +305,7 @@ public class Area implements Serializable {
      *
      * @param child the child area to add
      */
-    public void addChild(Area child) {
+    public void addChildArea(Area child) {
     }
 
     /**

diff --git a/src/java/org/apache/fop/area/LineArea.java b/src/java/org/apache/fop/area/LineArea.java
index 2a089682142a32eb02a9c65265f0872ebe7ecee4..12a5fb61c72f5238ed9b32cb34797bf5dbffd5dd 100644 (file)
--- a/src/java/org/apache/fop/area/LineArea.java
+++ b/src/java/org/apache/fop/area/LineArea.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,7 +46,7 @@ public class LineArea extends Area {
      *
      * @param childArea the inline child area to add
      */
-    public void addChild(Area childArea) {
+    public void addChildArea(Area childArea) {
         if (childArea instanceof InlineArea) {
             addInlineArea((InlineArea)childArea);
         }

diff --git a/src/java/org/apache/fop/area/inline/InlineParent.java b/src/java/org/apache/fop/area/inline/InlineParent.java
index f40dda2dfdedf6bba0b332e1b3b316edcec7fcca..464c8e73d3aafba08e73b3ff9113cebb2bca26d5 100644 (file)
--- a/src/java/org/apache/fop/area/inline/InlineParent.java
+++ b/src/java/org/apache/fop/area/inline/InlineParent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -49,7 +49,7 @@ public class InlineParent extends InlineArea {
      *
      * @param childArea the child area to add
      */
-    public void addChild(Area childArea) {
+    public void addChildArea(Area childArea) {
         if (childArea instanceof InlineArea) {
             inlines.add(childArea);
             increaseIPD(((InlineArea) childArea).getAllocIPD());

diff --git a/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java b/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
index ceb8184acb303fef3288a3cffa22cc324ae88f53..9456b58e38dddfee1e1427d592f9b5a8ffe32979 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
@@ -133,7 +133,7 @@ public abstract class AbstractLayoutManager implements LayoutManager, Constants
     //     protected void flush(Area area, boolean bFinished) {
     // if (area != null) {
     //     // area.setFinished(true);
-    //     parentLM.addChild(area, bFinished); // ????
+    //     parentLM.addChildArea(area, bFinished); // ????
     //     if (bFinished) {
     // setCurrentArea(null);
     //     }
@@ -306,7 +306,7 @@ public abstract class AbstractLayoutManager implements LayoutManager, Constants
     protected void flush() {
     }
 
-    public void addChild(Area childArea) {
+    public void addChildArea(Area childArea) {
     }
 
     /**

diff --git a/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java b/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
index 2d789328ddf9903d0b5783a7f539363ca3f5ec84..36d3389430afca422229d742b5b91c6751e7504b 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
@@ -548,9 +548,9 @@ public class BlockContainerLayoutManager extends BlockStackingLayoutManager {
     /**
      * Add the child to the block container.
      *
-     * @see org.apache.fop.layoutmgr.LayoutManager#addChild(Area)
+     * @see org.apache.fop.layoutmgr.LayoutManager#addChildArea(Area)
      */
-    public void addChild(Area childArea) {
+    public void addChildArea(Area childArea) {
         if (referenceArea != null) {
             referenceArea.addBlock((Block) childArea);
         }

diff --git a/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java b/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java
index 55354fe40bc57c722c355f30baa1c22375252838..74e29f7846b10f4023431e99f82bc607180b9427 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java
@@ -396,9 +396,9 @@ public class BlockLayoutManager extends BlockStackingLayoutManager {
     }
 
     /**
-     * @see org.apache.fop.layoutmgr.LayoutManager#addChild(org.apache.fop.area.Area)
+     * @see org.apache.fop.layoutmgr.LayoutManager#addChildArea(Area)
      */
-    public void addChild(Area childArea) {
+    public void addChildArea(Area childArea) {
         if (curBlockArea != null) {
             if (childArea instanceof LineArea) {
                 curBlockArea.addLineArea((LineArea) childArea);

diff --git a/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java b/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
index 859d741d89c829b5de11a0cbc8e742c3e9bbb68a..582c5c2857460977ba6789c6262f8cf1a8abe631 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
@@ -88,7 +88,7 @@ public abstract class BlockStackingLayoutManager extends AbstractLayoutManager {
         if (sp != 0) {
             Block spacer = new Block();
             spacer.setBPD(sp);
-            parentLM.addChild(spacer);
+            parentLM.addChildArea(spacer);
         }
     }
 
@@ -122,7 +122,7 @@ public abstract class BlockStackingLayoutManager extends AbstractLayoutManager {
      * If so, add it. Otherwise initiate breaking.
      * @param childArea the area to add: will be some block-stacked Area.
      */
-    public void addChild(Area childArea) {
+    public void addChildArea(Area childArea) {
         addChildToArea(childArea, getCurrentArea());
     }
 
@@ -131,7 +131,7 @@ public abstract class BlockStackingLayoutManager extends AbstractLayoutManager {
      */
     protected void flush() {
         if (getCurrentArea() != null) {
-            parentLM.addChild(getCurrentArea());
+            parentLM.addChildArea(getCurrentArea());
         }
     }
 

diff --git a/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java b/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java
index 515196e3ff72d3b5bea809e091ced49344fb51d9..093439fbadc590510640e1d0b6995e6437da848a 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java
@@ -182,9 +182,11 @@ public class ContentLayoutManager implements InlineLevelLayoutManager {
         return holder;
     }
 
-    /** @see org.apache.fop.layoutmgr.LayoutManager */
-    public void addChild(Area childArea) {
-        holder.addChild(childArea);
+    /** 
+     * @see org.apache.fop.layoutmgr.LayoutManager#addChildArea(Area)
+     **/
+    public void addChildArea(Area childArea) {
+        holder.addChildArea(childArea);
     }
 
     /**

diff --git a/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java b/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
index a1301e283e88fccbcb00d210899afa1136b8e04c..f249941c056ad7c5a6c45084bb42cfc154310e34 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
@@ -158,9 +158,9 @@ public class FlowLayoutManager extends BlockStackingLayoutManager {
      * Add child area to a the correct container, depending on its
      * area class. A Flow can fill at most one area container of any class
      * at any one time. The actual work is done by BlockStackingLM.
-     * @param childArea child area to add
+     * @see org.apache.fop.layoutmgr.LayoutManager#addChildArea(Area)
      */
-    public void addChild(Area childArea) {
+    public void addChildArea(Area childArea) {
         addChildToArea(childArea,
                           this.currentAreas[childArea.getAreaClass()]);
     }

diff --git a/src/java/org/apache/fop/layoutmgr/InlineStackingLayoutManager.java b/src/java/org/apache/fop/layoutmgr/InlineStackingLayoutManager.java
index b3782629a40e98256a4a4e6a6dc64b39e839369c..92fd5d7d6ff259d66f2f49dfd0bf925870c65234 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/InlineStackingLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/InlineStackingLayoutManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -498,7 +498,7 @@ public class InlineStackingLayoutManager extends AbstractLayoutManager {
         }
         setTraits(bAreaCreated, !bIsLast);
         
-        parentLM.addChild(getCurrentArea());
+        parentLM.addChildArea(getCurrentArea());
         context.setFlags(LayoutContext.LAST_AREA, bIsLast);
         bAreaCreated = true;
     }
@@ -515,7 +515,7 @@ public class InlineStackingLayoutManager extends AbstractLayoutManager {
         
     }
 
-    public void addChild(Area childArea) {
+    public void addChildArea(Area childArea) {
         // Make sure childArea is inline area
         if (childArea instanceof InlineArea) {
             Area parent = getCurrentArea();
@@ -524,7 +524,7 @@ public class InlineStackingLayoutManager extends AbstractLayoutManager {
                          getContext().getLeadingSpace().resolve(false),
                          getContext().getSpaceAdjust());
             }
-            parent.addChild(childArea);
+            parent.addChildArea(childArea);
         }
     }
 
@@ -554,7 +554,7 @@ public class InlineStackingLayoutManager extends AbstractLayoutManager {
                 //getLogger().debug("Add leading space: " + iAdjust);
                 Space ls = new Space();
                 ls.setIPD(iAdjust);
-                parentArea.addChild(ls);
+                parentArea.addChildArea(ls);
             }
         }
     }

diff --git a/src/java/org/apache/fop/layoutmgr/LayoutManager.java b/src/java/org/apache/fop/layoutmgr/LayoutManager.java
index a06da78bec91203a90b4396e65ac82dc82be4ad7..93fd36df572e4db3f4509728ccd0de023abadf8b 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/LayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/LayoutManager.java
@@ -155,7 +155,7 @@ public interface LayoutManager {
      *
      * @param childArea the child area to add
      */
-    void addChild(Area childArea);
+    void addChildArea(Area childArea);
 
     /**
      * Tell the layout manager to add all the child areas implied

diff --git a/src/java/org/apache/fop/layoutmgr/LeaderLayoutManager.java b/src/java/org/apache/fop/layoutmgr/LeaderLayoutManager.java
index 667a2d59b94a683ec5ff83103d7d0475fbf73967..4cb87a41955df8e33d957f10445e9f1799d69a59 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/LeaderLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/LeaderLayoutManager.java
@@ -102,9 +102,9 @@ public class LeaderLayoutManager extends LeafNodeLayoutManager {
             }
             FilledArea fa = new FilledArea();
             fa.setUnitWidth(width);
-            fa.addChild(t);
+            fa.addChildArea(t);
             if (spacer != null) {
-                fa.addChild(spacer);
+                fa.addChildArea(spacer);
             }
             fa.setBPD(font.getAscender());
 
@@ -139,7 +139,7 @@ public class LeaderLayoutManager extends LeafNodeLayoutManager {
             }
             fa.setUnitWidth(width);
             if (spacer != null) {
-                fa.addChild(spacer);
+                fa.addChildArea(spacer);
             }
             leaderArea = fa;
         }
@@ -222,7 +222,7 @@ public class LeaderLayoutManager extends LeafNodeLayoutManager {
             clm.addAreas(contentIter, context);
             offsetArea(context);
 
-            parentLM.addChild(curArea);
+            parentLM.addChildArea(curArea);
 
             while (posIter.hasNext()) {
                 posIter.next();

diff --git a/src/java/org/apache/fop/layoutmgr/LeafNodeLayoutManager.java b/src/java/org/apache/fop/layoutmgr/LeafNodeLayoutManager.java
index e0feca999cf60f9d097463d8001de1778e942872..b81adc6861e2dc6bc824eb207d116abc19b3f59b 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/LeafNodeLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/LeafNodeLayoutManager.java
@@ -135,7 +135,7 @@ public class LeafNodeLayoutManager extends AbstractLayoutManager
      * This is a leaf-node, so this method is never called.
      * @param childArea the childArea to add
      */
-    public void addChild(Area childArea) {
+    public void addChildArea(Area childArea) {
     }
 
     /**
@@ -168,7 +168,7 @@ public class LeafNodeLayoutManager extends AbstractLayoutManager
 
         offsetArea(context);
         widthAdjustArea(context);
-        parentLM.addChild(curArea);
+        parentLM.addChildArea(curArea);
 
         while (posIter.hasNext()) {
             posIter.next();

diff --git a/src/java/org/apache/fop/layoutmgr/LineLayoutManager.java b/src/java/org/apache/fop/layoutmgr/LineLayoutManager.java
index c4a79a9821edc2f80b6487bc2065ad9bbdeec45e..e21d2e5b81f3358efe2a2fb3b235aeaca8fbac98 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/LineLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/LineLayoutManager.java
@@ -932,7 +932,7 @@ public class LineLayoutManager extends InlineStackingLayoutManager {
                 addSpace(lineArea, lc.getTrailingSpace().resolve(true),
                          lc.getSpaceAdjust());
             }
-            parentLM.addChild(lineArea);
+            parentLM.addChildArea(lineArea);
         }
         setCurrentArea(null); // ?? necessary
     }

diff --git a/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java b/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
index 3b6dbc853a855493ec605ad3a67ea70f66c80a9f..d0cc95e46ffc264378f9d52eb45c2325a7fb93c7 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
@@ -358,10 +358,9 @@ public class PageSequenceLayoutManager extends AbstractLayoutManager {
 
     /**
      * For now, only handle normal flow areas.
-     *
-     * @param childArea the child area to add
+     * @see org.apache.fop.layoutmgr.LayoutManager#addChildArea(org.apache.fop.area.Area)
      */
-    public void addChild(Area childArea) {
+    public void addChildArea(Area childArea) {
         if (childArea == null) {
             return;
         }

diff --git a/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java b/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java
index 38054c2355a68a2a275c2e087f28099f3322cab9..5effaf429dd661c536171629a131ab0c412b4458 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/StaticContentLayoutManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -112,9 +112,9 @@ public class StaticContentLayoutManager extends BlockStackingLayoutManager {
      * Add child area to a the correct container, depending on its
      * area class. A Flow can fill at most one area container of any class
      * at any one time. The actual work is done by BlockStackingLM.
-     * @param childArea child area to add
+     * @see org.apache.fop.layoutmgr.LayoutManager#addChildArea(Area)
      */
-    public void addChild(Area childArea) {
+    public void addChildArea(Area childArea) {
         region.addBlock((Block)childArea);
     }
 

diff --git a/src/java/org/apache/fop/layoutmgr/TextLayoutManager.java b/src/java/org/apache/fop/layoutmgr/TextLayoutManager.java
index 1a70afdd2f6f792a3dc19ca4d59e9e8596efad50..4d5fe4130f2e2928acd7a5dd9d19b40d78cd01b0 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/TextLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/TextLayoutManager.java
@@ -622,7 +622,7 @@ public class TextLayoutManager extends AbstractLayoutManager
         
         word = t;
         if (word != null) {
-            parentLM.addChild(word);
+            parentLM.addChildArea(word);
         }
     }
 

diff --git a/src/java/org/apache/fop/layoutmgr/list/Item.java b/src/java/org/apache/fop/layoutmgr/list/Item.java
index 0ca9e329e7cb5378ee4b8ace6778ac95bbcabddc..ef7403c545b8f0ee136180e822e07ca91704f7ea 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/list/Item.java
+++ b/src/java/org/apache/fop/layoutmgr/list/Item.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -238,7 +238,7 @@ public class Item extends BlockStackingLayoutManager {
      *
      * @param childArea the child to add to the cell
      */
-    public void addChild(Area childArea) {
+    public void addChildArea(Area childArea) {
         if (curBlockArea != null) {
             curBlockArea.addBlock((Block) childArea);
         }

diff --git a/src/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java b/src/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java
index 350676208e8eeafbd5de033a2e8ed142db451a08..48d78f8752c3a2f454c858bd21fdc67c2cb25de6 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java
@@ -255,7 +255,7 @@ public class ListBlockLayoutManager extends BlockStackingLayoutManager {
      *
      * @param childArea the child area to add
      */
-    public void addChild(Area childArea) {
+    public void addChildArea(Area childArea) {
         if (curBlockArea != null) {
             curBlockArea.addBlock((Block) childArea);
         }

diff --git a/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java b/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
index d81599e4296fd67fc603c2e680fa685f621888ce..1d203806762a9bd8bdf82fe64e74418e78d6ae0a 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
@@ -325,7 +325,7 @@ public class ListItemLayoutManager extends BlockStackingLayoutManager {
      *
      * @param childArea the child area
      */
-    public void addChild(Area childArea) {
+    public void addChildArea(Area childArea) {
         if (curBlockArea != null) {
             curBlockArea.addBlock((Block) childArea);
         }

diff --git a/src/java/org/apache/fop/layoutmgr/table/Body.java b/src/java/org/apache/fop/layoutmgr/table/Body.java
index 65ba5d966c256e7ce1a240a1c511c4f2b9561c39..dbdf10b0af72acb4fbd5599b3abafce307b8b959 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/table/Body.java
+++ b/src/java/org/apache/fop/layoutmgr/table/Body.java
@@ -238,8 +238,8 @@ public class Body extends BlockStackingLayoutManager {
      *
      * @param childArea the child area to add
      */
-    public void addChild(Area childArea) {
-        parentLM.addChild(childArea);
+    public void addChildArea(Area childArea) {
+        parentLM.addChildArea(childArea);
     }
 
     /**

diff --git a/src/java/org/apache/fop/layoutmgr/table/Caption.java b/src/java/org/apache/fop/layoutmgr/table/Caption.java
index 3f7998cc57e9d75e308ba37b7576b79586a18126..0fd99849c83616f9850223626d7ba2e4ae620d1e 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/table/Caption.java
+++ b/src/java/org/apache/fop/layoutmgr/table/Caption.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -193,7 +193,7 @@ public class Caption extends BlockStackingLayoutManager {
      *
      * @param childArea the child area to add
      */
-    public void addChild(Area childArea) {
+    public void addChildArea(Area childArea) {
         if (curBlockArea != null) {
                 curBlockArea.addBlock((Block) childArea);
         }

diff --git a/src/java/org/apache/fop/layoutmgr/table/Cell.java b/src/java/org/apache/fop/layoutmgr/table/Cell.java
index 2c66f6d39c19a727e010a10e85bde0c82662b40e..5a68aeb663999ffafd721da4ed150c048a12cb65 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/table/Cell.java
+++ b/src/java/org/apache/fop/layoutmgr/table/Cell.java
@@ -342,7 +342,7 @@ public class Cell extends BlockStackingLayoutManager {
                         block.setXOffset(dx + borderStartWidth);
                         block.setYOffset(dy);
                         TraitSetter.addCollapsingBorders(block, gu.effBorders, outer);
-                        parentLM.addChild(block);
+                        parentLM.addChildArea(block);
                         dx += gu.column.getWidth().getValue();
                     }
                     dy += lastRowHeight;
@@ -443,7 +443,7 @@ public class Cell extends BlockStackingLayoutManager {
      *
      * @param childArea the child to add to the cell
      */
-    public void addChild(Area childArea) {
+    public void addChildArea(Area childArea) {
         if (curBlockArea != null) {
             curBlockArea.addBlock((Block) childArea);
         }

diff --git a/src/java/org/apache/fop/layoutmgr/table/Row.java b/src/java/org/apache/fop/layoutmgr/table/Row.java
index bd03c5e3b9545993dc5f6af1cafd9ceb6b4ed6c8..c3d06d435bc13fae80269cd817546bc66b6fe091 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/table/Row.java
+++ b/src/java/org/apache/fop/layoutmgr/table/Row.java
@@ -531,7 +531,7 @@ public class Row extends BlockStackingLayoutManager {
                 rowArea.setIPD(referenceIPD);
                 rowArea.setXOffset(xoffset);
                 rowArea.setYOffset(yoffset);
-                parentLM.addChild(rowArea);
+                parentLM.addChildArea(rowArea);
             }
 
             for (Iterator iter = lfp.cellBreaks.iterator(); iter.hasNext();) {
@@ -586,8 +586,8 @@ public class Row extends BlockStackingLayoutManager {
      *
      * @param childArea the child area
      */
-    public void addChild(Area childArea) {
-        parentLM.addChild(childArea);
+    public void addChildArea(Area childArea) {
+        parentLM.addChildArea(childArea);
     }
 
     /**

diff --git a/src/java/org/apache/fop/layoutmgr/table/TableAndCaptionLayoutManager.java b/src/java/org/apache/fop/layoutmgr/table/TableAndCaptionLayoutManager.java
index ff3d15122f2e8f698e5d4b0ba09f04c33c95f5e9..638ee0681a09bb2709cd4933a330b04577b44d9c 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/table/TableAndCaptionLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/table/TableAndCaptionLayoutManager.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2005 The Apache Software Foundation.
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -194,7 +194,7 @@ public class TableAndCaptionLayoutManager extends BlockStackingLayoutManager {
      *
      * @param childArea the area to add
      */
-    public void addChild(Area childArea) {
+    public void addChildArea(Area childArea) {
         if (curBlockArea != null) {
             curBlockArea.addBlock((Block) childArea);
         }

diff --git a/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java b/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
index 37fe8cd782f1b52e8912ba8fc8d2b5f9c9dac4b9..653c953c258a8d1909a67067925f7b82a8b889ef 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
@@ -457,7 +457,7 @@ public class TableLayoutManager extends BlockStackingLayoutManager {
      *
      * @param childArea the child area to add
      */
-    public void addChild(Area childArea) {
+    public void addChildArea(Area childArea) {
         if (curBlockArea != null) {
             curBlockArea.addBlock((Block) childArea);
         }