Fix backward compatibility issues

DEVSIX-1056

Author: pavel-alay

kernel/src/main/java/com/itextpdf/kernel/font/PdfFont.java

@@ -150,7 +150,9 @@ public boolean containsGlyph(int unicode) {
      * @return true if font contains glyph, represented with the unicode code point,
      * otherwise false.
      */
-    public abstract boolean containsGlyph(String text, int from);
+    public boolean containsGlyph(String text, int from) {
+        throw new java.lang.IllegalStateException("containsGlyph(String text, int from) must be overridden");
+    }
 
     public abstract GlyphLine createGlyphLine(String content);
 
@@ -164,7 +166,9 @@ public boolean containsGlyph(int unicode) {
      * @param glyphs array for a new glyphs, shall not be null.
      * @return number of processed chars from text.
      */
-    public abstract int appendGlyphs(String text, int from, int to, List<Glyph> glyphs);
+    public int appendGlyphs(String text, int from, int to, List<Glyph> glyphs) {
+        throw new java.lang.IllegalStateException("appendGlyphs(String text, int from, int to, List<Glyph> glyphs) must be overridden");
+    }
 
     /**
      * Append any single glyph, even notdef.
@@ -175,7 +179,9 @@ public boolean containsGlyph(int unicode) {
      * @param glyphs array for a new glyph, shall not be null.
      * @return number of processed chars: 2 in case surrogate pair, otherwise 1
      */
-    public abstract int appendAnyGlyph(String text, int from, List<Glyph> glyphs);
+    public int appendAnyGlyph(String text, int from, List<Glyph> glyphs) {
+        throw new java.lang.IllegalStateException("appendAnyGlyph(String text, int from, List<Glyph> glyphs) must be overridden");
+    }
 
     /**
      * Converts the text into bytes to be placed in the document.
@@ -196,7 +202,9 @@ public boolean containsGlyph(int unicode) {
      * @param content the encoded string
      * @return the {@link GlyphLine} containing the glyphs encoded by the passed string
      */
-    public abstract GlyphLine decodeIntoGlyphLine(PdfString content);
+    public GlyphLine decodeIntoGlyphLine(PdfString content) {
+        throw new java.lang.IllegalStateException("decodeIntoGlyphLine(PdfString content) must be overridden");
+    }
 
     public abstract float getContentWidth(PdfString content);
 

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

@@ -247,7 +247,7 @@ public LayoutResult layout(LayoutContext layoutContext) {
         // Cells' up moves occured while split processing
         // key is column number (there can be only one move during one split)
         // value is the previous row number of the cell
-        Map<Integer, Integer> rowMoves = new HashMap<Integer, Integer>();
+        Map<Integer, Integer> rowMoves = new HashMap<>();
 
         MarginsCollapseHandler marginsCollapseHandler = null;
         boolean marginsCollapsingEnabled = Boolean.TRUE.equals(getPropertyAsBoolean(Property.COLLAPSING_MARGINS));
@@ -687,7 +687,6 @@ public LayoutResult layout(LayoutContext layoutContext) {
                     while (0 != cellProcessingQueue.size()) {
                         CellRendererInfo cellInfo = cellProcessingQueue.pop();
                         col = cellInfo.column;
-                        int rowN = cellInfo.finishRowInd;
                         CellRenderer cell = cellInfo.cellRenderer;
                         float collapsedWithNextRowBorderWidth = null == cell.getBorders()[2] ? 0 : cell.getBorders()[2].getWidth();
                         cell.deleteOwnProperty(Property.BORDER_BOTTOM);
@@ -939,8 +938,8 @@ public LayoutResult layout(LayoutContext layoutContext) {
                             logger.warn(LogMessageConstant.CLIP_ELEMENT);
                             // Process borders
                             if (status == LayoutResult.NOTHING) {
-                                ArrayList<Border> topBorders = new ArrayList<Border>();
-                                ArrayList<Border> bottomBorders = new ArrayList<Border>();
+                                ArrayList<Border> topBorders = new ArrayList<>();
+                                ArrayList<Border> bottomBorders = new ArrayList<>();
                                 for (int i = 0; i < numberOfColumns; i++) {
                                     topBorders.add(borders[0]);
                                     bottomBorders.add(borders[2]);
@@ -1015,13 +1014,13 @@ public LayoutResult layout(LayoutContext layoutContext) {
 
         // if table is empty we still need to process table borders
         if (0 == childRenderers.size() && null == headerRenderer && null == footerRenderer) {
-            List<Border> topHorizontalBorders = new ArrayList<Border>();
-            List<Border> bottomHorizontalBorders = new ArrayList<Border>();
+            List<Border> topHorizontalBorders = new ArrayList<>();
+            List<Border> bottomHorizontalBorders = new ArrayList<>();
             for (int i = 0; i < numberOfColumns; i++) {
                 bottomHorizontalBorders.add(Border.NO_BORDER);
             }
-            List<Border> leftVerticalBorders = new ArrayList<Border>();
-            List<Border> rightVerticalBorders = new ArrayList<Border>();
+            List<Border> leftVerticalBorders = new ArrayList<>();
+            List<Border> rightVerticalBorders = new ArrayList<>();
 
             // process bottom border of the last added row
             if (tableModel.isComplete() && 0 != lastFlushedRowBottomBorder.size()) {
@@ -1290,41 +1289,12 @@ public void move(float dxRight, float dyUp) {
         }
     }
 
-    protected float[] calculateScaledColumnWidths(Table tableModel, float tableWidth, float leftBorderWidth, float rightBorderWidth) {
-        float[] scaledWidths = new float[tableModel.getNumberOfColumns()];
-        float widthSum = 0;
-        float totalPointWidth = 0;
-        int col;
-        for (col = 0; col < tableModel.getNumberOfColumns(); col++) {
-            UnitValue columnUnitWidth = tableModel.getColumnWidth(col);
-            float columnWidth;
-            if (columnUnitWidth.isPercentValue()) {
-                columnWidth = tableWidth * columnUnitWidth.getValue() / 100;
-                scaledWidths[col] = columnWidth;
-                widthSum += columnWidth;
-            } else {
-                totalPointWidth += columnUnitWidth.getValue();
-            }
-        }
-        float freeTableSpaceWidth = tableWidth - widthSum;
-
-        if (totalPointWidth > 0) {
-            for (col = 0; col < tableModel.getNumberOfColumns(); col++) {
-                float columnWidth;
-                UnitValue columnUnitWidth = tableModel.getColumnWidth(col);
-                if (columnUnitWidth.isPointValue()) {
-                    columnWidth = (freeTableSpaceWidth / totalPointWidth) * columnUnitWidth.getValue();
-                    scaledWidths[col] = columnWidth;
-                    widthSum += columnWidth;
-                }
-            }
-        }
-
-        for (col = 0; col < tableModel.getNumberOfColumns(); col++) {
-            scaledWidths[col] *= (tableWidth - leftBorderWidth / 2 - rightBorderWidth / 2) / widthSum;
-        }
-
-        return scaledWidths;
+    /**
+     * @deprecated Method will be removed in 7.1.
+     */
+    @Deprecated
+    protected float[] calculateScaledColumnWidths(Table tableModel, float tableWidth) {
+        return countedColumnWidth;
     }
 
     protected TableRenderer[] split(int row) {
@@ -1803,7 +1773,7 @@ private void updateFirstRowBorders(int colN) {
 
     // collapse with table border or header bottom borders
     private void correctFirstRowTopBorders(Border tableBorder, int colN) {
-        int col = 0;
+        int col;
         int row = 0;
         List<Border> topBorders = horizontalBorders.get(0);
         List<Border> bordersToBeCollapsedWith = null != headerRenderer