diff --git a/gradle.properties b/gradle.properties index 0e91290..12fc78f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,5 +1,5 @@ group = org.xbib.graphics name = graphics -version = 4.5.8 +version = 4.5.9 org.gradle.warning.mode = ALL diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/AbstractCell.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/AbstractCell.java index 36f8ed1..52af9b2 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/AbstractCell.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/AbstractCell.java @@ -236,4 +236,9 @@ public abstract class AbstractCell implements Cell { } protected abstract Renderer createDefaultRenderer(); + + @Override + public String toString() { + return "AbstractCell"; + } } diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/Column.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/Column.java index 0eaa082..2940896 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/Column.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/Column.java @@ -8,7 +8,7 @@ public class Column { private float width; - Column(final float width) { + Column(float width) { if (width < 0) { throw new IllegalArgumentException("Column width must be non-negative"); } @@ -42,4 +42,9 @@ public class Column { public Column getNext() { return next; } + + @Override + public String toString() { + return "Column[width=" + width +"]"; + } } diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/Row.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/Row.java index 5e744f8..86c287e 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/Row.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/Row.java @@ -88,6 +88,10 @@ public class Row { this.height += (this.height / (heightOfHighestCell - rowSpanSizeDifference)) * rowSpanSizeDifference; } + public String toString() { + return cells.toString(); + } + public static Builder builder() { return new Builder(); } diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/Table.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/Table.java index 4b9c1f6..3831b22 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/Table.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/Table.java @@ -285,7 +285,8 @@ public class Table { public Table build() { if (getNumberOfRegularCells() != getNumberOfSpannedCells()) { throw new TableSetupException("Number of table cells does not match with table setup. " + - "This could be due to row or col spanning not being correct"); + "Number of regular cells = " + getNumberOfRegularCells() + ", number of spanned cells = " + getNumberOfSpannedCells() + + ". This could be due to row or col spanning not being correct. Rows = " + rows); } Table table = new Table(rows, columns, rowSpanCells); table.setSettings(parameters); diff --git a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/TextCell.java b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/TextCell.java index d986980..d63a26a 100644 --- a/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/TextCell.java +++ b/graphics-pdfbox-layout/src/main/java/org/xbib/graphics/pdfbox/layout/table/TextCell.java @@ -23,6 +23,11 @@ public class TextCell extends AbstractTextCell { return text; } + @Override + public String toString() { + return "Cell:" + getText() + "[colspan=" + getColSpan() + ",rowspan=" + getRowSpan() + "]"; + } + public static Builder builder() { return new Builder(); }