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/04/05 04:26:53 UTC
cvs commit: xml-fop/src/java/org/apache/fop/layoutmgr BlockContainerLayoutManager.java
gmazza 2005/04/04 19:26:53
Modified: src/java/org/apache/fop/area Tag:
Temp_KnuthStylePageBreaking RegionReference.java
src/java/org/apache/fop/layoutmgr Tag:
Temp_KnuthStylePageBreaking
BlockContainerLayoutManager.java
Log:
More simplifications.
Revision Changes Path
No revision
No revision
1.6.2.2 +0 -19 xml-fop/src/java/org/apache/fop/area/RegionReference.java
Index: RegionReference.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/area/RegionReference.java,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -r1.6.2.1 -r1.6.2.2
--- RegionReference.java 28 Mar 2005 06:14:13 -0000 1.6.2.1
+++ RegionReference.java 5 Apr 2005 02:26:53 -0000 1.6.2.2
@@ -31,7 +31,6 @@
public class RegionReference extends Area implements Cloneable {
private int regionClass = Constants.FO_REGION_BEFORE;
private CTM ctm;
- private int bpd;
// the list of block areas from the static flow
private List blocks = new ArrayList();
@@ -107,24 +106,6 @@
}
/**
- * Set the block-progression-dimension.
- *
- * @return the footnote area
- */
- public void setBPD(int bpd) {
- this.bpd = bpd;
- }
-
- /**
- * Set the block-progression-dimension.
- *
- * @return the footnote area
- */
- public int getBPD() {
- return bpd;
- }
-
- /**
* Clone this region.
* This is used when cloning the page by the page master.
* The blocks are not copied since the master will have no blocks.
No revision
No revision
1.36.2.7 +4 -21 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.6
retrieving revision 1.36.2.7
diff -u -r1.36.2.6 -r1.36.2.7
--- BlockContainerLayoutManager.java 21 Mar 2005 16:15:19 -0000 1.36.2.6
+++ BlockContainerLayoutManager.java 5 Apr 2005 02:26:53 -0000 1.36.2.7
@@ -27,9 +27,7 @@
import org.apache.fop.area.Area;
import org.apache.fop.area.BlockViewport;
import org.apache.fop.area.Block;
-import org.apache.fop.area.PageViewport;
import org.apache.fop.area.Trait;
-import org.apache.fop.fo.Constants;
import org.apache.fop.fo.flow.BlockContainer;
import org.apache.fop.fo.properties.CommonAbsolutePosition;
import org.apache.fop.area.CTM;
@@ -97,21 +95,6 @@
}
/**
- * @return the currently applicable page viewport
- */
- protected PageViewport getPageViewport() {
- LayoutManager lm = this;
- while (lm != null && !(lm instanceof PageSequenceLayoutManager)) {
- lm = lm.getParent();
- }
- if (lm == null) {
- return null;
- } else {
- return ((PageSequenceLayoutManager)lm).getCurrentPageViewport();
- }
- }
-
- /**
* @see org.apache.fop.layoutmgr.AbstractLayoutManager#initProperties()
*/
protected void initProperties() {
@@ -376,7 +359,7 @@
allocBPD = 0;
if (abProps.bottom.getEnum() != EN_AUTO) {
if (isFixed()) {
- allocBPD = (int)getPageViewport().getViewArea().getHeight();
+ allocBPD = (int)getCurrentPageViewport().getViewArea().getHeight();
} else {
allocBPD = context.getStackLimit().opt;
}
@@ -393,7 +376,7 @@
allocIPD += getIPIndents();
} else {
if (isFixed()) {
- allocIPD = (int)getPageViewport().getViewArea().getWidth();
+ allocIPD = (int)getCurrentPageViewport().getViewArea().getWidth();
} else {
allocIPD = context.getRefIPD();
}
@@ -767,7 +750,7 @@
allocBPD = 0;
if (abProps.bottom.getEnum() != EN_AUTO) {
if (isFixed()) {
- allocBPD = (int)getPageViewport().getViewArea().getHeight();
+ allocBPD = (int)getCurrentPageViewport().getViewArea().getHeight();
} else {
allocBPD = context.getStackLimit().opt;
}
@@ -784,7 +767,7 @@
allocIPD += getIPIndents();
} else {
if (isFixed()) {
- allocIPD = (int)getPageViewport().getViewArea().getWidth();
+ allocIPD = (int)getCurrentPageViewport().getViewArea().getWidth();
} else {
allocIPD = context.getRefIPD();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org