Author: vhennebert
Date: Thu Jan 24 08:51:53 2008
New Revision: 614924
URL: http://svn.apache.org/viewvc?rev=614924&view=rev
Log:
Removed no longer needed reference to TableColumn in GridUnit
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/EmptyGridUnit.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/FixedColRowGroupBuilder.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/GridUnit.java
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/PrimaryGridUnit.java
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/EmptyGridUnit.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/EmptyGridUnit.java?rev=614924&r1=614923&r2=614924&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/EmptyGridUnit.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/EmptyGridUnit.java
Thu Jan 24 08:51:53 2008
@@ -33,7 +33,7 @@
* @param colIndex column index, 0-based
*/
EmptyGridUnit(Table table, TableRow row, int colIndex) {
- super(table, row, table.getColumn(colIndex), 0, 0);
+ super(table, row, 0, 0);
}
/** [EMAIL PROTECTED] */
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/FixedColRowGroupBuilder.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/FixedColRowGroupBuilder.java?rev=614924&r1=614923&r2=614924&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/FixedColRowGroupBuilder.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/FixedColRowGroupBuilder.java
Thu Jan 24 08:51:53 2008
@@ -79,15 +79,14 @@
rows.add(effRow);
}
int columnIndex = cell.getColumnNumber() - 1;
- PrimaryGridUnit pgu = new PrimaryGridUnit(cell, currentTableRow,
- table.getColumn(columnIndex), columnIndex);
+ PrimaryGridUnit pgu = new PrimaryGridUnit(cell, currentTableRow,
columnIndex);
List row = (List) rows.get(currentRowIndex);
row.set(columnIndex, pgu);
// TODO
GridUnit[] cellRow = new GridUnit[cell.getNumberColumnsSpanned()];
cellRow[0] = pgu;
for (int j = 1; j < cell.getNumberColumnsSpanned(); j++) {
- GridUnit gu = new GridUnit(pgu, currentTableRow,
table.getColumn(columnIndex + j), j, 0);
+ GridUnit gu = new GridUnit(pgu, currentTableRow, j, 0);
row.set(columnIndex + j, gu);
cellRow[j] = gu;
}
@@ -96,8 +95,7 @@
row = (List) rows.get(currentRowIndex + i);
cellRow = new GridUnit[cell.getNumberColumnsSpanned()];
for (int j = 0; j < cell.getNumberColumnsSpanned(); j++) {
- GridUnit gu = new GridUnit(pgu, currentTableRow,
table.getColumn(columnIndex + j),
- j, i);
+ GridUnit gu = new GridUnit(pgu, currentTableRow, j, i);
row.set(columnIndex + j, gu);
cellRow[j] = gu;
}
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/GridUnit.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/GridUnit.java?rev=614924&r1=614923&r2=614924&view=diff
==============================================================================
--- xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/GridUnit.java
(original)
+++ xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/GridUnit.java
Thu Jan 24 08:51:53 2008
@@ -56,9 +56,6 @@
/** Table row occupied by this grid unit (may be null). */
private TableRow row;
- /** Table column that this grid unit belongs to */
- private TableColumn column;
-
/** index of grid unit within cell in column direction */
private int colSpanIndex;
@@ -80,13 +77,11 @@
*
* @param table the containing table
* @param row the table-row element this grid unit belongs to (if any)
- * @param column table column this grid unit belongs to
* @param colSpanIndex index of this grid unit in the span, in column
direction
* @param rowSpanIndex index of this grid unit in the span, in row
direction
*/
- protected GridUnit(Table table, TableRow row, TableColumn column, int
colSpanIndex,
- int rowSpanIndex) {
- this(row, column, colSpanIndex, rowSpanIndex);
+ protected GridUnit(Table table, TableRow row, int colSpanIndex, int
rowSpanIndex) {
+ this(row, colSpanIndex, rowSpanIndex);
setBorders(table);
}
@@ -95,13 +90,11 @@
*
* @param cell table cell which occupies this grid unit
* @param row the table-row element this grid unit belongs to (if any)
- * @param column table column this grid unit belongs to
* @param colSpanIndex index of this grid unit in the span, in column
direction
* @param rowSpanIndex index of this grid unit in the span, in row
direction
*/
- protected GridUnit(TableCell cell, TableRow row, TableColumn column, int
colSpanIndex,
- int rowSpanIndex) {
- this(row, column, colSpanIndex, rowSpanIndex);
+ protected GridUnit(TableCell cell, TableRow row, int colSpanIndex, int
rowSpanIndex) {
+ this(row, colSpanIndex, rowSpanIndex);
this.cell = cell;
setBorders(cell.getTable());
}
@@ -111,19 +104,16 @@
*
* @param primary the before-start grid unit of the cell containing this
grid unit
* @param row the table-row element this grid unit belongs to (if any)
- * @param column table column this grid unit belongs to
* @param colSpanIndex index of this grid unit in the span, in column
direction
* @param rowSpanIndex index of this grid unit in the span, in row
direction
*/
- GridUnit(PrimaryGridUnit primary, TableRow row, TableColumn column, int
colSpanIndex,
- int rowSpanIndex) {
- this(primary.getCell(), row, column, colSpanIndex, rowSpanIndex);
+ GridUnit(PrimaryGridUnit primary, TableRow row, int colSpanIndex, int
rowSpanIndex) {
+ this(primary.getCell(), row, colSpanIndex, rowSpanIndex);
this.primary = primary;
}
- private GridUnit(TableRow row, TableColumn column, int colSpanIndex, int
rowSpanIndex) {
+ private GridUnit(TableRow row, int colSpanIndex, int rowSpanIndex) {
this.row = row;
- this.column = column;
this.colSpanIndex = colSpanIndex;
this.rowSpanIndex = rowSpanIndex;
}
@@ -163,10 +153,6 @@
public TableCell getCell() {
return cell;
- }
-
- public TableColumn getColumn() {
- return column;
}
/**
Modified:
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/PrimaryGridUnit.java
URL:
http://svn.apache.org/viewvc/xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/PrimaryGridUnit.java?rev=614924&r1=614923&r2=614924&view=diff
==============================================================================
---
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/PrimaryGridUnit.java
(original)
+++
xmlgraphics/fop/trunk/src/java/org/apache/fop/fo/flow/table/PrimaryGridUnit.java
Thu Jan 24 08:51:53 2008
@@ -56,14 +56,13 @@
*
* @param cell table cell which occupies this grid unit
* @param row the table-row element this grid unit belongs to (if any)
- * @param column table column this grid unit belongs to
* @param colIndex index of the column this grid unit belongs to,
zero-based
*/
- PrimaryGridUnit(TableCell cell, TableRow row, TableColumn column, int
colIndex) {
- super(cell, row, column, 0, 0);
+ PrimaryGridUnit(TableCell cell, TableRow row, int colIndex) {
+ super(cell, row, 0, 0);
this.colIndex = colIndex;
- this.isSeparateBorderModel =
column.getTable().isSeparateBorderModel(); // TODO
- this.halfBorderSeparationBPD =
column.getTable().getBorderSeparation().getBPD().getLength()
+ this.isSeparateBorderModel = cell.getTable().isSeparateBorderModel();
// TODO
+ this.halfBorderSeparationBPD =
cell.getTable().getBorderSeparation().getBPD().getLength()
.getValue() / 2; // TODO
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
