public final class TableRow extends Paragraph
{
- private final static char TABLE_CELL_MARK = '\u0007';
+ private static final POILogger logger = POILogFactory
+ .getLogger( TableRow.class );
- private final static short SPRM_TJC = 0x5400;
private final static short SPRM_DXAGAPHALF = (short) 0x9602;
+ private final static short SPRM_DYAROWHEIGHT = (short) 0x9407;
private final static short SPRM_FCANTSPLIT = 0x3403;
private final static short SPRM_FTABLEHEADER = 0x3404;
- private final static short SPRM_DYAROWHEIGHT = (short) 0x9407;
+ private final static short SPRM_TJC = 0x5400;
- private static final POILogger logger = POILogFactory
- .getLogger( TableRow.class );
+ private final static char TABLE_CELL_MARK = '\u0007';
+
+ private TableCell[] _cells;
+ private boolean _cellsFound = false;
int _levelNum;
private TableProperties _tprops;
- private TableCell[] _cells;
public TableRow( int startIdxInclusive, int endIdxExclusive, Table parent,
int levelNum )
_tprops = TableSprmUncompressor.uncompressTAP( _papx.toByteArray(), 2 );
_levelNum = levelNum;
+ initCells();
+ }
+
+ public boolean cantSplit()
+ {
+ return _tprops.getFCantSplit();
+ }
+
+ public BorderCode getBarBorder()
+ {
+ throw new UnsupportedOperationException( "not applicable for TableRow" );
+ }
+
+ public BorderCode getBottomBorder()
+ {
+ return _tprops.getBrcBottom();
+ }
+
+ public TableCell getCell( int index )
+ {
+ initCells();
+ return _cells[index];
+ }
+
+ public int getGapHalf()
+ {
+ return _tprops.getDxaGapHalf();
+ }
+
+ public BorderCode getHorizontalBorder()
+ {
+ return _tprops.getBrcHorizontal();
+ }
+
+ public BorderCode getLeftBorder()
+ {
+ return _tprops.getBrcLeft();
+ }
+
+ public BorderCode getRightBorder()
+ {
+ return _tprops.getBrcRight();
+ }
+
+ public int getRowHeight()
+ {
+ return _tprops.getDyaRowHeight();
+ }
+
+ public int getRowJustification()
+ {
+ return _tprops.getJc();
+ }
+
+ public BorderCode getTopBorder()
+ {
+ return _tprops.getBrcBottom();
+ }
+
+ public BorderCode getVerticalBorder()
+ {
+ return _tprops.getBrcVertical();
+ }
+
+ private void initCells()
+ {
+ if ( _cellsFound )
+ return;
+
final short expectedCellsCount = _tprops.getItcMac();
int lastCellStart = 0;
List<TableCell> cells = new ArrayList<TableCell>(
expectedCellsCount + 1 );
- for ( int p = 0; p < ( endIdxExclusive - startIdxInclusive ); p++ )
+ for ( int p = 0; p < numParagraphs(); p++ )
{
Paragraph paragraph = getParagraph( p );
String s = paragraph.text();
if ( ( ( s.length() > 0 && s.charAt( s.length() - 1 ) == TABLE_CELL_MARK ) || paragraph
.isEmbeddedCellMark() )
- && paragraph.getTableLevel() == levelNum )
+ && paragraph.getTableLevel() == _levelNum )
{
TableCellDescriptor tableCellDescriptor = _tprops.getRgtc() != null
&& _tprops.getRgtc().length > cells.size() ? _tprops
.getRgdxaCenter()[cells.size() + 1] : 0;
TableCell tableCell = new TableCell( lastCellStart, p + 1,
- this, levelNum, tableCellDescriptor, leftEdge,
+ this, _levelNum, tableCellDescriptor, leftEdge,
rightEdge - leftEdge );
cells.add( tableCell );
lastCellStart = p + 1;
}
}
- if ( lastCellStart < ( endIdxExclusive - startIdxInclusive - 1 ) )
+ if ( lastCellStart < ( numParagraphs() - 1 ) )
{
TableCellDescriptor tableCellDescriptor = _tprops.getRgtc() != null
&& _tprops.getRgtc().length > cells.size() ? _tprops
.getRgdxaCenter()[cells.size() + 1] : 0;
TableCell tableCell = new TableCell( lastCellStart,
- ( endIdxExclusive - startIdxInclusive - 1 ), this,
- levelNum, tableCellDescriptor, leftEdge, rightEdge
- - leftEdge );
+ ( numParagraphs() - 1 ), this, _levelNum,
+ tableCellDescriptor, leftEdge, rightEdge - leftEdge );
cells.add( tableCell );
}
}
_cells = cells.toArray( new TableCell[cells.size()] );
+ _cellsFound = true;
}
- public int getRowJustification()
+ public boolean isTableHeader()
{
- return _tprops.getJc();
+ return _tprops.getFTableHeader();
}
- public void setRowJustification( int jc )
+ public int numCells()
{
- _tprops.setJc( (short) jc );
- _papx.updateSprm( SPRM_TJC, (short) jc );
+ initCells();
+ return _cells.length;
}
- public int getGapHalf()
+ @Override
+ protected void reset()
{
- return _tprops.getDxaGapHalf();
+ _cellsFound = false;
}
- public void setGapHalf( int dxaGapHalf )
+ public void setCantSplit( boolean cantSplit )
{
- _tprops.setDxaGapHalf( dxaGapHalf );
- _papx.updateSprm( SPRM_DXAGAPHALF, (short) dxaGapHalf );
+ _tprops.setFCantSplit( cantSplit );
+ _papx.updateSprm( SPRM_FCANTSPLIT, (byte) ( cantSplit ? 1 : 0 ) );
}
- public int getRowHeight()
+ public void setGapHalf( int dxaGapHalf )
{
- return _tprops.getDyaRowHeight();
+ _tprops.setDxaGapHalf( dxaGapHalf );
+ _papx.updateSprm( SPRM_DXAGAPHALF, (short) dxaGapHalf );
}
public void setRowHeight( int dyaRowHeight )
_papx.updateSprm( SPRM_DYAROWHEIGHT, (short) dyaRowHeight );
}
- public boolean cantSplit()
- {
- return _tprops.getFCantSplit();
- }
-
- public void setCantSplit( boolean cantSplit )
- {
- _tprops.setFCantSplit( cantSplit );
- _papx.updateSprm( SPRM_FCANTSPLIT, (byte) ( cantSplit ? 1 : 0 ) );
- }
-
- public boolean isTableHeader()
+ public void setRowJustification( int jc )
{
- return _tprops.getFTableHeader();
+ _tprops.setJc( (short) jc );
+ _papx.updateSprm( SPRM_TJC, (short) jc );
}
public void setTableHeader( boolean tableHeader )
_papx.updateSprm( SPRM_FTABLEHEADER, (byte) ( tableHeader ? 1 : 0 ) );
}
- public int numCells()
- {
- return _cells.length;
- }
-
- public TableCell getCell( int index )
- {
- return _cells[index];
- }
-
- public BorderCode getTopBorder()
- {
- return _tprops.getBrcBottom();
- }
-
- public BorderCode getBottomBorder()
- {
- return _tprops.getBrcBottom();
- }
-
- public BorderCode getLeftBorder()
- {
- return _tprops.getBrcLeft();
- }
-
- public BorderCode getRightBorder()
- {
- return _tprops.getBrcRight();
- }
-
- public BorderCode getHorizontalBorder()
- {
- return _tprops.getBrcHorizontal();
- }
-
- public BorderCode getVerticalBorder()
- {
- return _tprops.getBrcVertical();
- }
-
- public BorderCode getBarBorder()
- {
- throw new UnsupportedOperationException( "not applicable for TableRow" );
- }
-
}
assertFalse( docText.contains( "1-15" ) );
}
- private static void insertTable(int rows, int columns) {
+ private static void insertTable( int rows, int columns )
+ {
// POI apparently can't create a document from scratch,
// so we need an existing empty dummy document
- HWPFDocument doc = HWPFTestDataSamples.openSampleFile("empty.doc");
+ HWPFDocument doc = HWPFTestDataSamples.openSampleFile( "empty.doc" );
Range range = doc.getRange();
- Table table = range.insertBefore(new TableProperties((short) columns), rows);
-
- for (int rowIdx = 0; rowIdx < table.numRows(); rowIdx++) {
- TableRow row = table.getRow(rowIdx);
- for (int colIdx = 0; colIdx < row.numCells(); colIdx++) {
- TableCell cell = row.getCell(colIdx);
- Paragraph par = cell.getParagraph(0);
- par.insertBefore("" + (rowIdx * row.numCells() + colIdx));
+ Table table = range.insertBefore(
+ new TableProperties( (short) columns ), rows );
+ table.sanityCheck();
+ range.sanityCheck();
+
+ for ( int rowIdx = 0; rowIdx < table.numRows(); rowIdx++ )
+ {
+ TableRow row = table.getRow( rowIdx );
+ row.sanityCheck();
+ for ( int colIdx = 0; colIdx < row.numCells(); colIdx++ )
+ {
+ TableCell cell = row.getCell( colIdx );
+ cell.sanityCheck();
+
+ Paragraph par = cell.getParagraph( 0 );
+ par.sanityCheck();
+
+ par.insertBefore( "" + ( rowIdx * row.numCells() + colIdx ) );
+
+ par.sanityCheck();
+ cell.sanityCheck();
+ row.sanityCheck();
+ table.sanityCheck();
+ range.sanityCheck();
}
}
+
+ String text = range.text();
+ int mustBeAfter = 0;
+ for ( int i = 0; i < rows * columns; i++ )
+ {
+ int next = text.indexOf( Integer.toString( i ), mustBeAfter );
+ assertFalse( next == -1 );
+ mustBeAfter = next;
+ }
}
/**
- * [FAILING] Bug 47563 - HWPF failing while creating tables,
+ * [RESOLVED FIXED] Bug 47563 - Exception when working with table
*/
- public void test47563() {
- try {
- insertTable(1, 5);
- insertTable(1, 6);
- insertTable(5, 1);
- insertTable(6, 1);
- insertTable(2, 2);
- insertTable(3, 2);
- insertTable(2, 3);
- insertTable(3, 3);
-
- fixed("47563");
- } catch (Exception e) {
- // expected exception
- }
+ public void test47563()
+ {
+ insertTable( 1, 5 );
+ insertTable( 1, 6 );
+ insertTable( 5, 1 );
+ insertTable( 6, 1 );
+ insertTable( 2, 2 );
+ insertTable( 3, 2 );
+ insertTable( 2, 3 );
+ insertTable( 3, 3 );
}
/**
projects / poi.git / commitdiff