CVS: jfor/src/org/jfor/jfor/rtflib/testdocs ListInTable.java,1.4,1.5 MergedTableCells.java,1.3,1.4 NestedTable.java,1.3,1.4 SimpleTable.java,1.3,1.4
Bertrand Delacretaz <[email protected]> Mon, 12 Aug 2002 02:40:05 -0700
| Newsgroups | gmane.text.xml.jfor.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/jfor/jfor/src/org/jfor/jfor/rtflib/testdocs
In directory usw-pr-cvs1:/tmp/cvs-serv13488/src/org/jfor/jfor/rtflib/testdocs
Modified Files:
ListInTable.java MergedTableCells.java NestedTable.java
SimpleTable.java
Log Message:
V0.7.1dev-e, contributions from Boris Poudérous for number-columns-spanned
and vertical merging of tables cells.
Index: ListInTable.java
===================================================================
RCS file: /cvsroot/jfor/jfor/src/org/jfor/jfor/rtflib/testdocs/ListInTable.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ListInTable.java 12 Jul 2002 08:08:31 -0000 1.4
--- ListInTable.java 12 Aug 2002 09:40:03 -0000 1.5
***************
*** 60,63 ****
--- 60,67 ----
// $Id$
// $Log$
+ // Revision 1.5 2002/08/12 09:40:03 bdelacretaz
+ // V0.7.1dev-e, contributions from Boris Poudérous for number-columns-spanned
+ // and vertical merging of tables cells.
+ //
// Revision 1.4 2002/07/12 08:08:31 bdelacretaz
// License changed to jfor Apache-style license
***************
*** 84,88 ****
sect.newParagraph().newText("There must be a table below where the second cell contains a bulleted list mixed with normal paragraphs");
! final RtfTable tbl = sect.newTable();
final RtfTableRow row = tbl.newTableRow();
row.newTableCell(RtfTableCell.DEFAULT_CELL_WIDTH).newParagraph().newText("cell A, simple");
--- 88,92 ----
sect.newParagraph().newText("There must be a table below where the second cell contains a bulleted list mixed with normal paragraphs");
! final RtfTable tbl = sect.newTable(new DummyTableColumnsInfo());
final RtfTableRow row = tbl.newTableRow();
row.newTableCell(RtfTableCell.DEFAULT_CELL_WIDTH).newParagraph().newText("cell A, simple");
Index: MergedTableCells.java
===================================================================
RCS file: /cvsroot/jfor/jfor/src/org/jfor/jfor/rtflib/testdocs/MergedTableCells.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** MergedTableCells.java 12 Jul 2002 08:08:31 -0000 1.3
--- MergedTableCells.java 12 Aug 2002 09:40:03 -0000 1.4
***************
*** 61,64 ****
--- 61,68 ----
// $Id$
// $Log$
+ // Revision 1.4 2002/08/12 09:40:03 bdelacretaz
+ // V0.7.1dev-e, contributions from Boris Poudérous for number-columns-spanned
+ // and vertical merging of tables cells.
+ //
// Revision 1.3 2002/07/12 08:08:31 bdelacretaz
// License changed to jfor Apache-style license
***************
*** 88,92 ****
sect.newParagraph().newText("This document contains a table with some merged cells.");
! final RtfTable tbl = sect.newTable();
final int MM_TO_TWIPS = (int)(1440f / 25.4f);
--- 92,96 ----
sect.newParagraph().newText("This document contains a table with some merged cells.");
! final RtfTable tbl = sect.newTable(new DummyTableColumnsInfo());
final int MM_TO_TWIPS = (int)(1440f / 25.4f);
Index: NestedTable.java
===================================================================
RCS file: /cvsroot/jfor/jfor/src/org/jfor/jfor/rtflib/testdocs/NestedTable.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** NestedTable.java 12 Jul 2002 08:08:31 -0000 1.3
--- NestedTable.java 12 Aug 2002 09:40:03 -0000 1.4
***************
*** 61,64 ****
--- 61,68 ----
// $Id$
// $Log$
+ // Revision 1.4 2002/08/12 09:40:03 bdelacretaz
+ // V0.7.1dev-e, contributions from Boris Poudérous for number-columns-spanned
+ // and vertical merging of tables cells.
+ //
// Revision 1.3 2002/07/12 08:08:31 bdelacretaz
// License changed to jfor Apache-style license
***************
*** 107,111 ****
sect.newParagraph().newText("First test: table with one nested table in cell 1,1");
! final RtfTable tbl = sect.newTable();
// first row, normal
{
--- 111,115 ----
sect.newParagraph().newText("First test: table with one nested table in cell 1,1");
! final RtfTable tbl = sect.newTable(new DummyTableColumnsInfo());
// first row, normal
{
***************
*** 122,126 ****
final RtfTableCell c = r.newTableCell(80 * MM_TO_TWIPS);
c.newParagraph().newText("cell 1,1, width 80mm, this text is followed by a nested table in the same cell, followed by text that says 'AFTER NESTED TABLE'.");
! fillNestedTable(c.newTable(),1);
c.newParagraph().newText("AFTER NESTED TABLE");
--- 126,130 ----
final RtfTableCell c = r.newTableCell(80 * MM_TO_TWIPS);
c.newParagraph().newText("cell 1,1, width 80mm, this text is followed by a nested table in the same cell, followed by text that says 'AFTER NESTED TABLE'.");
! fillNestedTable(c.newTable(new DummyTableColumnsInfo()),1);
c.newParagraph().newText("AFTER NESTED TABLE");
***************
*** 140,144 ****
throws IOException {
sect.newParagraph().newText("Second test: table with two nested tables in cell 1,1");
! final RtfTable tbl = sect.newTable();
// first row, normal
{
--- 144,148 ----
throws IOException {
sect.newParagraph().newText("Second test: table with two nested tables in cell 1,1");
! final RtfTable tbl = sect.newTable(new DummyTableColumnsInfo());
// first row, normal
{
***************
*** 155,161 ****
final RtfTableCell c = r.newTableCell(80 * MM_TO_TWIPS);
c.newParagraph().newText("cell 1,1, width 80mm, this text is followed by a nested table in the same cell, followed by text that says 'BETWEEN', then another table, then 'AFTER'.");
! fillNestedTable(c.newTable(),2);
c.newParagraph().newText("BETWEEN");
! fillNestedTable(c.newTable(),3);
c.newParagraph().newText("AFTER");
--- 159,165 ----
final RtfTableCell c = r.newTableCell(80 * MM_TO_TWIPS);
c.newParagraph().newText("cell 1,1, width 80mm, this text is followed by a nested table in the same cell, followed by text that says 'BETWEEN', then another table, then 'AFTER'.");
! fillNestedTable(c.newTable(new DummyTableColumnsInfo()),2);
c.newParagraph().newText("BETWEEN");
! fillNestedTable(c.newTable(new DummyTableColumnsInfo()),3);
c.newParagraph().newText("AFTER");
***************
*** 174,178 ****
throws IOException {
sect.newParagraph().newText("Third test: table with two nested tables in cell 1,1 and one nested table in cell 0,1");
! final RtfTable tbl = sect.newTable();
// first row, normal
{
--- 178,182 ----
throws IOException {
sect.newParagraph().newText("Third test: table with two nested tables in cell 1,1 and one nested table in cell 0,1");
! final RtfTable tbl = sect.newTable(new DummyTableColumnsInfo());
// first row, normal
{
***************
*** 181,185 ****
c.newParagraph().newText("third test table: cell 0,0, width 40mm, the cell to its right contains a nested table with no other text.");
c = r.newTableCell(80 * MM_TO_TWIPS);
! fillNestedTable(c.newTable(),4);
}
--- 185,189 ----
c.newParagraph().newText("third test table: cell 0,0, width 40mm, the cell to its right contains a nested table with no other text.");
c = r.newTableCell(80 * MM_TO_TWIPS);
! fillNestedTable(c.newTable(new DummyTableColumnsInfo()),4);
}
***************
*** 191,197 ****
final RtfTableCell c = r.newTableCell(80 * MM_TO_TWIPS);
c.newParagraph().newText("cell 1,1, width 80mm, this text is followed by a nested table in the same cell, followed by text that says 'BETWEEN', then another table, then 'AFTER'.");
! fillNestedTable(c.newTable(),5);
c.newParagraph().newText("BETWEEN");
! fillNestedTable(c.newTable(),6);
c.newParagraph().newText("AFTER");
--- 195,201 ----
final RtfTableCell c = r.newTableCell(80 * MM_TO_TWIPS);
c.newParagraph().newText("cell 1,1, width 80mm, this text is followed by a nested table in the same cell, followed by text that says 'BETWEEN', then another table, then 'AFTER'.");
! fillNestedTable(c.newTable(new DummyTableColumnsInfo()),5);
c.newParagraph().newText("BETWEEN");
! fillNestedTable(c.newTable(new DummyTableColumnsInfo()),6);
c.newParagraph().newText("AFTER");
Index: SimpleTable.java
===================================================================
RCS file: /cvsroot/jfor/jfor/src/org/jfor/jfor/rtflib/testdocs/SimpleTable.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** SimpleTable.java 12 Jul 2002 08:08:31 -0000 1.3
--- SimpleTable.java 12 Aug 2002 09:40:03 -0000 1.4
***************
*** 61,64 ****
--- 61,68 ----
// $Id$
// $Log$
+ // Revision 1.4 2002/08/12 09:40:03 bdelacretaz
+ // V0.7.1dev-e, contributions from Boris Poudérous for number-columns-spanned
+ // and vertical merging of tables cells.
+ //
// Revision 1.3 2002/07/12 08:08:31 bdelacretaz
// License changed to jfor Apache-style license
***************
*** 79,83 ****
protected void generateDocument(RtfDocumentArea rda,RtfSection sect)
throws IOException {
! final RtfTable tbl = sect.newTable();
final int MAX_ROW = 2;
final int MAX_COL = 3;
--- 83,87 ----
protected void generateDocument(RtfDocumentArea rda,RtfSection sect)
throws IOException {
! final RtfTable tbl = sect.newTable(new DummyTableColumnsInfo());
final int MAX_ROW = 2;
final int MAX_COL = 3;
-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf