Remove deprecated code

DEVSIX-3495

Author: Snipx

src/main/java/com/itextpdf/html2pdf/LogMessageConstant.java

@@ -65,14 +65,8 @@ public final class LogMessageConstant {
     public static final String ERROR_WHILE_LAYOUT_OF_FORM_FIELD = "Cannot layout form field field. It won't be displayed";
     /** The Constant ERROR_WHILE_LAYOUT_OF_FORM_FIELD_WITH_TYPE. */
     public static final String ERROR_WHILE_LAYOUT_OF_FORM_FIELD_WITH_TYPE = "Error during layout of form filed with type {0}.";
-    /** The Constant HEIGHT_VALUE_IN_PERCENT_NOT_SUPPORTED. */
-    @Deprecated
-    public static final String HEIGHT_VALUE_IN_PERCENT_NOT_SUPPORTED = "Height value in percent not supported";
     /** The Constant INPUT_FIELD_DOES_NOT_FIT. */
     public static final String INPUT_FIELD_DOES_NOT_FIT = "Input field doesn't fit in outer object. It will be clipped";
-    /** The Constant INPUT_SUPPORTS_ONLY_POINT_WIDTH. */
-    @Deprecated
-    public static final String INPUT_SUPPORTS_ONLY_POINT_WIDTH = "Input field supports only point width";
     /** The Constant INPUT_TYPE_IS_INVALID. */
     public static final String INPUT_TYPE_IS_INVALID = "Input type {0} is invalid. The default text type will be used instead.";
     /** The Constant INPUT_TYPE_IS_NOT_SUPPORTED. */
@@ -103,22 +97,14 @@ public final class LogMessageConstant {
     public static final String PDF_DOCUMENT_NOT_PRESENT = "PdfDocument is not present";
     /** The Constant QUOTES_PROPERTY_INVALID. */
     public static final String QUOTES_PROPERTY_INVALID = "Quote property \"{0}\" is invalid. It should contain even number of <string> values.";
-    @Deprecated
-    public static final String RULE_IS_NOT_SUPPORTED = "The rule @{0} is unsupported. All selectors in this rule will be ignored.";
     /** The Constant TEXT_DECORATION_BLINK_NOT_SUPPORTED. */
     public static final String TEXT_DECORATION_BLINK_NOT_SUPPORTED = "text-decoration: blink not supported";
-    /** The Constant TEXT_WAS_NOT_PROCESSED. */
-    @Deprecated
-    public static final String TEXT_WAS_NOT_PROCESSED = "Text was not processed: {0}";
     /** The Constant UNABLE_TO_PROCESS_EXTERNAL_CSS_FILE. */
     public static final String UNABLE_TO_PROCESS_EXTERNAL_CSS_FILE = "Unable to process external css file";
     /** The Constant UNABLE_TO_PROCESS_IMAGE_AS_SVG */
     public static final String UNABLE_TO_PROCESS_IMAGE_AS_SVG = "Unable to process image found at {0} as an SVG";
     /** The Constant UNABLE_TO_RESOLVE_COUNTER. */
     public static final String UNABLE_TO_RESOLVE_COUNTER = "Unable to resolve counter \"{0}\"";
-    /** The Constant UNABLE_TO_RESOLVE_FONT. */
-    @Deprecated
-    public static final String UNABLE_TO_RESOLVE_FONT = "Unable to resolve font: {0}. The default one will be used instead";
     /** The Constant UNABLE_TO_RETRIEVE_FONT. */
     public static final String UNABLE_TO_RETRIEVE_FONT = "Unable to retrieve font:\n {0}";
     /** The Constant UNABLE_TO_RETRIEVE_IMAGE_WITH_GIVEN_BASE_URI. */

src/main/java/com/itextpdf/html2pdf/attach/impl/layout/PageMarginBoxDummyElement.java

@@ -52,8 +52,8 @@ This file is part of the iText (R) project.
 import java.util.Map;
 
 /**
- * @deprecated Remove this class in 7.2 and use {@link PageMarginBoxContextNode} instead
- *             (by making it implement {@link IElementNode}).
+ * @deprecated To be removed in next major pdfHTML version once {@link PageMarginBoxContextNode} implements
+ *            {@link IElementNode} so that it can be used directly instead of creating dummy node.
  */
 @Deprecated
 class PageMarginBoxDummyElement implements IElementNode, ICustomElementNode {

src/main/java/com/itextpdf/html2pdf/attach/impl/layout/form/element/Button.java

@@ -1,16 +1,16 @@
 /*
     This file is part of the iText (R) project.
     Copyright (c) 1998-2020 iText Group NV
-    Authors: Bruno Lowagie, Paulo Soares, et al.
-    
+    Authors: iText Software.
+
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU Affero General Public License version 3
     as published by the Free Software Foundation with the addition of the
     following permission added to Section 15 as permitted in Section 7(a):
     FOR ANY PART OF THE COVERED WORK IN WHICH THE COPYRIGHT IS OWNED BY
     ITEXT GROUP. ITEXT GROUP DISCLAIMS THE WARRANTY OF NON INFRINGEMENT
     OF THIRD PARTY RIGHTS
-    
+
     This program is distributed in the hope that it will be useful, but
     WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
     or FITNESS FOR A PARTICULAR PURPOSE.
@@ -20,52 +20,77 @@ This file is part of the iText (R) project.
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA, 02110-1301 USA, or download the license from the following URL:
     http://itextpdf.com/terms-of-use/
-    
+
     The interactive user interfaces in modified source and object code versions
     of this program must display Appropriate Legal Notices, as required under
     Section 5 of the GNU Affero General Public License.
-    
+
     In accordance with Section 7(b) of the GNU Affero General Public License,
     a covered work must retain the producer line in every PDF that is created
     or manipulated using iText.
-    
+
     You can be released from the requirements of the license by purchasing
     a commercial license. Buying such a license is mandatory as soon as you
     develop commercial activities involving the iText software without
     disclosing the source code of your own applications.
     These activities include: offering paid services to customers as an ASP,
     serving PDFs on the fly in a web application, shipping iText with a closed
     source product.
-    
+
     For more information, please contact iText Software Corp. at this
     address: [email protected]
  */
 package com.itextpdf.html2pdf.attach.impl.layout.form.element;
 
 import com.itextpdf.html2pdf.attach.impl.layout.form.renderer.ButtonRenderer;
+import com.itextpdf.layout.element.BlockElement;
+import com.itextpdf.layout.element.IBlockElement;
+import com.itextpdf.layout.element.Image;
+import com.itextpdf.layout.property.Property;
 import com.itextpdf.layout.renderer.IRenderer;
 
 /**
- * Extension of the {@link FormField} class representing a input with type button or submit in html
- * @deprecated will be renamed to {@code InputButton} in next major release
+ * Extension of the {@link FormField} class representing a button in html
  */
-@Deprecated
 public class Button extends FormField<Button> {
 
-    /**
-     * Creates a new {@link Button} instance.
-     *
-     * @param id the id
-     */
     public Button(String id) {
         super(id);
     }
 
-    /* (non-Javadoc)
-     * @see com.itextpdf.layout.element.AbstractElement#makeNewRenderer()
-     */
     @Override
     protected IRenderer makeNewRenderer() {
         return new ButtonRenderer(this);
     }
+
+
+    /**
+     * Adds any block element to the div's contents.
+     *
+     * @param element a {@link BlockElement}
+     * @return this Element
+     */
+    public Button add(IBlockElement element) {
+        childElements.add(element);
+        return this;
+    }
+
+    /**
+     * Adds an image to the div's contents.
+     *
+     * @param element an {@link Image}
+     * @return this Element
+     */
+    public Button add(Image element) {
+        childElements.add(element);
+        return this;
+    }
+
+    @Override
+    public <T1> T1 getDefaultProperty(int property) {
+        if (property == Property.KEEP_TOGETHER) {
+            return (T1) (Object) true;
+        }
+        return super.<T1>getDefaultProperty(property);
+    }
 }

src/main/java/com/itextpdf/html2pdf/attach/impl/layout/form/element/ButtonContainer.java renamed to src/main/java/com/itextpdf/html2pdf/attach/impl/layout/form/element/InputButton.java

@@ -1,16 +1,16 @@
 /*
     This file is part of the iText (R) project.
     Copyright (c) 1998-2020 iText Group NV
-    Authors: iText Software.
-
+    Authors: Bruno Lowagie, Paulo Soares, et al.
+    
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU Affero General Public License version 3
     as published by the Free Software Foundation with the addition of the
     following permission added to Section 15 as permitted in Section 7(a):
     FOR ANY PART OF THE COVERED WORK IN WHICH THE COPYRIGHT IS OWNED BY
     ITEXT GROUP. ITEXT GROUP DISCLAIMS THE WARRANTY OF NON INFRINGEMENT
     OF THIRD PARTY RIGHTS
-
+    
     This program is distributed in the hope that it will be useful, but
     WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
     or FITNESS FOR A PARTICULAR PURPOSE.
@@ -20,79 +20,50 @@ This file is part of the iText (R) project.
     the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
     Boston, MA, 02110-1301 USA, or download the license from the following URL:
     http://itextpdf.com/terms-of-use/
-
+    
     The interactive user interfaces in modified source and object code versions
     of this program must display Appropriate Legal Notices, as required under
     Section 5 of the GNU Affero General Public License.
-
+    
     In accordance with Section 7(b) of the GNU Affero General Public License,
     a covered work must retain the producer line in every PDF that is created
     or manipulated using iText.
-
+    
     You can be released from the requirements of the license by purchasing
     a commercial license. Buying such a license is mandatory as soon as you
     develop commercial activities involving the iText software without
     disclosing the source code of your own applications.
     These activities include: offering paid services to customers as an ASP,
     serving PDFs on the fly in a web application, shipping iText with a closed
     source product.
-
+    
     For more information, please contact iText Software Corp. at this
     address: [email protected]
  */
 package com.itextpdf.html2pdf.attach.impl.layout.form.element;
 
-import com.itextpdf.html2pdf.attach.impl.layout.form.renderer.ButtonContainerRenderer;
-import com.itextpdf.layout.element.BlockElement;
-import com.itextpdf.layout.element.IBlockElement;
-import com.itextpdf.layout.element.Image;
-import com.itextpdf.layout.property.Property;
+import com.itextpdf.html2pdf.attach.impl.layout.form.renderer.InputButtonRenderer;
 import com.itextpdf.layout.renderer.IRenderer;
 
 /**
- * Extension of the {@link FormField} class representing a button in html
- * @deprecated Will be renamed to {@code Button} in next major release
+ * Extension of the {@link FormField} class representing a input with type button or submit in html
  */
-@Deprecated
-public class ButtonContainer extends FormField<ButtonContainer> {
-
-    public ButtonContainer(String id) {
-        super(id);
-    }
-
-    @Override
-    protected IRenderer makeNewRenderer() {
-        return new ButtonContainerRenderer(this);
-    }
-
+public class InputButton extends FormField<InputButton> {
 
     /**
-     * Adds any block element to the div's contents.
+     * Creates a new {@link InputButton} instance.
      *
-     * @param element a {@link BlockElement}
-     * @return this Element
+     * @param id the id
      */
-    public ButtonContainer add(IBlockElement element) {
-        childElements.add(element);
-        return this;
+    public InputButton(String id) {
+        super(id);
     }
 
-    /**
-     * Adds an image to the div's contents.
-     *
-     * @param element an {@link Image}
-     * @return this Element
+    /* (non-Javadoc)
+     * @see com.itextpdf.layout.element.AbstractElement#makeNewRenderer()
      */
-    public ButtonContainer add(Image element) {
-        childElements.add(element);
-        return this;
-    }
-
     @Override
-    public <T1> T1 getDefaultProperty(int property) {
-        if (property == Property.KEEP_TOGETHER) {
-            return (T1) (Object) true;
-        }
-        return super.<T1>getDefaultProperty(property);
+    protected IRenderer makeNewRenderer() {
+        return new InputButtonRenderer(this);
     }
 }

src/main/java/com/itextpdf/html2pdf/attach/impl/layout/form/renderer/AbstractFormFieldRenderer.java

@@ -58,7 +58,6 @@ This file is part of the iText (R) project.
 import com.itextpdf.layout.property.FloatPropertyValue;
 import com.itextpdf.layout.property.OverflowPropertyValue;
 import com.itextpdf.layout.property.Property;
-import com.itextpdf.layout.property.UnitValue;
 import com.itextpdf.layout.renderer.BlockRenderer;
 import com.itextpdf.layout.renderer.DrawContext;
 import com.itextpdf.layout.renderer.IRenderer;
@@ -195,16 +194,9 @@ public MinMaxWidth getMinMaxWidth() {
 
     /**
      * Adjusts the field layout.
-     *
-     * @deprecated Will be removed in 3.0.0, override {@link #adjustFieldLayout(LayoutContext)} instead.
+     * @param layoutContext layout context
      */
-    @Deprecated
-    protected abstract void adjustFieldLayout();
-
-    //NOTE: should be abstract in 3.0.0
-    protected void adjustFieldLayout(LayoutContext layoutContext) {
-        adjustFieldLayout();
-    }
+    protected abstract void adjustFieldLayout(LayoutContext layoutContext);
 
     /**
      * Creates the flat renderer instance.
@@ -243,17 +235,6 @@ protected boolean isRendererFit(float availableWidth, float availableHeight) {
         return availableHeight >= occupiedArea.getBBox().getHeight() && availableWidth >= occupiedArea.getBBox().getWidth();
     }
 
-    /**
-     * Gets the content width.
-     *
-     * @return the content width
-     * @deprecated will be removed in 3.0.0. Use {@link #retrieveWidth(float)}} instead.
-     */
-    @Deprecated
-    protected Float getContentWidth() {
-        return super.retrieveWidth(0);
-    }
-
     /**
      * Gets the accessibility language.
      *
@@ -263,16 +244,6 @@ protected String getLang() {
         return this.<String>getProperty(Html2PdfProperty.FORM_ACCESSIBILITY_LANGUAGE);
     }
 
-    //NOTE: should be removed in 3.0.0
-    @Override
-    protected Float retrieveWidth(float parentBoxWidth) {
-        UnitValue width = super.<UnitValue>getProperty(Property.WIDTH);
-        if (width != null && width.isPointValue()) {
-            return getContentWidth();
-        }
-        return super.retrieveWidth(parentBoxWidth);
-    }
-
     protected boolean isLayoutBasedOnFlatRenderer() {
         return true;
     }

src/main/java/com/itextpdf/html2pdf/attach/impl/layout/form/renderer/AbstractOneLineTextFieldRenderer.java

@@ -55,13 +55,6 @@ This file is part of the iText (R) project.
  */
 public abstract class AbstractOneLineTextFieldRenderer extends AbstractTextFieldRenderer {
 
-    /**
-     * The position of the base line of the text.
-     * @deprecated use {@link #getLastYLineRecursively()} instead. Will be removed in 3.0.0
-     */
-    @Deprecated
-    protected float baseline;
-
     /**
      * Creates a new {@link AbstractOneLineTextFieldRenderer} instance.
      *
@@ -74,7 +67,6 @@ public abstract class AbstractOneLineTextFieldRenderer extends AbstractTextField
     @Override
     public void move(float dxRight, float dyUp) {
         super.move(dxRight, dyUp);
-        baseline += dyUp;
     }
 
     /**
@@ -86,7 +78,6 @@ public void move(float dxRight, float dyUp) {
     void cropContentLines(List<LineRenderer> lines, Rectangle bBox) {
         adjustNumberOfContentLines(lines, bBox, 1);
         updateParagraphHeight();
-        this.baseline = lines.get(0).getYLine();
     }
 
     /**