klease 01/11/11 06:11:46
Modified: src/org/apache/fop/layoutmgr AbstractLayoutManager.java
BlockStackingLayoutManager.java LayoutManager.java
PageLayoutManager.java
Log:
Add some more LayoutManagers and start to actually do something
Revision Changes Path
1.3 +4 -6 xml-fop/src/org/apache/fop/layoutmgr/AbstractLayoutManager.java
Index: AbstractLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/AbstractLayoutManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- AbstractLayoutManager.java 2001/11/09 23:03:54 1.2
+++ AbstractLayoutManager.java 2001/11/11 14:11:46 1.3
@@ -1,5 +1,5 @@
/*
- * $Id: AbstractLayoutManager.java,v 1.2 2001/11/09 23:03:54 klease Exp $
+ * $Id: AbstractLayoutManager.java,v 1.3 2001/11/11 14:11:46 klease Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -10,7 +10,7 @@
import org.apache.fop.fo.FObj;
import org.apache.fop.area.Area;
-import java.util.Iterator;
+import java.util.ListIterator;
/**
* The base class for all LayoutManagers.
@@ -36,7 +36,7 @@
* its generateAreas method.
*/
public void generateAreas() {
- Iterator children = fobj.getChildren();
+ ListIterator children = fobj.getChildren();
while (children.hasNext()) {
LayoutManager lm = ((FObj)children.next()).getLayoutManager();
if (lm != null) {
@@ -84,15 +84,13 @@
* BPD.
*/
abstract public Area getParentArea(Area childArea);
+
public boolean generatesInlineAreas() {
return false;
}
- public boolean generatesLineAreas() {
- return false;
- }
/**
* Add a child area to the current area. If this causes the maximum
1.2 +2 -2
xml-fop/src/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java
Index: BlockStackingLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/org/apache/fop/layoutmgr/BlockStackingLayoutManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- BlockStackingLayoutManager.java 2001/11/09 21:57:47 1.1
+++ BlockStackingLayoutManager.java 2001/11/11 14:11:46 1.2
@@ -1,5 +1,5 @@
/*
- * $Id: BlockStackingLayoutManager.java,v 1.1 2001/11/09 21:57:47 klease Exp $
+ * $Id: BlockStackingLayoutManager.java,v 1.2 2001/11/11 14:11:46 klease Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -184,7 +184,7 @@
* @param childArea the area to add: will be some block-stacked Area.
*/
public void addChild(Area childArea) {
- addChildToArea((Block)childArea, getCurrentArea());
+ addChildToArea(childArea, getCurrentArea());
}
/**
1.2 +2 -1 xml-fop/src/org/apache/fop/layoutmgr/LayoutManager.java
Index: LayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/LayoutManager.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LayoutManager.java 2001/11/09 21:57:47 1.1
+++ LayoutManager.java 2001/11/11 14:11:46 1.2
@@ -1,5 +1,5 @@
/*
- * $Id: LayoutManager.java,v 1.1 2001/11/09 21:57:47 klease Exp $
+ * $Id: LayoutManager.java,v 1.2 2001/11/11 14:11:46 klease Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -15,6 +15,7 @@
*/
public interface LayoutManager {
public void generateAreas();
+ public boolean generatesInlineAreas();
public Area getParentArea (Area childArea);
public void addChild (Area childArea);
public boolean splitArea(Area areaToSplit, SplitContext context);
1.3 +5 -4 xml-fop/src/org/apache/fop/layoutmgr/PageLayoutManager.java
Index: PageLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/org/apache/fop/layoutmgr/PageLayoutManager.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- PageLayoutManager.java 2001/11/09 23:03:54 1.2
+++ PageLayoutManager.java 2001/11/11 14:11:46 1.3
@@ -1,5 +1,5 @@
/*
- * $Id: PageLayoutManager.java,v 1.2 2001/11/09 23:03:54 klease Exp $
+ * $Id: PageLayoutManager.java,v 1.3 2001/11/11 14:11:46 klease Exp $
* Copyright (C) 2001 The Apache Software Foundation. All rights reserved.
* For details on use and redistribution please refer to the
* LICENSE file included with these sources.
@@ -19,7 +19,6 @@
public class PageLayoutManager extends AbstractLayoutManager
implements Runnable{
- private PageSequence pageseq;
/** True if haven't yet laid out any pages.*/
private boolean bFirstPage;
/** Current page being worked on. */
@@ -136,7 +135,7 @@
private PageViewport makeNewPage(boolean bIsBlank, boolean bIsLast) {
finishPage();
try {
- curPage = pageseq.createPage(bIsBlank, bIsLast);
+ curPage = ((PageSequence)fobj).createPage(bIsBlank, bIsLast);
} catch (FOPException fopex) { /* ???? */ }
curBody = (BodyRegion) curPage.getPage().
getRegion(RegionReference.BODY).getRegion();
@@ -339,6 +338,8 @@
}
// See finishPage...
- protected void flush() {}
+ protected void flush() {
+ finishPage();
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
