You are viewing a plain text version of this content. The canonical link for it is here.
Posted to fop-commits@xmlgraphics.apache.org by gm...@apache.org on 2005/04/26 06:24:34 UTC
cvs commit: xml-fop/src/java/org/apache/fop/layoutmgr ContentLayoutManager.java AbstractLayoutManager.java PageSequenceLayoutManager.java LayoutManager.java BlockLayoutManager.java BlockContainerLayoutManager.java
gmazza 2005/04/25 21:24:34
Modified: src/java/org/apache/fop/layoutmgr Tag:
Temp_KnuthStylePageBreaking
ContentLayoutManager.java
AbstractLayoutManager.java
PageSequenceLayoutManager.java LayoutManager.java
BlockLayoutManager.java
BlockContainerLayoutManager.java
Log:
removed duplicate addMarkerMap() method, renamed addMarkers()
to addMarkersToPV().
Revision Changes Path
No revision
No revision
1.24.2.4 +0 -6 xml-fop/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java
Index: ContentLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/ContentLayoutManager.java,v
retrieving revision 1.24.2.3
retrieving revision 1.24.2.4
diff -u -r1.24.2.3 -r1.24.2.4
--- ContentLayoutManager.java 5 Apr 2005 00:24:33 -0000 1.24.2.3
+++ ContentLayoutManager.java 26 Apr 2005 04:24:33 -0000 1.24.2.4
@@ -32,7 +32,6 @@
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;
@@ -271,11 +270,6 @@
}
/** @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);
}
1.41.2.4 +3 -13 xml-fop/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java
Index: AbstractLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/AbstractLayoutManager.java,v
retrieving revision 1.41.2.3
retrieving revision 1.41.2.4
diff -u -r1.41.2.3 -r1.41.2.4
--- AbstractLayoutManager.java 5 Apr 2005 00:24:33 -0000 1.41.2.3
+++ AbstractLayoutManager.java 26 Apr 2005 04:24:33 -0000 1.41.2.4
@@ -393,25 +393,15 @@
}
/**
- * 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.
*
* @see org.apache.fop.layoutmgr.LayoutManager
1.50.2.16 +1 -13 xml-fop/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java
Index: PageSequenceLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/PageSequenceLayoutManager.java,v
retrieving revision 1.50.2.15
retrieving revision 1.50.2.16
diff -u -r1.50.2.15 -r1.50.2.16
--- PageSequenceLayoutManager.java 25 Apr 2005 02:54:24 -0000 1.50.2.15
+++ PageSequenceLayoutManager.java 26 Apr 2005 04:24:33 -0000 1.50.2.16
@@ -43,7 +43,6 @@
import java.util.LinkedList;
import java.util.List;
-import java.util.Map;
/**
* LayoutManager for a PageSequence.
@@ -324,17 +323,6 @@
}
/**
- * 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
* current page. For page-sequence and document it will
1.21.2.4 +0 -13 xml-fop/src/java/org/apache/fop/layoutmgr/LayoutManager.java
Index: LayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/LayoutManager.java,v
retrieving revision 1.21.2.3
retrieving revision 1.21.2.4
diff -u -r1.21.2.3 -r1.21.2.4
--- LayoutManager.java 5 Apr 2005 00:24:33 -0000 1.21.2.3
+++ LayoutManager.java 26 Apr 2005 04:24:33 -0000 1.21.2.4
@@ -20,7 +20,6 @@
import java.util.LinkedList;
import java.util.List;
-import java.util.Map;
import org.apache.fop.fo.flow.Marker;
@@ -202,18 +201,6 @@
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.
*
1.43.2.8 +5 -5 xml-fop/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java
Index: BlockLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/BlockLayoutManager.java,v
retrieving revision 1.43.2.7
retrieving revision 1.43.2.8
diff -u -r1.43.2.7 -r1.43.2.8
--- BlockLayoutManager.java 14 Apr 2005 16:15:29 -0000 1.43.2.7
+++ BlockLayoutManager.java 26 Apr 2005 04:24:33 -0000 1.43.2.8
@@ -348,7 +348,7 @@
if (!isBogus()) {
addID(getBlockFO().getId());
- addMarkers(true, bp1.isFirstArea(), bp1.isLastArea());
+ addMarkersToPV(true, bp1.isFirstArea(), bp1.isLastArea());
}
try {
@@ -370,7 +370,7 @@
}
} finally {
if (!isBogus()) {
- addMarkers(false, bp1.isFirstArea(), bp1.isLastArea());
+ addMarkersToPV(false, bp1.isFirstArea(), bp1.isLastArea());
}
flush();
@@ -393,8 +393,8 @@
}
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 @@
int bIndents = getBlockFO().getCommonBorderPaddingBackground().getBPPaddingAndBorder(false);
- addMarkers(false, false, true);
+ addMarkersToPV(false, false, true);
flush();
1.36.2.10 +5 -5 xml-fop/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java
Index: BlockContainerLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/BlockContainerLayoutManager.java,v
retrieving revision 1.36.2.9
retrieving revision 1.36.2.10
diff -u -r1.36.2.9 -r1.36.2.10
--- BlockContainerLayoutManager.java 14 Apr 2005 16:15:29 -0000 1.36.2.9
+++ BlockContainerLayoutManager.java 26 Apr 2005 04:24:33 -0000 1.36.2.10
@@ -842,8 +842,8 @@
}
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 @@
int bIndents = getBlockContainerFO().getCommonBorderPaddingBackground().getBPPaddingAndBorder(false);
- addMarkers(false, false, true);
+ addMarkersToPV(false, false, true);
flush();
@@ -1025,7 +1025,7 @@
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 @@
}
flush();
- addMarkers(true, bp1.isFirstArea(), bp1.isLastArea());
+ addMarkersToPV(true, bp1.isFirstArea(), bp1.isLastArea());
/*
if (!isAbsoluteOrFixed()) {
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org