Fix issues in table layout

DEVSIX-1252

Author: pavel-alay

layout/src/main/java/com/itextpdf/layout/element/Table.java

@@ -684,7 +684,7 @@ public boolean isComplete() {
     }
 
     /**
-     * Indicates that all the desired content has been added to this large element.
+     * Indicates that all the desired content has been added to this large element and no more content will be added.
      * After this method is called, more precise rendering is activated.
      * For instance, a table may have a {@link #setSkipLastFooter(boolean)} method set to true,
      * and in case of large table on {@link #flush()} we do not know if any more content will be added,
@@ -695,6 +695,7 @@ public boolean isComplete() {
      */
     @Override
     public void complete() {
+        assert !isComplete;
         isComplete = true;
         flush();
     }

layout/src/main/java/com/itextpdf/layout/renderer/CellRenderer.java

@@ -60,6 +60,7 @@ public class CellRenderer extends BlockRenderer {
      */
     public CellRenderer(Cell modelElement) {
         super(modelElement);
+        assert modelElement != null;
         setProperty(Property.ROWSPAN, modelElement.getRowspan());
         setProperty(Property.COLSPAN, modelElement.getColspan());
     }

layout/src/main/java/com/itextpdf/layout/renderer/TableWidths.java

@@ -53,6 +53,7 @@ This file is part of the iText (R) project.
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -349,6 +350,7 @@ float[] autoLayout() {
                 float minTotalNonPercent = 0;
                 float fixedAddition = 0;
                 float flexibleAddition = 0;
+                boolean hasFlexibleCell = false;
                 //sum of non fixed non percent columns.
                 for (int i = 0; i < numberOfColumns; i++) {
                     if (widths[i].isPercent) {
@@ -369,6 +371,7 @@ float[] autoLayout() {
                             fixedAddition += addition;
                         } else {
                             flexibleAddition += addition;
+                            hasFlexibleCell = true;
                         }
                     }
                 }
@@ -384,7 +387,7 @@ float[] autoLayout() {
                     }
                 } else {
                     float extraWidth = tableWidth - totalPercent - minTotalNonPercent;
-                    if (fixedAddition > 0 && (extraWidth < fixedAddition || flexibleAddition == 0)) {
+                    if (fixedAddition > 0 && (extraWidth < fixedAddition || !hasFlexibleCell)) {
                         for (int i = 0; i < numberOfColumns; i++) {
                             //only points could be fixed
                             if (widths[i].isFixed) {
@@ -596,13 +599,12 @@ private float[] getCellBorderIndents(CellInfo cell) {
         TableRenderer renderer;
         if (cell.region == CellInfo.HEADER) {
             renderer = tableRenderer.headerRenderer;
-        } else if (cell.region == CellInfo.HEADER) {
+        } else if (cell.region == CellInfo.FOOTER) {
             renderer = tableRenderer.footerRenderer;
         } else {
             renderer = tableRenderer;
         }
         return renderer.bordersHandler.getCellBorderIndents(cell.getRow(), cell.getCol(), cell.getRowspan(), cell.getColspan());
-
     }
 
     private void fillAndSortCells() {
@@ -624,7 +626,7 @@ private void fillRendererCells(TableRenderer renderer, byte region) {
             for (int col = 0; col < numberOfColumns; col++) {
                 CellRenderer cell = renderer.rows.get(row)[col];
                 if (cell != null) {
-                    cells.add(new CellInfo(cell, row, region));
+                    cells.add(new CellInfo(cell, row, col, region));
                 }
             }
         }
@@ -769,33 +771,37 @@ private static class CellInfo implements Comparable<CellInfo> {
 
         private final CellRenderer cell;
         private final int row;
+        private final int col;
         private final byte region;
 
-        CellInfo(CellRenderer cell, int row, byte region) {
+        CellInfo(CellRenderer cell, int row, int col, byte region) {
             this.cell = cell;
             this.region = region;
+            //we cannot use getModelElement().getCol() or getRow(), because its may be changed during layout.
             this.row = row;
-            //assert this.row != cell.getModelElement().getRow();
+            this.col = col;
         }
 
         CellRenderer getCell() {
             return cell;
         }
 
         int getCol() {
-            return cell.getModelElement().getCol();
+            return col;
         }
 
         int getColspan() {
-            return cell.getModelElement().getColspan();
+            //we cannot use getModelElement().getColspan(), because it may be changed during layout.
+            return (int) cell.getPropertyAsInteger(Property.COLSPAN);
         }
 
         int getRow() {
             return row;
         }
 
         int getRowspan() {
-            return cell.getModelElement().getRowspan();
+            //we cannot use getModelElement().getRowspan(), because it may be changed during layout.
+            return (int) cell.getPropertyAsInteger(Property.ROWSPAN);
         }
 
         @Override
@@ -808,6 +814,20 @@ public int compareTo(CellInfo o) {
             }
             return region == o.region ? getRow() - o.getRow() : region - o.region;
         }
+
+        @Override
+        public String toString() {
+            String str = MessageFormat.format("row={0}, col={1}, rowspan={2}, colspan={3}, ",
+                    getRow(), getCol(), getRowspan(), getColspan());
+            if (region == HEADER) {
+                str += "header";
+            } else if (region == BODY) {
+                str += "body";
+            } else if (region == FOOTER) {
+                str += "footer";
+            }
+            return str;
+        }
     }
 
     //endregion