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/14 21:28:33 UTC
cvs commit: xml-fop/src/java/org/apache/fop/layoutmgr AbstractLayoutManager.java PageSequenceLayoutManager.java ContentLayoutManager.java LayoutManager.java LMiter.java BlockLayoutManager.java FlowLayoutManager.java
gmazza 2005/05/14 12:28:33
Modified: src/java/org/apache/fop/layoutmgr AbstractLayoutManager.java
PageSequenceLayoutManager.java
ContentLayoutManager.java LayoutManager.java
LMiter.java BlockLayoutManager.java
FlowLayoutManager.java
Log:
PSLM.getParentArea() consolidated into FLM's version; preLoadList()
preLoadNext() renamed to clearer createChildLMs()/createNextChildLMs().
Revision Changes Path
1.43 +6 -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.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- AbstractLayoutManager.java 13 May 2005 19:16:51 -0000 1.42
+++ AbstractLayoutManager.java 14 May 2005 19:28:32 -0000 1.43
@@ -308,11 +308,12 @@
}
/**
- * Convenience method: preload a number of child LMs
+ * Create the LM instances for the children of the
+ * formatting object being handled by this LM.
* @param size the requested number of child LMs
* @return the list with the preloaded child LMs
*/
- protected List preLoadList(int size) {
+ protected List createChildLMs(int size) {
if (fobjIter == null) {
return null;
}
@@ -349,10 +350,10 @@
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#preLoadNext
+ * @see org.apache.fop.layoutmgr.LayoutManager#createNextChildLMs
*/
- public boolean preLoadNext(int pos) {
- List newLMs = preLoadList(pos + 1 - childLMs.size());
+ public boolean createNextChildLMs(int pos) {
+ List newLMs = createChildLMs(pos + 1 - childLMs.size());
addChildLMs(newLMs);
return pos < childLMs.size();
}
1.54 +2 -26 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.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- PageSequenceLayoutManager.java 14 May 2005 16:41:45 -0000 1.53
+++ PageSequenceLayoutManager.java 14 May 2005 19:28:32 -0000 1.54
@@ -22,7 +22,6 @@
import org.apache.fop.area.AreaTreeHandler;
import org.apache.fop.area.AreaTreeModel;
-import org.apache.fop.area.Area;
import org.apache.fop.area.PageViewport;
import org.apache.fop.area.LineArea;
import org.apache.fop.area.RegionViewport;
@@ -430,7 +429,7 @@
RegionViewport rv = curPV.getPage().getRegionViewport(regionID);
StaticContentLayoutManager lm;
lm = (StaticContentLayoutManager)
- areaTreeHandler.getLayoutManagerMaker().makeLayoutManager(sc);
+ getLayoutManagerMaker().makeLayoutManager(sc);
lm.setTargetRegion(rv.getRegionReference());
lm.setParent(this);
lm.doLayout();
@@ -451,29 +450,6 @@
}
/**
- * This is called from FlowLayoutManager when it needs to start
- * a new flow container (while generating areas).
- *
- * @param childArea The area for which a container is needed. It must be
- * some kind of block-level area. It must have area-class, break-before
- * and span properties set.
- * @return the parent area
- */
- public Area getParentArea(Area childArea) {
- int aclass = childArea.getAreaClass();
-
- if (aclass == Area.CLASS_NORMAL) {
- return curPV.getCurrentFlow();
- } else if (aclass == Area.CLASS_BEFORE_FLOAT) {
- return curPV.getBodyRegion().getBeforeFloat();
- } else if (aclass == Area.CLASS_FOOTNOTE) {
- return curPV.getBodyRegion().getFootnote();
- }
- // todo!!! other area classes (side-float, absolute, fixed)
- return null;
- }
-
- /**
* Depending on the kind of break condition, move to next column
* or page. May need to make an empty page if next page would
* not have the desired "handedness".
1.26 +2 -2 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.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ContentLayoutManager.java 13 May 2005 19:16:51 -0000 1.25
+++ ContentLayoutManager.java 14 May 2005 19:28:32 -0000 1.26
@@ -242,9 +242,9 @@
Position bp2) { }
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#preLoadNext
+ * @see org.apache.fop.layoutmgr.LayoutManager#createNextChildLMs
*/
- public boolean preLoadNext(int pos) {
+ public boolean createNextChildLMs(int pos) {
return false;
}
1.23 +3 -3 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.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- LayoutManager.java 13 May 2005 19:16:52 -0000 1.22
+++ LayoutManager.java 14 May 2005 19:28:32 -0000 1.23
@@ -159,11 +159,11 @@
void addAreas(PositionIterator posIter, LayoutContext context);
/**
- * Load next child LMs, up to child LM index pos
+ * Create more child LMs of the parent, up to child LM index pos
* @param pos index up to which child LMs are requested
- * @return if requested index does exist
+ * @return true if requested index does exist
*/
- boolean preLoadNext(int pos);
+ boolean createNextChildLMs(int pos);
/**
* @return the list of child LMs
1.12 +1 -1 xml-fop/src/java/org/apache/fop/layoutmgr/LMiter.java
Index: LMiter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/LMiter.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- LMiter.java 7 Sep 2004 20:47:11 -0000 1.11
+++ LMiter.java 14 May 2005 19:28:32 -0000 1.12
@@ -36,7 +36,7 @@
}
public boolean hasNext() {
- return (curPos < listLMs.size()) ? true : lp.preLoadNext(curPos);
+ return (curPos < listLMs.size()) ? true : lp.createNextChildLMs(curPos);
}
public boolean hasPrevious() {
1.45 +6 -6 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.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- BlockLayoutManager.java 13 May 2005 19:16:51 -0000 1.44
+++ BlockLayoutManager.java 14 May 2005 19:28:32 -0000 1.45
@@ -114,7 +114,7 @@
* This iterator creates and holds the complete list
* of child LMs.
* It uses fobjIter as its base iterator.
- * Block LM's preLoadNext uses this iterator
+ * Block LM's createNextChildLMs uses this iterator
* as its base iterator.
*/
protected class ProxyLMiter extends LMiter {
@@ -125,11 +125,11 @@
}
public boolean hasNext() {
- return (curPos < listLMs.size()) ? true : preLoadNext(curPos);
+ return (curPos < listLMs.size()) ? true : createNextChildLMs(curPos);
}
- protected boolean preLoadNext(int pos) {
- List newLMs = preLoadList(pos + 1 - listLMs.size());
+ protected boolean createNextChildLMs(int pos) {
+ List newLMs = createChildLMs(pos + 1 - listLMs.size());
if (newLMs != null) {
listLMs.addAll(newLMs);
}
@@ -138,9 +138,9 @@
}
/**
- * @see org.apache.fop.layoutmgr.LayoutManager#preLoadNext
+ * @see org.apache.fop.layoutmgr.LayoutManager#createNextChildLMs
*/
- public boolean preLoadNext(int pos) {
+ public boolean createNextChildLMs(int pos) {
while (proxyLMiter.hasNext()) {
LayoutManager lm = (LayoutManager) proxyLMiter.next();
1.14 +14 -2 xml-fop/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java
Index: FlowLayoutManager.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/FlowLayoutManager.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- FlowLayoutManager.java 13 May 2005 19:16:51 -0000 1.13
+++ FlowLayoutManager.java 14 May 2005 19:28:32 -0000 1.14
@@ -424,8 +424,20 @@
* @see org.apache.fop.layoutmgr.LayoutManager#getParentArea(Area)
*/
public Area getParentArea(Area childArea) {
- // Get an area from the Page
- BlockParent parentArea = (BlockParent)parentLM.getParentArea(childArea);
+ BlockParent parentArea = null;
+ int aclass = childArea.getAreaClass();
+
+ if (aclass == Area.CLASS_NORMAL) {
+ parentArea = getCurrentPV().getCurrentFlow();
+ } else if (aclass == Area.CLASS_BEFORE_FLOAT) {
+ parentArea = getCurrentPV().getBodyRegion().getBeforeFloat();
+ } else if (aclass == Area.CLASS_FOOTNOTE) {
+ parentArea = getCurrentPV().getBodyRegion().getFootnote();
+ } else {
+ throw new IllegalStateException("(internal error) Invalid " +
+ "area class (" + aclass + ") requested.");
+ }
+
this.currentAreas[parentArea.getAreaClass()] = parentArea;
setCurrentArea(parentArea);
return parentArea;
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org