Author: vhennebert
Date: Thu Jan 24 03:32:07 2008
New Revision: 614845
URL: http://svn.apache.org/viewvc?rev=614845&view=rev
Log:
Removed the no longer needed maxColumnCount parameter
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/RowGroupLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableStepper.java
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/RowGroupLayoutManager.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/RowGroupLayoutManager.java?rev=614845&r1=614844&r2=614845&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/RowGroupLayoutManager.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/RowGroupLayoutManager.java
Thu Jan 24 03:32:07 2008
@@ -136,7 +136,6 @@
MinOptMax[] rowHeights = new MinOptMax[rowGroup.length];
MinOptMax[] explicitRowHeights = new MinOptMax[rowGroup.length];
EffRow row;
- int maxColumnCount = 0;
List pgus = new java.util.ArrayList(); //holds a list of a row's
primary grid units
for (int rgi = 0; rgi < rowGroup.length; rgi++) {
row = rowGroup[rgi];
@@ -151,8 +150,6 @@
// The BPD of the biggest cell in the row
int maxCellBPD = 0;
for (int j = 0; j < row.getGridUnits().size(); j++) {
- assert maxColumnCount == 0 || maxColumnCount ==
row.getGridUnits().size();
- maxColumnCount = Math.max(maxColumnCount,
row.getGridUnits().size());
GridUnit gu = row.getGridUnit(j);
if ((gu.isPrimary() || (gu.getColSpanIndex() == 0 &&
gu.isLastGridUnitRowSpan()))
&& !gu.isEmpty()) {
@@ -281,8 +278,8 @@
log.debug(" height=" + rowHeights[i] + " explicit=" +
explicitRowHeights[i]);
}
}
- LinkedList returnedList =
tableStepper.getCombinedKnuthElementsForRowGroup(
- context, rowGroup, maxColumnCount, bodyType);
+ LinkedList returnedList =
tableStepper.getCombinedKnuthElementsForRowGroup(context,
+ rowGroup, bodyType);
if (returnedList != null) {
returnList.addAll(returnedList);
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java?rev=614845&r1=614844&r2=614845&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/layoutmgr/table/TableContentLayoutManager.java
Thu Jan 24 03:32:07 2008
@@ -69,7 +69,7 @@
private int startXOffset;
private int usedBPD;
- private TableStepper stepper = new TableStepper(this);
+ private TableStepper stepper;
/**
* Main constructor
@@ -85,6 +85,7 @@
if (table.getTableFooter() != null) {
footerIter = new TableRowIterator(table, TableRowIterator.FOOTER);
}
+ stepper = new TableStepper(this);
}
/**
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?rev=614845&r1=614844&r2=614845&view=diff
==============================================================================
---
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
Thu Jan 24 03:32:07 2008
@@ -65,15 +65,16 @@
*/
public TableStepper(TableContentLayoutManager tclm) {
this.tclm = tclm;
+ this.columnCount = tclm.getTableLM().getTable().getNumberOfColumns();
}
/**
* Initializes the fields of this instance to handle a new row group.
*
- * @param columnCount number of columns the row group has
+ * @param rowGroup the new row group to handle
*/
- private void setup(int columnCount) {
- this.columnCount = columnCount;
+ private void setup(EffRow[] rowGroup) {
+ this.rowGroup = rowGroup;
this.activeRowIndex = 0;
this.previousRowsLength = 0;
}
@@ -143,15 +144,12 @@
* Creates the combined element list for a row group.
* @param context Active LayoutContext
* @param rowGroup the row group
- * @param maxColumnCount the maximum number of columns to expect
* @param bodyType Indicates what type of body is processed (body, header
or footer)
* @return the combined element list
*/
- public LinkedList getCombinedKnuthElementsForRowGroup(
- LayoutContext context,
- EffRow[] rowGroup, int maxColumnCount, int bodyType) {
- this.rowGroup = rowGroup;
- setup(maxColumnCount);
+ public LinkedList getCombinedKnuthElementsForRowGroup(LayoutContext
context, EffRow[] rowGroup,
+ int bodyType) {
+ setup(rowGroup);
initializeElementLists();
calcTotalHeight();
@@ -171,7 +169,7 @@
boolean forcedBreak = false;
int breakClass = -1;
//Put all involved grid units into a list
- List cellParts = new java.util.ArrayList(maxColumnCount);
+ List cellParts = new java.util.ArrayList(columnCount);
for (Iterator iter = activeCells.iterator(); iter.hasNext();) {
ActiveCell activeCell = (ActiveCell) iter.next();
CellPart part = activeCell.createCellPart();
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
