Index: displaytag/src/main/java/org/displaytag/render/ItextTableWriter.java
===================================================================
--- displaytag/src/main/java/org/displaytag/render/ItextTableWriter.java (revision 147)
+++ displaytag/src/main/java/org/displaytag/render/ItextTableWriter.java (revision 148)
@@ -78,7 +78,7 @@
*/
protected void writeTableOpener(TableModel model)
{
- this.table.setDefaultVerticalAlignment(Element.ALIGN_TOP);
+ this.table.getDefaultCell().setVerticalAlignment(Element.ALIGN_TOP);
this.table.setCellsFitPage(true);
this.table.setWidth(100);
this.table.setPadding(2);
@@ -372,8 +372,8 @@
*/
private void setBoldStyle(Chunk chunk, Color color)
{
- Font font = chunk.font();
- chunk.setFont(FontFactory.getFont(font.getFamilyname(), font.size(), Font.BOLD, color));
+ Font font = chunk.getFont();
+ chunk.setFont(FontFactory.getFont(font.getFamilyname(), font.getSize(), Font.BOLD, color));
}
/**
Index: displaytag/src/main/java/org/displaytag/export/DefaultItextExportView.java
===================================================================
--- displaytag/src/main/java/org/displaytag/export/DefaultItextExportView.java (revision 147)
+++ displaytag/src/main/java/org/displaytag/export/DefaultItextExportView.java (revision 148)
@@ -71,6 +71,8 @@
Table table = new Table(this.model.getNumberOfColumns());
ItextTableWriter writer = new ItextTableWriter(table, document);
writer.writeTable(this.model, "-1");
+ // http://jira.codehaus.org/browse/DISPL-450
+ table.setNotAddedYet(false);
document.add(table);
document.close();
}
Index: displaytag/src/main/java/org/displaytag/export/PdfView.java
===================================================================
--- displaytag/src/main/java/org/displaytag/export/PdfView.java (revision 147)
+++ displaytag/src/main/java/org/displaytag/export/PdfView.java (revision 148)
@@ -105,14 +105,14 @@
protected void initTable() throws BadElementException
{
tablePDF = new Table(this.model.getNumberOfColumns());
- tablePDF.setDefaultVerticalAlignment(Element.ALIGN_TOP);
+ tablePDF.getDefaultCell().setVerticalAlignment(Element.ALIGN_TOP);
tablePDF.setCellsFitPage(true);
- tablePDF.setWidth(100);
+ tablePDF.setWidth(100F);
- tablePDF.setPadding(2);
- tablePDF.setSpacing(0);
+ tablePDF.setPadding(2F);
+ tablePDF.setSpacing(0F);
- smallFont = FontFactory.getFont(FontFactory.HELVETICA, 7, Font.NORMAL, new Color(0, 0, 0));
+ smallFont = FontFactory.getFont(FontFactory.HELVETICA, 7F, Font.NORMAL, new Color(0, 0, 0));
}
@@ -274,4 +274,4 @@
return SeverityEnum.ERROR;
}
}
-}
\ No newline at end of file
+}
Index: displaytag/src/main/java/org/displaytag/export/DefaultPdfExportView.java
===================================================================
--- displaytag/src/main/java/org/displaytag/export/DefaultPdfExportView.java (revision 147)
+++ displaytag/src/main/java/org/displaytag/export/DefaultPdfExportView.java (revision 148)
@@ -87,7 +87,7 @@
cb.saveState();
// write the headertable
table.setTotalWidth(document.right() - document.left());
- table.writeSelectedRows(0, -1, document.left(), document.getPageSize().height() - 50, cb);
+ table.writeSelectedRows(0, -1, document.left(), document.getPageSize().getHeight() - 50.0F, cb);
// compose the footer
String text = "Page " + writer.getPageNumber();
float textSize = helv.getWidthPoint(text, 12);
Index: displaytag/pom.xml
===================================================================
--- displaytag/pom.xml (revision 147)
+++ displaytag/pom.xml (revision 148)
@@ -75,6 +75,10 @@
itext
+ com.lowagie
+ itext-rtf
+
+
commons-beanutils
commons-beanutils
Index: pom.xml
===================================================================
--- pom.xml (revision 147)
+++ pom.xml (revision 148)
@@ -349,7 +349,12 @@
com.lowagie
itext
- 1.3
+ 2.1.5
+
+
+ com.lowagie
+ itext-rtf
+ 2.1.5
taglibs
Index: displaytag-examples/src/main/java/org/displaytag/sample/decorators/ItextTotalWrapper.java
===================================================================
--- displaytag-examples/src/main/java/org/displaytag/sample/decorators/ItextTotalWrapper.java (revision 147)
+++ displaytag-examples/src/main/java/org/displaytag/sample/decorators/ItextTotalWrapper.java (revision 148)
@@ -68,7 +68,7 @@
*/
public String startRow()
{
- this.table.setDefaultCellBorder(Rectangle.BOTTOM);
+ this.table.getDefaultCell().setBorder(Rectangle.BOTTOM);
return null;
}
@@ -102,8 +102,8 @@
{
try
{
- this.font = FontFactory.getFont(this.font.getFamilyname(), this.font.size(), Font.BOLD, this.font
- .color());
+ this.font = FontFactory.getFont(this.font.getFamilyname(), this.font.getSize(), Font.BOLD, this.font
+ .getColor());
table.addCell(this.getCell(""));
table.addCell(this.getCell(""));
table.addCell(this.getCell("-------------"));