bckfnn 2004/10/19 06:36:46
Modified: src/java/org/apache/fop/layoutmgr
BlockContainerLayoutManager.java
ExternalGraphicLayoutManager.java
InstreamForeignObjectLM.java
LeaderLayoutManager.java
Log:
Second phase of performance improvement.
- Only get base properties from property list.
PR: 31699
Revision Changes Path
1.24 +2 -2
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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- BlockContainerLayoutManager.java 22 Sep 2004 08:22:14 -0000 1.23
+++ BlockContainerLayoutManager.java 19 Oct 2004 13:36:46 -0000 1.24
@@ -85,9 +85,9 @@
marginProps = propManager.getMarginProps();
borderProps = propManager.getBorderAndPadding();
height = fobj.getPropertyList().get(
- PR_BLOCK_PROGRESSION_DIMENSION | CP_OPTIMUM).getLength();
+
PR_BLOCK_PROGRESSION_DIMENSION).getLengthRange().getOptimum().getLength();
width = fobj.getPropertyList().get(
- PR_INLINE_PROGRESSION_DIMENSION | CP_OPTIMUM).getLength();
+
PR_INLINE_PROGRESSION_DIMENSION).getLengthRange().getOptimum().getLength();
}
public void setOverflow(int of) {
1.7 +2 -2
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ExternalGraphicLayoutManager.java 22 Sep 2004 13:19:48 -0000 1.6
+++ ExternalGraphicLayoutManager.java 19 Oct 2004 13:36:46 -0000 1.7
@@ -87,7 +87,7 @@
viewWidth = ipd.getValue();
}
}
- Length bpd = graphic.getPropertyList().get(PR_BLOCK_PROGRESSION_DIMENSION |
CP_OPTIMUM).getLength();
+ Length bpd =
graphic.getPropertyList().get(PR_BLOCK_PROGRESSION_DIMENSION).getLengthRange().getOptimum().getLength();
if (!bpd.isAuto()) {
viewHeight = bpd.getValue();
} else {
1.6 +3 -3
xml-fop/src/java/org/apache/fop/layoutmgr/InstreamForeignObjectLM.java
Index: InstreamForeignObjectLM.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/InstreamForeignObjectLM.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- InstreamForeignObjectLM.java 22 Sep 2004 08:24:32 -0000 1.5
+++ InstreamForeignObjectLM.java 19 Oct 2004 13:36:46 -0000 1.6
@@ -77,7 +77,7 @@
// this property does not apply when the line-height applies
// isn't the block-progression-dimension always in the same
// direction as the line height?
- len = ifoNode.getProperty(PR_BLOCK_PROGRESSION_DIMENSION |
CP_OPTIMUM).getLength();
+ len =
ifoNode.getProperty(PR_BLOCK_PROGRESSION_DIMENSION).getLengthRange().getOptimum().getLength();
if (!len.isAuto()) {
bpd = len.getValue();
} else {
@@ -88,7 +88,7 @@
}
}
- len = ifoNode.getProperty(PR_INLINE_PROGRESSION_DIMENSION |
CP_OPTIMUM).getLength();
+ len =
ifoNode.getProperty(PR_INLINE_PROGRESSION_DIMENSION).getLengthRange().getOptimum().getLength();
if (!len.isAuto()) {
ipd = len.getValue();
} else {
1.7 +4 -4
xml-fop/src/java/org/apache/fop/layoutmgr/LeaderLayoutManager.java
Index: LeaderLayoutManager.java
===================================================================
RCS file:
/home/cvs/xml-fop/src/java/org/apache/fop/layoutmgr/LeaderLayoutManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- LeaderLayoutManager.java 22 Sep 2004 08:24:32 -0000 1.6
+++ LeaderLayoutManager.java 19 Oct 2004 13:36:46 -0000 1.7
@@ -61,9 +61,9 @@
private MinOptMax getLeaderAllocIPD(int ipd) {
// length of the leader
- int opt = ldrNode.getLength(PR_LEADER_LENGTH | CP_OPTIMUM, ipd);
- int min = ldrNode.getLength(PR_LEADER_LENGTH | CP_MINIMUM, ipd);
- int max = ldrNode.getLength(PR_LEADER_LENGTH | CP_MAXIMUM, ipd);
+ int opt =
ldrNode.getLength(ldrNode.getProperty(PR_LEADER_LENGTH).getLengthRange().getOptimum().getLength(),
ipd);
+ int min =
ldrNode.getLength(ldrNode.getProperty(PR_LEADER_LENGTH).getLengthRange().getMinimum().getLength(),
ipd);
+ int max =
ldrNode.getLength(ldrNode.getProperty(PR_LEADER_LENGTH).getLengthRange().getMaximum().getLength(),
ipd);
return new MinOptMax(min, opt, max);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
