removed duplicate addMarkerMap() method, renamed addMarkers()

to addMarkersToPV().

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

diff --git a/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java b/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
index 8f62f9775747a3377ec064748def94be26f5e160..ffb1a0eb84e29eb67a7e6a68b787191aa46b6b6e 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
@@ -393,24 +393,14 @@ public abstract class AbstractLayoutManager implements LayoutManager, Constants
     }
 
     /**
-     * Add the markers when adding an area.
+     * Add the markers to the PageViewport when adding an area.
      */
-    protected void addMarkers(boolean starting, boolean isfirst, boolean islast) {
-        // add markers
+    protected void addMarkersToPV(boolean starting, boolean isfirst, boolean islast) {
         if (markers != null) {
-            addMarkerMap(markers, starting, isfirst, islast);
+            getCurrentPageViewport().addMarkers(markers, starting, isfirst, islast);
         }
     }
 
-    /**
-     * Delegate adding marker to the parent layout manager.
-     *
-     * @see org.apache.fop.layoutmgr.LayoutManager
-     */
-    public void addMarkerMap(Map marks, boolean starting, boolean isfirst, boolean islast) {
-        parentLM.addMarkerMap(marks, starting, isfirst, islast);
-    }
-
     /**
      * Delegate retrieve marker to the parent layout manager.
      *

diff --git a/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java b/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
index 423fae12ce46698c57f01cd7983b5c3430db0ec3..5a10e8539ecc39d34982168f058f9394369f48c1 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
@@ -842,8 +842,8 @@ public class BlockContainerLayoutManager extends BlockStackingLayoutManager {
         }
 
         addID(getBlockContainerFO().getId());
-        //addMarkers(true, bp1.isFirstArea(), bp1.isLastArea());
-        addMarkers(true, true, false);
+        //addMarkersToPV(true, bp1.isFirstArea(), bp1.isLastArea());
+        addMarkersToPV(true, true, false);
 
         LayoutManager childLM = null;
         LayoutManager lastLM = null;
@@ -998,7 +998,7 @@ public class BlockContainerLayoutManager extends BlockStackingLayoutManager {
 
         int bIndents = getBlockContainerFO().getCommonBorderPaddingBackground().getBPPaddingAndBorder(false);
 
-        addMarkers(false, false, true);
+        addMarkersToPV(false, false, true);
 
         flush();
 
@@ -1025,7 +1025,7 @@ public class BlockContainerLayoutManager extends BlockStackingLayoutManager {
 
         BreakPoss bp1 = (BreakPoss)parentIter.peekNext();
         addID(getBlockContainerFO().getId());
-        addMarkers(true, bp1.isFirstArea(), bp1.isLastArea());
+        addMarkersToPV(true, bp1.isFirstArea(), bp1.isLastArea());
 
         LayoutManager childLM;
         int iStartPos = 0;
@@ -1043,7 +1043,7 @@ public class BlockContainerLayoutManager extends BlockStackingLayoutManager {
         }
 
         flush();
-        addMarkers(true, bp1.isFirstArea(), bp1.isLastArea());
+        addMarkersToPV(true, bp1.isFirstArea(), bp1.isLastArea());
 
         /*
         if (!isAbsoluteOrFixed()) {

diff --git a/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java b/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java
index 05f9b7a8699ae11c4d5da1e8f2bca63fee30d689..389b31e5a9413b9ffccc2f9d790776b1fa0788df 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java
@@ -348,7 +348,7 @@ public class BlockLayoutManager extends BlockStackingLayoutManager {
 
         if (!isBogus()) {
             addID(getBlockFO().getId());
-            addMarkers(true, bp1.isFirstArea(), bp1.isLastArea());
+            addMarkersToPV(true, bp1.isFirstArea(), bp1.isLastArea());
         }
 
         try {
@@ -370,7 +370,7 @@ public class BlockLayoutManager extends BlockStackingLayoutManager {
             }
         } finally {
             if (!isBogus()) {
-                addMarkers(false, bp1.isFirstArea(), bp1.isLastArea());
+                addMarkersToPV(false, bp1.isFirstArea(), bp1.isLastArea());
             }
             flush();
 
@@ -393,8 +393,8 @@ public class BlockLayoutManager extends BlockStackingLayoutManager {
         }
 
         addID(getBlockFO().getId());
-        //addMarkers(true, bp1.isFirstArea(), bp1.isLastArea());
-        addMarkers(true, true, false);
+        //addMarkersToPV(true, bp1.isFirstArea(), bp1.isLastArea());
+        addMarkersToPV(true, true, false);
 
         LayoutManager childLM = null;
         LayoutManager lastLM = null;
@@ -534,7 +534,7 @@ public class BlockLayoutManager extends BlockStackingLayoutManager {
 
         int bIndents = getBlockFO().getCommonBorderPaddingBackground().getBPPaddingAndBorder(false);
 
-        addMarkers(false, false, true);
+        addMarkersToPV(false, false, true);
 
         flush();
 

diff --git a/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java b/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java
index 4b9159b8c51f9f52ee860ea42c79cf98bcd41324..edfa597a06ee1589aa3e04f6146c2c3e9fafae69 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java
@@ -32,7 +32,6 @@ import org.apache.fop.area.PageViewport;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.ListIterator;
-import java.util.Map;
 import java.util.ArrayList;
 import org.apache.fop.traits.MinOptMax;
 
@@ -270,11 +269,6 @@ public class ContentLayoutManager implements InlineLevelLayoutManager {
         parentLM.addUnresolvedArea(id, res);
     }
 
-    /** @see org.apache.fop.layoutmgr.LayoutManager */
-    public void addMarkerMap(Map marks, boolean starting, boolean isfirst, boolean islast) {
-        parentLM.addMarkerMap(marks, starting, isfirst, islast);
-    }
-
     /** @see org.apache.fop.layoutmgr.LayoutManager */
     public Marker retrieveMarker(String name, int pos, int boundary) {
         return parentLM.retrieveMarker(name, pos, boundary);

diff --git a/src/java/org/apache/fop/layoutmgr/LayoutManager.java b/src/java/org/apache/fop/layoutmgr/LayoutManager.java
index 0b473786b0b16f1c327e0aab57cc51d9e8a0f847..813fa809e820351f19f79bf3956cbf06c9e3a838 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/LayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/LayoutManager.java
@@ -20,7 +20,6 @@ package org.apache.fop.layoutmgr;
 
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 
 import org.apache.fop.fo.flow.Marker;
 
@@ -201,18 +200,6 @@ public interface LayoutManager {
      */
     void addUnresolvedArea(String id, Resolvable res);
 
-    /**
-     * Add the marker.
-     * A number of formatting objects may contain markers. This
-     * method is used to add those markers to the page.
-     *
-     * @param name the marker class name
-     * @param starting if the area being added is starting or ending
-     * @param isfirst if the area being added has is-first trait
-     * @param islast if the area being added has is-last trait
-     */
-    void addMarkerMap(Map marks, boolean starting, boolean isfirst, boolean islast);
-
     /**
      * Retrieve a marker.
      * This method is used when retrieve a marker.

diff --git a/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java b/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
index 2506eebea0276e88571d278e217a0e6f47337bab..1fe9c4ae0c9d09db08c6f3778156b9de9268a9c0 100644 (file)
--- a/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
+++ b/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
@@ -43,7 +43,6 @@ import org.apache.fop.fo.pagination.StaticContent;
 
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 
 /**
  * LayoutManager for a PageSequence.
@@ -323,17 +322,6 @@ public class PageSequenceLayoutManager extends AbstractLayoutManager {
         areaTreeHandler.addUnresolvedIDRef(id, curPage);
     }
 
-    /**
-     * Add the marker to the page layout manager.
-     *
-     * @see org.apache.fop.layoutmgr.LayoutManager
-     */
-    public void addMarkerMap(Map marks, boolean starting, boolean isfirst, boolean islast) {
-        //getLogger().debug("adding markers: " + marks + ":" + start);
-        // add markers to page on area tree
-        curPage.addMarkers(marks, starting, isfirst, islast);
-    }
-
     /**
      * Retrieve a marker from this layout manager.
      * If the boundary is page then it will only check the