Remove deprecated code

DEVSIX-3495

Autoported commit.
Original commit hash: [c861837a]
Manual files:
src/main/java/com/itextpdf/html2pdf/attach/impl/layout/form/renderer/AbstractFormFieldRenderer.java

Author: Snipx

itext/itext.html2pdf/itext/html2pdf/LogMessageConstant.cs

@@ -73,17 +73,9 @@ public sealed class LogMessageConstant {
         /// <summary>The Constant ERROR_WHILE_LAYOUT_OF_FORM_FIELD_WITH_TYPE.</summary>
         public const String ERROR_WHILE_LAYOUT_OF_FORM_FIELD_WITH_TYPE = "Error during layout of form filed with type {0}.";
 
-        /// <summary>The Constant HEIGHT_VALUE_IN_PERCENT_NOT_SUPPORTED.</summary>
-        [Obsolete]
-        public const String HEIGHT_VALUE_IN_PERCENT_NOT_SUPPORTED = "Height value in percent not supported";
-
         /// <summary>The Constant INPUT_FIELD_DOES_NOT_FIT.</summary>
         public const String INPUT_FIELD_DOES_NOT_FIT = "Input field doesn't fit in outer object. It will be clipped";
 
-        /// <summary>The Constant INPUT_SUPPORTS_ONLY_POINT_WIDTH.</summary>
-        [Obsolete]
-        public const String INPUT_SUPPORTS_ONLY_POINT_WIDTH = "Input field supports only point width";
-
         /// <summary>The Constant INPUT_TYPE_IS_INVALID.</summary>
         public const String INPUT_TYPE_IS_INVALID = "Input type {0} is invalid. The default text type will be used instead.";
 
@@ -130,16 +122,9 @@ public sealed class LogMessageConstant {
         /// <summary>The Constant QUOTES_PROPERTY_INVALID.</summary>
         public const String QUOTES_PROPERTY_INVALID = "Quote property \"{0}\" is invalid. It should contain even number of <string> values.";
 
-        [Obsolete]
-        public const String RULE_IS_NOT_SUPPORTED = "The rule @{0} is unsupported. All selectors in this rule will be ignored.";
-
         /// <summary>The Constant TEXT_DECORATION_BLINK_NOT_SUPPORTED.</summary>
         public const String TEXT_DECORATION_BLINK_NOT_SUPPORTED = "text-decoration: blink not supported";
 
-        /// <summary>The Constant TEXT_WAS_NOT_PROCESSED.</summary>
-        [Obsolete]
-        public const String TEXT_WAS_NOT_PROCESSED = "Text was not processed: {0}";
-
         /// <summary>The Constant UNABLE_TO_PROCESS_EXTERNAL_CSS_FILE.</summary>
         public const String UNABLE_TO_PROCESS_EXTERNAL_CSS_FILE = "Unable to process external css file";
 
@@ -149,10 +134,6 @@ public sealed class LogMessageConstant {
         /// <summary>The Constant UNABLE_TO_RESOLVE_COUNTER.</summary>
         public const String UNABLE_TO_RESOLVE_COUNTER = "Unable to resolve counter \"{0}\"";
 
-        /// <summary>The Constant UNABLE_TO_RESOLVE_FONT.</summary>
-        [Obsolete]
-        public const String UNABLE_TO_RESOLVE_FONT = "Unable to resolve font: {0}. The default one will be used instead";
-
         /// <summary>The Constant UNABLE_TO_RETRIEVE_FONT.</summary>
         public const String UNABLE_TO_RETRIEVE_FONT = "Unable to retrieve font:\n {0}";
 

itext/itext.html2pdf/itext/html2pdf/attach/impl/layout/PageMarginBoxDummyElement.cs

@@ -47,7 +47,7 @@ source product.
 using iText.StyledXmlParser.Node;
 
 namespace iText.Html2pdf.Attach.Impl.Layout {
-    [System.ObsoleteAttribute(@"Remove this class in 7.2 and use iText.StyledXmlParser.Css.Page.PageMarginBoxContextNode instead (by making it implement iText.StyledXmlParser.Node.IElementNode )."
+    [System.ObsoleteAttribute(@"To be removed in next major pdfHTML version once iText.StyledXmlParser.Css.Page.PageMarginBoxContextNode implementsiText.StyledXmlParser.Node.IElementNode so that it can be used directly instead of creating dummy node."
         )]
     internal class PageMarginBoxDummyElement : IElementNode, ICustomElementNode {
         /// <summary>The resolved styles.</summary>

itext/itext.html2pdf/itext/html2pdf/attach/impl/layout/form/element/Button.cs

@@ -1,7 +1,7 @@
 /*
 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
@@ -42,31 +42,52 @@ source product.
 */
 using System;
 using iText.Html2pdf.Attach.Impl.Layout.Form.Renderer;
+using iText.Layout.Element;
+using iText.Layout.Properties;
 using iText.Layout.Renderer;
 
 namespace iText.Html2pdf.Attach.Impl.Layout.Form.Element {
     /// <summary>
     /// Extension of the
     /// <see cref="FormField{T}"/>
-    /// class representing a input with type button or submit in html
+    /// class representing a button in html
     /// </summary>
-    [System.ObsoleteAttribute(@"will be renamed to InputButton in next major release")]
     public class Button : FormField<iText.Html2pdf.Attach.Impl.Layout.Form.Element.Button> {
-        /// <summary>
-        /// Creates a new
-        /// <see cref="Button"/>
-        /// instance.
-        /// </summary>
-        /// <param name="id">the id</param>
         public Button(String id)
             : base(id) {
         }
 
-        /* (non-Javadoc)
-        * @see com.itextpdf.layout.element.AbstractElement#makeNewRenderer()
-        */
         protected override IRenderer MakeNewRenderer() {
             return new ButtonRenderer(this);
         }
+
+        /// <summary>Adds any block element to the div's contents.</summary>
+        /// <param name="element">
+        /// a
+        /// <see cref="iText.Layout.Element.BlockElement{T}"/>
+        /// </param>
+        /// <returns>this Element</returns>
+        public virtual iText.Html2pdf.Attach.Impl.Layout.Form.Element.Button Add(IBlockElement element) {
+            childElements.Add(element);
+            return this;
+        }
+
+        /// <summary>Adds an image to the div's contents.</summary>
+        /// <param name="element">
+        /// an
+        /// <see cref="iText.Layout.Element.Image"/>
+        /// </param>
+        /// <returns>this Element</returns>
+        public virtual iText.Html2pdf.Attach.Impl.Layout.Form.Element.Button Add(Image element) {
+            childElements.Add(element);
+            return this;
+        }
+
+        public override T1 GetDefaultProperty<T1>(int property) {
+            if (property == Property.KEEP_TOGETHER) {
+                return (T1)(Object)true;
+            }
+            return base.GetDefaultProperty<T1>(property);
+        }
     }
 }

itext/itext.html2pdf/itext/html2pdf/attach/impl/layout/form/element/ButtonContainer.cs renamed to itext/itext.html2pdf/itext/html2pdf/attach/impl/layout/form/element/InputButton.cs

@@ -1,7 +1,7 @@
 /*
 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
@@ -42,53 +42,30 @@ source product.
 */
 using System;
 using iText.Html2pdf.Attach.Impl.Layout.Form.Renderer;
-using iText.Layout.Element;
-using iText.Layout.Properties;
 using iText.Layout.Renderer;
 
 namespace iText.Html2pdf.Attach.Impl.Layout.Form.Element {
     /// <summary>
     /// Extension of the
     /// <see cref="FormField{T}"/>
-    /// class representing a button in html
+    /// class representing a input with type button or submit in html
     /// </summary>
-    [System.ObsoleteAttribute(@"Will be renamed to Button in next major release")]
-    public class ButtonContainer : FormField<iText.Html2pdf.Attach.Impl.Layout.Form.Element.ButtonContainer> {
-        public ButtonContainer(String id)
+    public class InputButton : FormField<iText.Html2pdf.Attach.Impl.Layout.Form.Element.InputButton> {
+        /// <summary>
+        /// Creates a new
+        /// <see cref="InputButton"/>
+        /// instance.
+        /// </summary>
+        /// <param name="id">the id</param>
+        public InputButton(String id)
             : base(id) {
         }
 
+        /* (non-Javadoc)
+        * @see com.itextpdf.layout.element.AbstractElement#makeNewRenderer()
+        */
         protected override IRenderer MakeNewRenderer() {
-            return new ButtonContainerRenderer(this);
-        }
-
-        /// <summary>Adds any block element to the div's contents.</summary>
-        /// <param name="element">
-        /// a
-        /// <see cref="iText.Layout.Element.BlockElement{T}"/>
-        /// </param>
-        /// <returns>this Element</returns>
-        public virtual iText.Html2pdf.Attach.Impl.Layout.Form.Element.ButtonContainer Add(IBlockElement element) {
-            childElements.Add(element);
-            return this;
-        }
-
-        /// <summary>Adds an image to the div's contents.</summary>
-        /// <param name="element">
-        /// an
-        /// <see cref="iText.Layout.Element.Image"/>
-        /// </param>
-        /// <returns>this Element</returns>
-        public virtual iText.Html2pdf.Attach.Impl.Layout.Form.Element.ButtonContainer Add(Image element) {
-            childElements.Add(element);
-            return this;
-        }
-
-        public override T1 GetDefaultProperty<T1>(int property) {
-            if (property == Property.KEEP_TOGETHER) {
-                return (T1)(Object)true;
-            }
-            return base.GetDefaultProperty<T1>(property);
+            return new InputButtonRenderer(this);
         }
     }
 }

itext/itext.html2pdf/itext/html2pdf/attach/impl/layout/form/renderer/AbstractFormFieldRenderer.cs

@@ -177,16 +177,12 @@ public override MinMaxWidth GetMinMaxWidth() {
             MinMaxWidth minMaxWidth = base.GetMinMaxWidth();
             return minMaxWidth;
         }
-
-        /// <summary>Adjusts the field layout.</summary>
-        [System.ObsoleteAttribute(@"Will be removed in 3.0.0, override AdjustFieldLayout(iText.Layout.Layout.LayoutContext) instead."
-            )]
-        protected internal abstract void AdjustFieldLayout();
-
-        //NOTE: should be abstract in 3.0.0
-        protected internal virtual void AdjustFieldLayout(LayoutContext layoutContext) {
-            AdjustFieldLayout();
-        }
+        
+        /// <summary>
+        /// Adjusts the field layout.
+        /// </summary>
+        /// <param name="layoutContext">layout context</param>
+        protected internal abstract void AdjustFieldLayout(LayoutContext layoutContext);
 
         /// <summary>Creates the flat renderer instance.</summary>
         /// <returns>the renderer instance</returns>
@@ -213,29 +209,13 @@ protected internal virtual bool IsRendererFit(float availableWidth, float availa
             return availableHeight >= occupiedArea.GetBBox().GetHeight() && availableWidth >= occupiedArea.GetBBox().GetWidth
                 ();
         }
-
-        /// <summary>Gets the content width.</summary>
-        /// <returns>the content width</returns>
-        [System.ObsoleteAttribute(@"will be removed in 3.0.0. Use RetrieveWidth(float) } instead.")]
-        protected internal virtual float? GetContentWidth() {
-            return base.RetrieveWidth(0);
-        }
 
         /// <summary>Gets the accessibility language.</summary>
         /// <returns>the accessibility language</returns>
         protected virtual String GetLang() {
             return GetProperty<String>(Html2PdfProperty.FORM_ACCESSIBILITY_LANGUAGE);
         }
 
-        //NOTE: should be removed in 3.0.0
-        protected override float? RetrieveWidth(float parentBoxWidth) {
-            UnitValue width = base.GetProperty<UnitValue>(Property.WIDTH);
-            if (width != null && width.IsPointValue()) {
-                return GetContentWidth();
-            }
-            return base.RetrieveWidth(parentBoxWidth);
-        }
-
         protected internal virtual bool IsLayoutBasedOnFlatRenderer()
         {
             return true;

itext/itext.html2pdf/itext/html2pdf/attach/impl/layout/form/renderer/AbstractOneLineTextFieldRenderer.cs

@@ -40,7 +40,6 @@ source product.
 For more information, please contact iText Software Corp. at this
 address: [email protected]
 */
-using System;
 using System.Collections.Generic;
 using iText.Html2pdf.Attach.Impl.Layout.Form.Element;
 using iText.Kernel.Geom;
@@ -53,11 +52,6 @@ namespace iText.Html2pdf.Attach.Impl.Layout.Form.Renderer {
     /// for a single line of text content in a form field.
     /// </summary>
     public abstract class AbstractOneLineTextFieldRenderer : AbstractTextFieldRenderer {
-        /// <summary>The position of the base line of the text.</summary>
-        [System.ObsoleteAttribute(@"use iText.Layout.Renderer.AbstractRenderer.GetLastYLineRecursively() instead. Will be removed in 3.0.0"
-            )]
-        protected internal float baseline;
-
         /// <summary>
         /// Creates a new
         /// <see cref="AbstractOneLineTextFieldRenderer"/>
@@ -70,7 +64,6 @@ internal AbstractOneLineTextFieldRenderer(IFormField modelElement)
 
         public override void Move(float dxRight, float dyUp) {
             base.Move(dxRight, dyUp);
-            baseline += dyUp;
         }
 
         /// <summary>Crops the content lines.</summary>
@@ -79,7 +72,6 @@ public override void Move(float dxRight, float dyUp) {
         internal virtual void CropContentLines(IList<LineRenderer> lines, Rectangle bBox) {
             AdjustNumberOfContentLines(lines, bBox, 1);
             UpdateParagraphHeight();
-            this.baseline = lines[0].GetYLine();
         }
 
         /// <summary>Updates the paragraph height.</summary>