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 vh...@apache.org on 2007/07/06 16:29:11 UTC
svn commit: r553895 -
/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableStepper.java
Author: vhennebert
Date: Fri Jul 6 07:29:10 2007
New Revision: 553895
URL: http://svn.apache.org/viewvc?view=rev&rev=553895
Log:
Cleaner way to handle border-separation in ActiveCell
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableStepper.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableStepper.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableStepper.java?view=diff&rev=553895&r1=553894&r2=553895
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableStepper.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableStepper.java Fri Jul 6 07:29:10 2007
@@ -63,10 +63,8 @@
private int paddingAfter;
private boolean keepWithNextSignal;
private int lastPenaltyLength;
- private TableLayoutManager tableLM;
ActiveCell(PrimaryGridUnit pgu, EffRow row, int rowIndex, EffRow[] rowGroup, TableLayoutManager tableLM) {
- this.tableLM = tableLM;
this.pgu = pgu;
boolean makeBoxForWholeRow = false;
if (row.getExplicitHeight().min > 0) {
@@ -96,8 +94,8 @@
// }
}
if (pgu.getTable().isSeparateBorderModel()) {
- borderBefore = pgu.getBorders().getBorderBeforeWidth(false);
- borderAfter = pgu.getBorders().getBorderAfterWidth(false);
+ borderBefore = pgu.getBorders().getBorderBeforeWidth(false) + tableLM.getHalfBorderSeparationBPD();
+ borderAfter = pgu.getBorders().getBorderAfterWidth(false) + tableLM.getHalfBorderSeparationBPD();
} else {
borderBefore = pgu.getHalfMaxBeforeBorderWidth();
borderAfter = pgu.getHalfMaxAfterBorderWidth();
@@ -123,7 +121,7 @@
return rowIndex == startRow + pgu.getCell().getNumberRowsSpanned() - 1;
}
- int getRemainingHeight(int activeRowIndex, int halfBorderSeparationBPD, EffRow[] rowGroup) {
+ int getRemainingHeight(int activeRowIndex, EffRow[] rowGroup) {
if (end == elementList.size() - 1) {
return 0;
}
@@ -132,7 +130,6 @@
}
int len = width;
if (len > 0) {
- len += 2 * halfBorderSeparationBPD;
len += borderBefore + borderAfter;
len += paddingBefore + paddingAfter;
}
@@ -180,18 +177,17 @@
return 0;
} else {
return baseWidth + width + borderBefore + borderAfter + paddingBefore
- + paddingAfter + 2 * tableLM.getHalfBorderSeparationBPD();
+ + paddingAfter;
}
}
boolean signalMinStep(int minStep) {
- int len = baseWidth + width + borderBefore + borderAfter + paddingBefore + paddingAfter
- + 2 * tableLM.getHalfBorderSeparationBPD();
+ int len = baseWidth + width + borderBefore + borderAfter + paddingBefore + paddingAfter;
if (len > minStep) {
width = backupWidth;
end = start - 1;
return baseWidth + borderBefore + borderAfter + paddingBefore
- + paddingAfter + 2 * tableLM.getHalfBorderSeparationBPD() + width > minStep;
+ + paddingAfter + width > minStep;
} else {
return false;
}
@@ -270,7 +266,7 @@
if (!rowBacktrackForLastStep) {
for (Iterator iter = activeCells.iterator(); iter.hasNext();) {
maxW = Math.max(maxW, ((ActiveCell) iter.next()).getRemainingHeight(activeRowIndex,
- getTableLM().getHalfBorderSeparationBPD(), rowGroup));
+ rowGroup));
}
}
for (int i = activeRowIndex + (rowBacktrackForLastStep ? 0 : 1); i < rowGroup.length; i++) {
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org