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/04 06:47:31 UTC
cvs commit: xml-fop/src/java/org/apache/fop/layoutmgr PageSequenceLayoutManager.java ContentLayoutManager.java
gmazza 2005/06/03 21:47:31
Modified: src/java/org/apache/fop/layoutmgr
PageSequenceLayoutManager.java
ContentLayoutManager.java
Log:
Two stray isBogus()es removed, AFAICT unnecessary childLC initialization
removed from PSLM.
Revision Changes Path
1.62 +3 -18 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.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- PageSequenceLayoutManager.java 1 Jun 2005 22:41:17 -0000 1.61
+++ PageSequenceLayoutManager.java 4 Jun 2005 04:47:31 -0000 1.62
@@ -302,27 +302,12 @@
}
- /** @see org.apache.fop.layoutmgr.LayoutManager#isBogus() */
- public boolean isBogus() {
- return false;
- }
-
/**
- * Get the next break possibility.
- * This finds the next break for a page which is always at the end
- * of the page.
- *
- * @param context the layout context for finding breaks
- * @return the break for the page
+ * @see org.apache.fop.layoutmgr.LayoutManager#getNextKnuthElements(Layout Context, int)
*/
public LinkedList getNextKnuthElements(LayoutContext context, int alignment) {
- LinkedList returnedList = null;
-
while (!childFLM.isFinished()) {
- LayoutContext childLC = new LayoutContext(0);
- childLC.setStackLimit(context.getStackLimit());
- childLC.setRefIPD(context.getRefIPD());
- returnedList = childFLM.getNextKnuthElements(childLC, alignment);
+ LinkedList returnedList = childFLM.getNextKnuthElements(context, alignment);
if (returnedList != null) {
return returnedList;
1.28 +0 -5 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.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- ContentLayoutManager.java 17 May 2005 16:58:52 -0000 1.27
+++ ContentLayoutManager.java 4 Jun 2005 04:47:31 -0000 1.28
@@ -165,11 +165,6 @@
return true;
}
- /** @see org.apache.fop.layoutmgr.LayoutManager#isBogus() */
- public boolean isBogus() {
- return false;
- }
-
/** @see org.apache.fop.layoutmgr.LayoutManager */
public Area getParentArea(Area childArea) {
return holder;
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org