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/06/09 04:39:55 UTC
cvs commit: xml-fop/src/java/org/apache/fop/layoutmgr AbstractLayoutManager.java PageSequenceLayoutManager.java ContentLayoutManager.java
gmazza 2005/06/08 19:39:55
Modified: src/java/org/apache/fop/layoutmgr AbstractLayoutManager.java
PageSequenceLayoutManager.java
ContentLayoutManager.java
Log:
More cleanup/simplifications.
Revision Changes Path
1.51 +0 -5 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.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- AbstractLayoutManager.java 8 Jun 2005 22:24:34 -0000 1.50
+++ AbstractLayoutManager.java 9 Jun 2005 02:39:55 -0000 1.51
@@ -185,11 +185,6 @@
log.warn("null implementation of getWordChars() called!");
}
- // This version is not in LayoutManager but is the only version being
- // called within the application.
- public void getWordChars(StringBuffer sbChars, Position pos) {
- }
-
public void hyphenate(Position pos, HyphContext hc) {
log.warn("null implementation of hyphenate called!");
}
1.66 +2 -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.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- PageSequenceLayoutManager.java 7 Jun 2005 20:43:42 -0000 1.65
+++ PageSequenceLayoutManager.java 9 Jun 2005 02:39:55 -0000 1.66
@@ -236,7 +236,7 @@
footnoteSeparatorLM.doLayout();
}
- getCurrentChildLM().addAreas(posIter, context);
+ childFLM.addAreas(posIter, context);
}
protected void doPhase3(PageBreakingAlgorithm alg, int partCount,
1.31 +4 -3 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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ContentLayoutManager.java 8 Jun 2005 22:06:32 -0000 1.30
+++ ContentLayoutManager.java 9 Jun 2005 02:39:55 -0000 1.31
@@ -62,11 +62,12 @@
}
/**
- * Constructor using a fo:title formatting object
+ * Constructor using a fo:title formatting object and its
+ * PageSequenceLayoutManager parent.
*/
- public ContentLayoutManager(Title foTitle, LayoutManager parentLM) {
+ public ContentLayoutManager(Title foTitle, PageSequenceLayoutManager pslm) {
// get breaks then add areas to title
- this.parentLM = parentLM;
+ this.parentLM = pslm;
holder = new LineArea();
setUserAgent(foTitle.getUserAgent());
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org