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/12/18 18:01:47 UTC
svn commit: r605253 -
/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/RowPainter.java
Author: vhennebert
Date: Tue Dec 18 09:01:45 2007
New Revision: 605253
URL: http://svn.apache.org/viewvc?rev=605253&view=rev
Log:
Renamed firstRow into firstRowIndex and moved its initialization into handeTableContentPosition
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/RowPainter.java
Modified: xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/RowPainter.java
URL: http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/RowPainter.java?rev=605253&r1=605252&r2=605253&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/RowPainter.java (original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/RowPainter.java Tue Dec 18 09:01:45 2007
@@ -50,7 +50,7 @@
/**
* Index of the first row of the current part present on the current page.
*/
- private int firstRow;
+ private int firstRowIndex;
/**
* Keeps track of the y-offsets of each row on a page.
* This is particularly needed for spanned cells where you need to know the y-offset
@@ -86,7 +86,7 @@
this.start = new int[colCount];
this.end = new int[colCount];
this.partBPD = new int[colCount];
- this.firstRow = -1;
+ this.firstRowIndex = -1;
Arrays.fill(end, -1);
}
@@ -109,6 +109,9 @@
}
rowFO = tcpos.row.getTableRow();
lastRow = tcpos.row;
+ if (firstRowIndex < 0) {
+ firstRowIndex = lastRow.getIndex();
+ }
Iterator partIter = tcpos.cellParts.iterator();
//Iterate over all grid units in the current step
while (partIter.hasNext()) {
@@ -289,7 +292,7 @@
len += pgu.getHalfMaxBeforeBorderWidth();
len += pgu.getHalfMaxAfterBorderWidth();
}
- int startRow = Math.max(pgu.getStartRow(), firstRow);
+ int startRow = Math.max(pgu.getStartRow(), firstRowIndex);
Integer storedOffset = (Integer)rowOffsets.get(new Integer(startRow));
int effYOffset;
if (storedOffset != null) {
@@ -303,11 +306,8 @@
private void addAreasForCell(PrimaryGridUnit pgu, int startPos, int endPos,
EffRow row, int contentHeight, int rowHeight) {
- if (firstRow < 0) {
- firstRow = row.getIndex();
- }
//Determine the first row in this sequence
- int startRowIndex = Math.max(pgu.getStartRow(), firstRow);
+ int startRowIndex = Math.max(pgu.getStartRow(), firstRowIndex);
int lastRowIndex = lastRow.getIndex();
// In collapsing-border model, if the cell spans over several columns/rows then
@@ -362,7 +362,7 @@
}
void endPart() {
- firstRow = -1;
+ firstRowIndex = -1;
rowOffsets.clear();
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: fop-commits-unsubscribe@xmlgraphics.apache.org
For additional commands, e-mail: fop-commits-help@xmlgraphics.apache.org