bckfnn 2004/10/19 14:47:15
Modified: src/java/org/apache/fop/fo/flow TableCell.java
src/java/org/apache/fop/layoutmgr
BlockContainerLayoutManager.java
BlockLayoutManager.java
ExternalGraphicLayoutManager.java
PageSequenceLayoutManager.java TraitSetter.java
src/java/org/apache/fop/layoutmgr/list Item.java
ListBlockLayoutManager.java
ListItemLayoutManager.java
Log:
Third phase of performance improvement.
- Use CommonBorderPaddingBackground.
PR: 31699
Revision Changes Path
1.37 +1 -2 xml-fop/src/java/org/apache/fop/fo/flow/TableCell.java
Index: TableCell.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/fo/flow/TableCell.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- TableCell.java 19 Oct 2004 13:45:37 -0000 1.36
+++ TableCell.java 19 Oct 2004 21:47:15 -0000 1.37
@@ -38,7 +38,6 @@
import org.apache.fop.fo.properties.LengthPairProperty;
import org.apache.fop.fo.properties.LengthRangeProperty;
import org.apache.fop.layoutmgr.table.Cell;
-import org.apache.fop.fo.properties.CommonBorderAndPadding;
/**
* Class modelling the fo:table-cell object.
@@ -193,7 +192,7 @@
* Calculate cell border and padding, including offset of content
* rectangle from the theoretical grid position.
*/
- private void calcBorders(CommonBorderAndPadding bp) {
+ private void calcBorders(CommonBorderPaddingBackground bp) {
if (this.borderCollapse == BorderCollapse.SEPARATE) {
/*
* Easy case.
1.25 +26 -44
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.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- BlockContainerLayoutManager.java 19 Oct 2004 13:36:46 -0000 1.24
+++ BlockContainerLayoutManager.java 19 Oct 2004 21:47:15 -0000 1.25
@@ -24,11 +24,8 @@
import org.apache.fop.area.Area;
import org.apache.fop.area.BlockViewport;
import org.apache.fop.area.Block;
-import org.apache.fop.fo.FObj;
-import org.apache.fop.fo.PropertyManager;
+import org.apache.fop.fo.flow.BlockContainer;
import org.apache.fop.fo.properties.CommonAbsolutePosition;
-import org.apache.fop.fo.properties.CommonBorderAndPadding;
-import org.apache.fop.fo.properties.CommonMarginBlock;
import org.apache.fop.area.CTM;
import org.apache.fop.datatypes.FODimension;
import org.apache.fop.datatypes.Length;
@@ -39,20 +36,17 @@
* LayoutManager for a block FO.
*/
public class BlockContainerLayoutManager extends BlockStackingLayoutManager {
-
+ private BlockContainer fobj;
+
private BlockViewport viewportBlockArea;
private Block curBlockArea;
private List childBreaks = new java.util.ArrayList();
private CommonAbsolutePosition abProps;
- private CommonBorderAndPadding borderProps;
- private CommonMarginBlock marginProps;
private FODimension relDims;
private CTM absoluteCTM;
private boolean clip = false;
- private int overflow;
- private PropertyManager propManager;
private Length width;
private Length height;
@@ -62,41 +56,31 @@
/**
* Create a new block container layout manager.
*/
- public BlockContainerLayoutManager(FObj node) {
+ public BlockContainerLayoutManager(BlockContainer node) {
super(node);
+ fobj = node;
}
/**
* @see org.apache.fop.layoutmgr.AbstractLayoutManager#initProperties()
*/
protected void initProperties() {
- propManager = fobj.getPropertyManager();
-
- abProps = propManager.getAbsolutePositionProps();
+ abProps = fobj.getCommonAbsolutePosition();
if (abProps.absolutePosition == AbsolutePosition.ABSOLUTE) {
- Rectangle2D rect = new Rectangle2D.Double(abProps.left,
- abProps.top, abProps.right - abProps.left,
- abProps.bottom - abProps.top);
+ Rectangle2D rect = new Rectangle2D.Double(abProps.left.getValue(),
+ abProps.top.getValue(), abProps.right.getValue() -
abProps.left.getValue(),
+ abProps.bottom.getValue() - abProps.top.getValue());
relDims = new FODimension(0, 0);
- absoluteCTM = CTM.getCTMandRelDims(propManager.getAbsRefOrient(),
- propManager.getWritingMode(), rect, relDims);
+ absoluteCTM = CTM.getCTMandRelDims(fobj.getReferenceOrientation(),
+ fobj.getWritingMode(), rect, relDims);
}
-
- marginProps = propManager.getMarginProps();
- borderProps = propManager.getBorderAndPadding();
- height = fobj.getPropertyList().get(
-
PR_BLOCK_PROGRESSION_DIMENSION).getLengthRange().getOptimum().getLength();
- width = fobj.getPropertyList().get(
-
PR_INLINE_PROGRESSION_DIMENSION).getLengthRange().getOptimum().getLength();
- }
-
- public void setOverflow(int of) {
- overflow = of;
+
+ height = fobj.getBlockProgressionDimension().getOptimum().getLength();
+ width = fobj.getInlineProgressionDimension().getOptimum().getLength();
}
protected int getRotatedIPD() {
- return fobj.getPropLength(PR_INLINE_PROGRESSION_DIMENSION
- | CP_OPTIMUM);
+ return
fobj.getInlineProgressionDimension().getOptimum().getLength().getValue();
}
public BreakPoss getNextBreakPoss(LayoutContext context) {
@@ -115,8 +99,8 @@
}
Rectangle2D rect = new Rectangle2D.Double(0, 0, ipd, bpd);
relDims = new FODimension(0, 0);
- absoluteCTM = CTM.getCTMandRelDims(propManager.getAbsRefOrient(),
- propManager.getWritingMode(), rect, relDims);
+ absoluteCTM = CTM.getCTMandRelDims(fobj.getReferenceOrientation(),
+ fobj.getWritingMode(), rect, relDims);
double[] vals = absoluteCTM.toArray();
MinOptMax stackLimit;
@@ -241,9 +225,9 @@
breakPoss.setStackingSize(new MinOptMax(0));
if (stackSize.opt > relDims.bpd) {
- if (overflow == Overflow.HIDDEN) {
+ if (fobj.getOverflow() == Overflow.HIDDEN) {
clip = true;
- } else if (overflow == Overflow.ERROR_IF_OVERFLOW) {
+ } else if (fobj.getOverflow() == Overflow.ERROR_IF_OVERFLOW) {
log.error("contents overflows block-container viewport: clipping");
clip = true;
}
@@ -256,7 +240,7 @@
LayoutContext layoutContext) {
getParentArea(null);
- addID();
+ addID(fobj.getId());
addMarkers(true, true);
LayoutManager childLM;
@@ -292,16 +276,14 @@
public Area getParentArea(Area childArea) {
if (curBlockArea == null) {
viewportBlockArea = new BlockViewport();
- TraitSetter.addBorders(viewportBlockArea,
- propManager.getBorderAndPadding());
- TraitSetter.addBackground(viewportBlockArea,
- propManager.getBackgroundProps());
+ TraitSetter.addBorders(viewportBlockArea,
fobj.getCommonBorderPaddingBackground());
+ TraitSetter.addBackground(viewportBlockArea,
fobj.getCommonBorderPaddingBackground());
if (abProps.absolutePosition == AbsolutePosition.ABSOLUTE) {
- viewportBlockArea.setXOffset(abProps.left);
- viewportBlockArea.setYOffset(abProps.top);
- viewportBlockArea.setIPD(abProps.right - abProps.left);
- viewportBlockArea.setBPD(abProps.bottom - abProps.top);
+ viewportBlockArea.setXOffset(abProps.left.getValue());
+ viewportBlockArea.setYOffset(abProps.top.getValue());
+ viewportBlockArea.setIPD(abProps.right.getValue() -
abProps.left.getValue());
+ viewportBlockArea.setBPD(abProps.bottom.getValue() -
abProps.top.getValue());
viewportBlockArea.setCTM(absoluteCTM);
viewportBlockArea.setClip(clip);
1.31 +5 -11
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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- BlockLayoutManager.java 19 Oct 2004 20:15:13 -0000 1.30
+++ BlockLayoutManager.java 19 Oct 2004 21:47:15 -0000 1.31
@@ -30,8 +30,6 @@
import org.apache.fop.area.BlockParent;
import org.apache.fop.area.LineArea;
import org.apache.fop.traits.LayoutProps;
-import org.apache.fop.fo.properties.CommonBorderAndPadding;
-import org.apache.fop.fo.properties.CommonBackground;
import org.apache.fop.fo.properties.CommonMarginBlock;
import org.apache.fop.traits.MinOptMax;
@@ -46,8 +44,6 @@
protected ListIterator proxyLMiter;
private LayoutProps layoutProps;
- private CommonBorderAndPadding borderProps;
- private CommonBackground backgroundProps;
private CommonMarginBlock marginProps;
/* holds the (one-time use) fo:block space-before
@@ -91,8 +87,6 @@
protected void initProperties() {
PropertyManager pm = fobj.getPropertyManager();
layoutProps = pm.getLayoutProps();
- borderProps = pm.getBorderAndPadding();
- backgroundProps = pm.getBackgroundProps();
marginProps = pm.getMarginProps();
foBlockSpaceBefore = layoutProps.spaceBefore.getSpace();
prevFoBlockSpaceAfter = foBlockSpaceAfter;
@@ -177,7 +171,7 @@
int ipd = context.getRefIPD();
int iIndents = marginProps.startIndent + marginProps.endIndent;
- int bIndents = borderProps.getBPPaddingAndBorder(false);
+ int bIndents =
fobj.getCommonBorderPaddingBackground().getBPPaddingAndBorder(false);
ipd -= iIndents;
MinOptMax stackSize = new MinOptMax();
@@ -303,7 +297,7 @@
}
}
- int bIndents = borderProps.getBPPaddingAndBorder(false);
+ int bIndents =
fobj.getCommonBorderPaddingBackground().getBPPaddingAndBorder(false);
addMarkers(false, true);
@@ -331,9 +325,9 @@
curBlockArea = new Block();
// set traits
- TraitSetter.addBorders(curBlockArea, borderProps);
- TraitSetter.addBackground(curBlockArea, backgroundProps);
- TraitSetter.addMargins(curBlockArea, borderProps, marginProps);
+ TraitSetter.addBorders(curBlockArea,
fobj.getCommonBorderPaddingBackground());
+ TraitSetter.addBackground(curBlockArea,
fobj.getCommonBorderPaddingBackground());
+ TraitSetter.addMargins(curBlockArea,
fobj.getCommonBorderPaddingBackground(), marginProps);
TraitSetter.addBreaks(curBlockArea, layoutProps);
// Set up dimensions
1.8 +3 -7
xml-fop/src/java/org/apache/fop/layoutmgr/ExternalGraphicLayoutManager.java
Index: ExternalGraphicLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/ExternalGraphicLayoutManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ExternalGraphicLayoutManager.java 19 Oct 2004 13:36:46 -0000 1.7
+++ ExternalGraphicLayoutManager.java 19 Oct 2004 21:47:15 -0000 1.8
@@ -27,8 +27,6 @@
import org.apache.fop.area.inline.Viewport;
import org.apache.fop.datatypes.Length;
import org.apache.fop.fo.flow.ExternalGraphic;
-import org.apache.fop.fo.properties.CommonBorderAndPadding;
-import org.apache.fop.fo.properties.CommonBackground;
import org.apache.fop.image.FopImage;
import org.apache.fop.image.ImageFactory;
@@ -224,10 +222,8 @@
vp.setOffset(0);
// Common Border, Padding, and Background Properties
- CommonBorderAndPadding bap =
graphic.getPropertyManager().getBorderAndPadding();
- CommonBackground bProps =
graphic.getPropertyManager().getBackgroundProps();
- TraitSetter.addBorders(vp, bap);
- TraitSetter.addBackground(vp, bProps);
+ TraitSetter.addBorders(vp, graphic.getCommonBorderPaddingBackground());
+ TraitSetter.addBackground(vp, graphic.getCommonBorderPaddingBackground());
return vp;
}
1.6 +3 -7
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.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- PageSequenceLayoutManager.java 19 Oct 2004 08:53:51 -0000 1.5
+++ PageSequenceLayoutManager.java 19 Oct 2004 21:47:15 -0000 1.6
@@ -50,8 +50,6 @@
import org.apache.fop.fo.pagination.SimplePageMaster;
import org.apache.fop.fo.pagination.StaticContent;
import org.apache.fop.fo.pagination.Title;
-import org.apache.fop.fo.properties.CommonBackground;
-import org.apache.fop.fo.properties.CommonBorderAndPadding;
import org.apache.fop.fo.properties.CommonMarginBlock;
import java.util.ArrayList;
@@ -846,10 +844,8 @@
*/
private void setRegionViewportTraits(Region r, RegionViewport rv) {
// Common Border, Padding, and Background Properties
- CommonBorderAndPadding bap = r.getPropertyManager().getBorderAndPadding();
- CommonBackground bProps = r.getPropertyManager().getBackgroundProps();
- TraitSetter.addBorders(rv, bap);
- TraitSetter.addBackground(rv, bProps);
+ TraitSetter.addBorders(rv, r.getCommonBorderPaddingBackground());
+ TraitSetter.addBackground(rv, r.getCommonBorderPaddingBackground());
}
private RegionReference makeRegionBodyReferenceArea(Region r,
1.9 +31 -32 xml-fop/src/java/org/apache/fop/layoutmgr/TraitSetter.java
Index: TraitSetter.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/TraitSetter.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- TraitSetter.java 16 Jun 2004 21:29:11 -0000 1.8
+++ TraitSetter.java 19 Oct 2004 21:47:15 -0000 1.9
@@ -18,13 +18,12 @@
package org.apache.fop.layoutmgr;
-import org.apache.fop.fo.properties.CommonBorderAndPadding;
import org.apache.fop.traits.BorderProps;
import org.apache.fop.traits.LayoutProps;
import org.apache.fop.area.Area;
import org.apache.fop.area.Trait;
-import org.apache.fop.fo.properties.CommonBackground;
import org.apache.fop.fo.properties.CommonMarginBlock;
+import org.apache.fop.fo.properties.CommonBorderPaddingBackground;
/**
* This is a helper class used for setting common traits on areas.
@@ -37,39 +36,39 @@
* @param bpProps border and padding properties
*/
public static void setBorderPaddingTraits(Area area,
- CommonBorderAndPadding bpProps, boolean bNotFirst, boolean bNotLast) {
+ CommonBorderPaddingBackground bpProps, boolean bNotFirst, boolean
bNotLast) {
int iBP;
- iBP = bpProps.getPadding(CommonBorderAndPadding.START, bNotFirst);
+ iBP = bpProps.getPadding(CommonBorderPaddingBackground.START, bNotFirst);
if (iBP > 0) {
//area.addTrait(new Trait(Trait.PADDING_START, new Integer(iBP)));
area.addTrait(Trait.PADDING_START, new Integer(iBP));
}
- iBP = bpProps.getPadding(CommonBorderAndPadding.END, bNotLast);
+ iBP = bpProps.getPadding(CommonBorderPaddingBackground.END, bNotLast);
if (iBP > 0) {
//area.addTrait(new Trait(Trait.PADDING_END, new Integer(iBP)));
area.addTrait(Trait.PADDING_END, new Integer(iBP));
}
- iBP = bpProps.getPadding(CommonBorderAndPadding.BEFORE, false);
+ iBP = bpProps.getPadding(CommonBorderPaddingBackground.BEFORE, false);
if (iBP > 0) {
// area.addTrait(new Trait(Trait.PADDING_BEFORE, new Integer(iBP)));
area.addTrait(Trait.PADDING_BEFORE, new Integer(iBP));
}
- iBP = bpProps.getPadding(CommonBorderAndPadding.AFTER, false);
+ iBP = bpProps.getPadding(CommonBorderPaddingBackground.AFTER, false);
if (iBP > 0) {
//area.addTrait(new Trait(Trait.PADDING_AFTER, new Integer(iBP)));
area.addTrait(Trait.PADDING_AFTER, new Integer(iBP));
}
addBorderTrait(area, bpProps, bNotFirst,
- CommonBorderAndPadding.START, Trait.BORDER_START);
+ CommonBorderPaddingBackground.START, Trait.BORDER_START);
- addBorderTrait(area, bpProps, bNotLast, CommonBorderAndPadding.END,
+ addBorderTrait(area, bpProps, bNotLast, CommonBorderPaddingBackground.END,
Trait.BORDER_END);
- addBorderTrait(area, bpProps, false, CommonBorderAndPadding.BEFORE,
+ addBorderTrait(area, bpProps, false, CommonBorderPaddingBackground.BEFORE,
Trait.BORDER_BEFORE);
- addBorderTrait(area, bpProps, false, CommonBorderAndPadding.AFTER,
+ addBorderTrait(area, bpProps, false, CommonBorderPaddingBackground.AFTER,
Trait.BORDER_AFTER);
}
@@ -79,7 +78,7 @@
* @param bpProps border and padding properties
*/
private static void addBorderTrait(Area area,
- CommonBorderAndPadding bpProps,
+ CommonBorderPaddingBackground bpProps,
boolean bDiscard, int iSide,
Object oTrait) {
int iBP = bpProps.getBorderWidth(iSide, bDiscard);
@@ -101,46 +100,46 @@
* @param curBlock area to set the traits on
* @param bordProps border properties
*/
- public static void addBorders(Area curBlock, CommonBorderAndPadding bordProps) {
- BorderProps bps = getBorderProps(bordProps, CommonBorderAndPadding.BEFORE);
+ public static void addBorders(Area curBlock, CommonBorderPaddingBackground
bordProps) {
+ BorderProps bps = getBorderProps(bordProps,
CommonBorderPaddingBackground.BEFORE);
if (bps.width != 0) {
curBlock.addTrait(Trait.BORDER_BEFORE, bps);
}
- bps = getBorderProps(bordProps, CommonBorderAndPadding.AFTER);
+ bps = getBorderProps(bordProps, CommonBorderPaddingBackground.AFTER);
if (bps.width != 0) {
curBlock.addTrait(Trait.BORDER_AFTER, bps);
}
- bps = getBorderProps(bordProps, CommonBorderAndPadding.START);
+ bps = getBorderProps(bordProps, CommonBorderPaddingBackground.START);
if (bps.width != 0) {
curBlock.addTrait(Trait.BORDER_START, bps);
}
- bps = getBorderProps(bordProps, CommonBorderAndPadding.END);
+ bps = getBorderProps(bordProps, CommonBorderPaddingBackground.END);
if (bps.width != 0) {
curBlock.addTrait(Trait.BORDER_END, bps);
}
- int padding = bordProps.getPadding(CommonBorderAndPadding.START, false);
+ int padding = bordProps.getPadding(CommonBorderPaddingBackground.START,
false);
if (padding != 0) {
curBlock.addTrait(Trait.PADDING_START, new java.lang.Integer(padding));
}
- padding = bordProps.getPadding(CommonBorderAndPadding.END, false);
+ padding = bordProps.getPadding(CommonBorderPaddingBackground.END, false);
if (padding != 0) {
curBlock.addTrait(Trait.PADDING_END, new java.lang.Integer(padding));
}
- padding = bordProps.getPadding(CommonBorderAndPadding.BEFORE, false);
+ padding = bordProps.getPadding(CommonBorderPaddingBackground.BEFORE, false);
if (padding != 0) {
curBlock.addTrait(Trait.PADDING_BEFORE, new java.lang.Integer(padding));
}
- padding = bordProps.getPadding(CommonBorderAndPadding.AFTER, false);
+ padding = bordProps.getPadding(CommonBorderPaddingBackground.AFTER, false);
if (padding != 0) {
curBlock.addTrait(Trait.PADDING_AFTER, new java.lang.Integer(padding));
}
}
- private static BorderProps getBorderProps(CommonBorderAndPadding bordProps, int
side) {
+ private static BorderProps getBorderProps(CommonBorderPaddingBackground
bordProps, int side) {
BorderProps bps;
bps = new BorderProps(bordProps.getBorderStyle(side),
bordProps.getBorderWidth(side, false),
@@ -155,18 +154,18 @@
* @param curBlock the current block
* @param backProps the background properties
*/
- public static void addBackground(Area curBlock, CommonBackground backProps) {
+ public static void addBackground(Area curBlock, CommonBorderPaddingBackground
backProps) {
Trait.Background back = new Trait.Background();
- back.setColor(backProps.backColor);
+ back.setColor(backProps.backgroundColor);
- if (backProps.backImage != null) {
- back.setURL(backProps.backImage);
- back.setRepeat(backProps.backRepeat);
- if (backProps.backPosHorizontal != null) {
- back.setHoriz(backProps.backPosHorizontal.getValue());
+ if (backProps.backgroundImage != null) {
+ back.setURL(backProps.backgroundImage);
+ back.setRepeat(backProps.backgroundRepeat);
+ if (backProps.backgroundPositionHorizontal != null) {
+ back.setHoriz(backProps.backgroundPositionHorizontal.getValue());
}
- if (backProps.backPosVertical != null) {
- back.setVertical(backProps.backPosVertical.getValue());
+ if (backProps.backgroundPositionVertical != null) {
+ back.setVertical(backProps.backgroundPositionVertical.getValue());
}
}
@@ -183,7 +182,7 @@
* @param marginProps the margin properties.
*/
public static void addMargins(Area curBlock,
- CommonBorderAndPadding bpProps,
+ CommonBorderPaddingBackground bpProps,
CommonMarginBlock marginProps) {
int spaceStart = marginProps.startIndent
- bpProps.getBorderStartWidth(false)
1.9 +21 -13 xml-fop/src/java/org/apache/fop/layoutmgr/list/Item.java
Index: Item.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/list/Item.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- Item.java 22 Sep 2004 08:25:16 -0000 1.8
+++ Item.java 19 Oct 2004 21:47:15 -0000 1.9
@@ -18,8 +18,8 @@
package org.apache.fop.layoutmgr.list;
-import org.apache.fop.fo.FObj;
-import org.apache.fop.fo.PropertyManager;
+import org.apache.fop.fo.flow.ListItemBody;
+import org.apache.fop.fo.flow.ListItemLabel;
import org.apache.fop.layoutmgr.BlockStackingLayoutManager;
import org.apache.fop.layoutmgr.LayoutManager;
import org.apache.fop.layoutmgr.LeafPosition;
@@ -28,12 +28,9 @@
import org.apache.fop.layoutmgr.PositionIterator;
import org.apache.fop.layoutmgr.BreakPossPosIter;
import org.apache.fop.layoutmgr.Position;
-import org.apache.fop.layoutmgr.TraitSetter;
import org.apache.fop.area.Area;
import org.apache.fop.area.Block;
import org.apache.fop.traits.MinOptMax;
-import org.apache.fop.fo.properties.CommonBorderAndPadding;
-import org.apache.fop.fo.properties.CommonBackground;
import java.util.ArrayList;
import java.util.List;
@@ -44,9 +41,6 @@
*/
public class Item extends BlockStackingLayoutManager {
- private CommonBorderAndPadding borderProps = null;
- private CommonBackground backgroundProps;
-
private Block curBlockArea;
private List childBreaks = new ArrayList();
@@ -57,17 +51,23 @@
/**
* Create a new Cell layout manager.
*/
- public Item(FObj node) {
+ public Item(ListItemLabel node) {
+ super(node);
+ fobj = node;
+ }
+
+ /**
+ * Create a new Cell layout manager.
+ */
+ public Item(ListItemBody node) {
super(node);
+ fobj = node;
}
/**
* @see org.apache.fop.layoutmgr.AbstractLayoutManager#initProperties()
*/
protected void initProperties() {
- PropertyManager pm = fobj.getPropertyManager();
- borderProps = pm.getBorderAndPadding();
- backgroundProps = pm.getBackgroundProps();
}
/**
@@ -167,7 +167,13 @@
public void addAreas(PositionIterator parentIter,
LayoutContext layoutContext) {
getParentArea(null);
- addID();
+
+ int nameId = fobj.getNameId();
+ if (nameId == FO_LIST_ITEM_LABEL) {
+ addID(((ListItemLabel) fobj).getId());
+ } else if (nameId == FO_LIST_ITEM_BODY) {
+ addID(((ListItemBody) fobj).getId());
+ }
LayoutManager childLM;
int iStartPos = 0;
@@ -184,12 +190,14 @@
}
}
+ /*
if (borderProps != null) {
TraitSetter.addBorders(curBlockArea, borderProps);
}
if (backgroundProps != null) {
TraitSetter.addBackground(curBlockArea, backgroundProps);
}
+ */
flush();
1.8 +7 -23
xml-fop/src/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java
Index: ListBlockLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/list/ListBlockLayoutManager.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ListBlockLayoutManager.java 26 May 2004 04:22:40 -0000 1.7
+++ ListBlockLayoutManager.java 19 Oct 2004 21:47:15 -0000 1.8
@@ -18,8 +18,7 @@
package org.apache.fop.layoutmgr.list;
-import org.apache.fop.fo.FObj;
-import org.apache.fop.fo.PropertyManager;
+import org.apache.fop.fo.flow.ListBlock;
import org.apache.fop.layoutmgr.BlockStackingLayoutManager;
import org.apache.fop.layoutmgr.LayoutManager;
import org.apache.fop.layoutmgr.LeafPosition;
@@ -32,8 +31,6 @@
import org.apache.fop.area.Area;
import org.apache.fop.area.Block;
import org.apache.fop.traits.MinOptMax;
-import org.apache.fop.fo.properties.CommonBorderAndPadding;
-import org.apache.fop.fo.properties.CommonBackground;
import java.util.ArrayList;
import java.util.List;
@@ -44,9 +41,8 @@
* the list block area..
*/
public class ListBlockLayoutManager extends BlockStackingLayoutManager {
- private CommonBorderAndPadding borderProps = null;
- private CommonBackground backgroundProps;
-
+ private ListBlock fobj;
+
private Block curBlockArea;
private List bodyBreaks = new ArrayList();
@@ -63,17 +59,9 @@
* Create a new table layout manager.
*
*/
- public ListBlockLayoutManager(FObj node) {
+ public ListBlockLayoutManager(ListBlock node) {
super(node);
- }
-
- /**
- * @see org.apache.fop.layoutmgr.AbstractLayoutManager#initProperties()
- */
- protected void initProperties() {
- PropertyManager pm = fobj.getPropertyManager();
- borderProps = pm.getBorderAndPadding();
- backgroundProps = pm.getBackgroundProps();
+ fobj = node;
}
/**
@@ -178,12 +166,8 @@
}
}
- if (borderProps != null) {
- TraitSetter.addBorders(curBlockArea, borderProps);
- }
- if (backgroundProps != null) {
- TraitSetter.addBackground(curBlockArea, backgroundProps);
- }
+ TraitSetter.addBorders(curBlockArea,
fobj.getCommonBorderPaddingBackground());
+ TraitSetter.addBackground(curBlockArea,
fobj.getCommonBorderPaddingBackground());
flush();
1.15 +0 -14
xml-fop/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java
Index: ListItemLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/list/ListItemLayoutManager.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ListItemLayoutManager.java 22 Sep 2004 08:25:16 -0000 1.14
+++ ListItemLayoutManager.java 19 Oct 2004 21:47:15 -0000 1.15
@@ -21,7 +21,6 @@
import org.apache.fop.fo.flow.ListItem;
import org.apache.fop.fo.flow.ListItemBody;
import org.apache.fop.fo.flow.ListItemLabel;
-import org.apache.fop.fo.PropertyManager;
import org.apache.fop.layoutmgr.BlockStackingLayoutManager;
import org.apache.fop.layoutmgr.LayoutManager;
import org.apache.fop.layoutmgr.LeafPosition;
@@ -33,8 +32,6 @@
import org.apache.fop.area.Area;
import org.apache.fop.area.Block;
import org.apache.fop.traits.MinOptMax;
-import org.apache.fop.fo.properties.CommonBorderAndPadding;
-import org.apache.fop.fo.properties.CommonBackground;
import java.util.Iterator;
import java.util.ArrayList;
@@ -52,8 +49,6 @@
private List cellList = null;
private int listItemHeight;
- private CommonBorderAndPadding borderProps = null;
- private CommonBackground backgroundProps;
private class ItemPosition extends LeafPosition {
protected List cellBreaks;
@@ -71,15 +66,6 @@
super(node);
setLabel(node.getLabel());
setBody(node.getBody());
- }
-
- /**
- * @see org.apache.fop.layoutmgr.AbstractLayoutManager#initProperties()
- */
- protected void initProperties() {
- PropertyManager pm = fobj.getPropertyManager();
- borderProps = pm.getBorderAndPadding();
- backgroundProps = pm.getBackgroundProps();
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
