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/05/11 02:17:59 UTC
cvs commit: xml-fop/src/java/org/apache/fop/layoutmgr/list ListItemLayoutManager.java Item.java ListBlockLayoutManager.java
gmazza 2005/05/10 17:17:59
Modified: src/java/org/apache/fop/layoutmgr Tag:
Temp_KnuthStylePageBreaking
AbstractLayoutManager.java BlockLayoutManager.java
LeaderLayoutManager.java ICLayoutManager.java
PageSequenceLayoutManager.java
PageNumberCitationLayoutManager.java
InstreamForeignObjectLM.java
BlockContainerLayoutManager.java
CharacterLayoutManager.java
ExternalGraphicLayoutManager.java
PageNumberLayoutManager.java
src/java/org/apache/fop/layoutmgr/table Tag:
Temp_KnuthStylePageBreaking Caption.java
TableLayoutManager.java Row.java Cell.java
TableAndCaptionLayoutManager.java
src/java/org/apache/fop/layoutmgr/list Tag:
Temp_KnuthStylePageBreaking
ListItemLayoutManager.java Item.java
ListBlockLayoutManager.java
Log:
Removed addID() from AbstractLayoutManager in favor of actual
method in PSLM.
Revision Changes Path
No revision
No revision
1.41.2.9 +0 -10 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.8
retrieving revision 1.41.2.9
diff -u -r1.41.2.8 -r1.41.2.9
--- AbstractLayoutManager.java 9 May 2005 22:15:20 -0000 1.41.2.8
+++ AbstractLayoutManager.java 11 May 2005 00:17:58 -0000 1.41.2.9
@@ -343,16 +343,6 @@
}
/**
- * Add the id to the page.
- * If the id string is not null then add the id to the current page.
- */
- protected void addID(String foID) {
- if (foID != null && foID.length() > 0) {
- getPSLM().addIDToPage(foID);
- }
- }
-
- /**
* Handles retrieve-marker nodes as they occur.
* @param foNode FO node to check
* @return the original foNode or in case of a retrieve-marker the replaced
1.43.2.10 +2 -2 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.9
retrieving revision 1.43.2.10
diff -u -r1.43.2.9 -r1.43.2.10
--- BlockLayoutManager.java 29 Apr 2005 00:06:21 -0000 1.43.2.9
+++ BlockLayoutManager.java 11 May 2005 00:17:58 -0000 1.43.2.10
@@ -347,7 +347,7 @@
foBlockSpaceBefore = null;
if (!isBogus()) {
- addID(getBlockFO().getId());
+ getPSLM().addIDToPage(getBlockFO().getId());
getCurrentPV().addMarkers(markers, true, bp1.isFirstArea(),
bp1.isLastArea());
}
@@ -394,7 +394,7 @@
addBlockSpacing(0.0, new MinOptMax(layoutContext.getSpaceBefore()));
}
- addID(getBlockFO().getId());
+ getPSLM().addIDToPage(getBlockFO().getId());
//addMarkersToPV(true, bp1.isFirstArea(), bp1.isLastArea());
getCurrentPV().addMarkers(markers, true, true, false);
1.17.2.2 +2 -2 xml-fop/src/java/org/apache/fop/layoutmgr/LeaderLayoutManager.java
Index: LeaderLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/LeaderLayoutManager.java,v
retrieving revision 1.17.2.1
retrieving revision 1.17.2.2
diff -u -r1.17.2.1 -r1.17.2.2
--- LeaderLayoutManager.java 18 Mar 2005 09:02:55 -0000 1.17.2.1
+++ LeaderLayoutManager.java 11 May 2005 00:17:58 -0000 1.17.2.2
@@ -327,6 +327,6 @@
}
protected void addId() {
- addID(fobj.getId());
+ getPSLM().addIDToPage(fobj.getId());
}
}
1.5.2.1 +2 -2 xml-fop/src/java/org/apache/fop/layoutmgr/ICLayoutManager.java
Index: ICLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/ICLayoutManager.java,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- ICLayoutManager.java 20 Oct 2004 13:19:24 -0000 1.5
+++ ICLayoutManager.java 11 May 2005 00:17:58 -0000 1.5.2.1
@@ -44,6 +44,6 @@
}
protected void addId() {
- addID(fobj.getId());
+ getPSLM().addIDToPage(fobj.getId());
}
}
1.50.2.27 +4 -2 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.26
retrieving revision 1.50.2.27
diff -u -r1.50.2.26 -r1.50.2.27
--- PageSequenceLayoutManager.java 9 May 2005 22:15:20 -0000 1.50.2.26
+++ PageSequenceLayoutManager.java 11 May 2005 00:17:58 -0000 1.50.2.27
@@ -301,7 +301,9 @@
* @param id the ID reference to add
*/
public void addIDToPage(String id) {
- areaTreeHandler.associateIDWithPageViewport(id, curPV);
+ if (id != null && id.length() > 0) {
+ areaTreeHandler.associateIDWithPageViewport(id, curPV);
+ }
}
/**
1.12.2.3 +2 -2 xml-fop/src/java/org/apache/fop/layoutmgr/PageNumberCitationLayoutManager.java
Index: PageNumberCitationLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/PageNumberCitationLayoutManager.java,v
retrieving revision 1.12.2.2
retrieving revision 1.12.2.3
diff -u -r1.12.2.2 -r1.12.2.3
--- PageNumberCitationLayoutManager.java 9 May 2005 22:15:20 -0000 1.12.2.2
+++ PageNumberCitationLayoutManager.java 11 May 2005 00:17:58 -0000 1.12.2.3
@@ -118,7 +118,7 @@
}
protected void addId() {
- addID(fobj.getId());
+ getPSLM().addIDToPage(fobj.getId());
}
}
1.12.2.1 +2 -3 xml-fop/src/java/org/apache/fop/layoutmgr/InstreamForeignObjectLM.java
Index: InstreamForeignObjectLM.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/InstreamForeignObjectLM.java,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -r1.12 -r1.12.2.1
--- InstreamForeignObjectLM.java 28 Dec 2004 18:03:12 -0000 1.12
+++ InstreamForeignObjectLM.java 11 May 2005 00:17:58 -0000 1.12.2.1
@@ -19,7 +19,6 @@
package org.apache.fop.layoutmgr;
// Java
-import java.awt.geom.Point2D;
import java.awt.geom.Rectangle2D;
// FOP
@@ -194,7 +193,7 @@
* @see org.apache.fop.layoutmgr.LeafNodeLayoutManager#addId()
*/
protected void addId() {
- addID(fobj.getId());
+ getPSLM().addIDToPage(fobj.getId());
}
}
1.36.2.12 +2 -2 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.11
retrieving revision 1.36.2.12
diff -u -r1.36.2.11 -r1.36.2.12
--- BlockContainerLayoutManager.java 29 Apr 2005 00:06:21 -0000 1.36.2.11
+++ BlockContainerLayoutManager.java 11 May 2005 00:17:58 -0000 1.36.2.12
@@ -841,7 +841,7 @@
addBlockSpacing(0.0, new MinOptMax(layoutContext.getSpaceBefore()));
}
- addID(getBlockContainerFO().getId());
+ getPSLM().addIDToPage(getBlockContainerFO().getId());
//addMarkersToPV(true, bp1.isFirstArea(), bp1.isLastArea());
getCurrentPV().addMarkers(markers, true, true, false);
@@ -1024,7 +1024,7 @@
}*/
BreakPoss bp1 = (BreakPoss)parentIter.peekNext();
- addID(getBlockContainerFO().getId());
+ getPSLM().addIDToPage(getBlockContainerFO().getId());
getCurrentPV().addMarkers(markers, true, bp1.isFirstArea(), bp1.isLastArea());
LayoutManager childLM;
1.10.2.2 +2 -2 xml-fop/src/java/org/apache/fop/layoutmgr/CharacterLayoutManager.java
Index: CharacterLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/CharacterLayoutManager.java,v
retrieving revision 1.10.2.1
retrieving revision 1.10.2.2
diff -u -r1.10.2.1 -r1.10.2.2
--- CharacterLayoutManager.java 18 Mar 2005 09:02:55 -0000 1.10.2.1
+++ CharacterLayoutManager.java 11 May 2005 00:17:58 -0000 1.10.2.2
@@ -256,7 +256,7 @@
}
protected void addId() {
- addID(fobj.getId());
+ getPSLM().addIDToPage(fobj.getId());
}
}
1.15.2.1 +2 -2 xml-fop/src/java/org/apache/fop/layoutmgr/ExternalGraphicLayoutManager.java
Index: ExternalGraphicLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/ExternalGraphicLayoutManager.java,v
retrieving revision 1.15
retrieving revision 1.15.2.1
diff -u -r1.15 -r1.15.2.1
--- ExternalGraphicLayoutManager.java 28 Dec 2004 18:03:12 -0000 1.15
+++ ExternalGraphicLayoutManager.java 11 May 2005 00:17:58 -0000 1.15.2.1
@@ -208,7 +208,7 @@
}
protected void addId() {
- addID(fobj.getId());
+ getPSLM().addIDToPage(fobj.getId());
}
}
1.7.2.4 +2 -2 xml-fop/src/java/org/apache/fop/layoutmgr/PageNumberLayoutManager.java
Index: PageNumberLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/PageNumberLayoutManager.java,v
retrieving revision 1.7.2.3
retrieving revision 1.7.2.4
diff -u -r1.7.2.3 -r1.7.2.4
--- PageNumberLayoutManager.java 9 May 2005 22:15:20 -0000 1.7.2.3
+++ PageNumberLayoutManager.java 11 May 2005 00:17:58 -0000 1.7.2.4
@@ -69,7 +69,7 @@
}
protected void addId() {
- addID(fobj.getId());
+ getPSLM().addIDToPage(fobj.getId());
}
}
No revision
No revision
1.6.2.1 +1 -1 xml-fop/src/java/org/apache/fop/layoutmgr/table/Caption.java
Index: Caption.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/table/Caption.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- Caption.java 16 Mar 2005 23:18:43 -0000 1.6
+++ Caption.java 11 May 2005 00:17:58 -0000 1.6.2.1
@@ -138,7 +138,7 @@
public void addAreas(PositionIterator parentIter,
LayoutContext layoutContext) {
getParentArea(null);
- addID(fobj.getId());
+ getPSLM().addIDToPage(fobj.getId());
LayoutManager childLM;
int iStartPos = 0;
1.21.2.5 +1 -1 xml-fop/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java
Index: TableLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/table/TableLayoutManager.java,v
retrieving revision 1.21.2.4
retrieving revision 1.21.2.5
diff -u -r1.21.2.4 -r1.21.2.5
--- TableLayoutManager.java 6 Apr 2005 12:32:57 -0000 1.21.2.4
+++ TableLayoutManager.java 11 May 2005 00:17:58 -0000 1.21.2.5
@@ -644,7 +644,7 @@
public void addAreas(PositionIterator parentIter,
LayoutContext layoutContext) {
getParentArea(null);
- addID(fobj.getId());
+ getPSLM().addIDToPage(fobj.getId());
// if adjusted space before
double adjust = layoutContext.getSpaceAdjust();
1.26.2.2 +1 -1 xml-fop/src/java/org/apache/fop/layoutmgr/table/Row.java
Index: Row.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/table/Row.java,v
retrieving revision 1.26.2.1
retrieving revision 1.26.2.2
diff -u -r1.26.2.1 -r1.26.2.2
--- Row.java 5 Apr 2005 15:42:44 -0000 1.26.2.1
+++ Row.java 11 May 2005 00:17:58 -0000 1.26.2.2
@@ -518,7 +518,7 @@
BreakPoss bp1 = (BreakPoss)parentIter.peekNext();
bBogus = !bp1.generatesAreas();
if (!isBogus()) {
- addID(fobj.getId());
+ getPSLM().addIDToPage(fobj.getId());
}
Cell childLM;
1.26.2.7 +1 -2 xml-fop/src/java/org/apache/fop/layoutmgr/table/Cell.java
Index: Cell.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/table/Cell.java,v
retrieving revision 1.26.2.6
retrieving revision 1.26.2.7
diff -u -r1.26.2.6 -r1.26.2.7
--- Cell.java 4 May 2005 15:10:19 -0000 1.26.2.6
+++ Cell.java 11 May 2005 00:17:58 -0000 1.26.2.7
@@ -36,7 +36,6 @@
import org.apache.fop.layoutmgr.MinOptMaxUtil;
import org.apache.fop.layoutmgr.NonLeafPosition;
import org.apache.fop.layoutmgr.PositionIterator;
-import org.apache.fop.layoutmgr.BreakPossPosIter;
import org.apache.fop.layoutmgr.Position;
import org.apache.fop.layoutmgr.TraitSetter;
import org.apache.fop.area.Area;
@@ -420,7 +419,7 @@
bBogus = false;//!bp1.generatesAreas();
if (!isBogus()) {
- addID(fobj.getId());
+ getPSLM().addIDToPage(fobj.getId());
}
if (fobj.isSeparateBorderModel()) {
1.6.2.1 +1 -1 xml-fop/src/java/org/apache/fop/layoutmgr/table/TableAndCaptionLayoutManager.java
Index: TableAndCaptionLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/table/TableAndCaptionLayoutManager.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- TableAndCaptionLayoutManager.java 16 Mar 2005 23:18:43 -0000 1.6
+++ TableAndCaptionLayoutManager.java 11 May 2005 00:17:58 -0000 1.6.2.1
@@ -139,7 +139,7 @@
public void addAreas(PositionIterator parentIter,
LayoutContext layoutContext) {
getParentArea(null);
- addID(fobj.getId());
+ getPSLM().addIDToPage(fobj.getId());
LayoutManager childLM;
int iStartPos = 0;
No revision
No revision
1.19.2.4 +1 -1 xml-fop/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
Index: ListItemLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java,v
retrieving revision 1.19.2.3
retrieving revision 1.19.2.4
diff -u -r1.19.2.3 -r1.19.2.4
--- ListItemLayoutManager.java 18 Apr 2005 14:53:24 -0000 1.19.2.3
+++ ListItemLayoutManager.java 11 May 2005 00:17:59 -0000 1.19.2.4
@@ -486,7 +486,7 @@
addBlockSpacing(adjust, spaceBefore);
spaceBefore = null;
- addID(fobj.getId());
+ getPSLM().addIDToPage(fobj.getId());
LayoutContext lc = new LayoutContext(0);
1.12.2.2 +2 -3 xml-fop/src/java/org/apache/fop/layoutmgr/list/Item.java
Index: Item.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/list/Item.java,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -u -r1.12.2.1 -r1.12.2.2
--- Item.java 7 Apr 2005 16:20:44 -0000 1.12.2.1
+++ Item.java 11 May 2005 00:17:59 -0000 1.12.2.2
@@ -27,7 +27,6 @@
import org.apache.fop.layoutmgr.BreakPoss;
import org.apache.fop.layoutmgr.LayoutContext;
import org.apache.fop.layoutmgr.PositionIterator;
-import org.apache.fop.layoutmgr.BreakPossPosIter;
import org.apache.fop.layoutmgr.Position;
import org.apache.fop.layoutmgr.NonLeafPosition;
import org.apache.fop.area.Area;
@@ -188,9 +187,9 @@
int nameId = fobj.getNameId();
if (nameId == FO_LIST_ITEM_LABEL) {
- addID(((ListItemLabel) fobj).getId());
+ getPSLM().addIDToPage(((ListItemLabel) fobj).getId());
} else if (nameId == FO_LIST_ITEM_BODY) {
- addID(((ListItemBody) fobj).getId());
+ getPSLM().addIDToPage(((ListItemBody) fobj).getId());
}
LayoutManager childLM = null;
1.12.2.3 +1 -1 xml-fop/src/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java
Index: ListBlockLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java,v
retrieving revision 1.12.2.2
retrieving revision 1.12.2.3
diff -u -r1.12.2.2 -r1.12.2.3
--- ListBlockLayoutManager.java 18 Apr 2005 14:53:24 -0000 1.12.2.2
+++ ListBlockLayoutManager.java 11 May 2005 00:17:59 -0000 1.12.2.3
@@ -201,7 +201,7 @@
addBlockSpacing(adjust, spaceBefore);
spaceBefore = null;
- addID(fobj.getId());
+ getPSLM().addIDToPage(fobj.getId());
// the list block contains areas stacked from each list item
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org