Make BlockRendrer abstract class; restore inherited return type.

Author: pavel-alay

layout/src/main/java/com/itextpdf/layout/Document.java

@@ -128,7 +128,7 @@ public Document add(AreaBreak areaBreak) {
     }
 
     @Override
-    public Document add(BlockElement element) {
+    public <T extends IElement> Document add(BlockElement<T> element) {
         checkClosingStatus();
         super.add(element);
         if (element instanceof ILargeElement) {

layout/src/main/java/com/itextpdf/layout/IPropertyContainer.java

@@ -71,28 +71,28 @@ public interface IPropertyContainer {
     /**
      * Gets the property from this entity. Compared to {@link #getOwnProperty(Property)},
      * this method can check parent's properties, styles, etc, depending on the origin of the instance
-     * @param <T> the return type associated with the property
+     * @param <T1> the return type associated with the property
      * @param property the property to be retrieved
      * @return the value of the given property. {@code null} will be returned if the property value was not found
      */
-    <T> T getProperty(Property property);
+    <T1> T1 getProperty(Property property);
 
     /**
      * Gets own property from this entity. The property must have been set earlier to this entity.
      * If the property is not found, {@code null} will be returned.
-     * @param <T> the return type associated with the property
+     * @param <T1> the return type associated with the property
      * @param property the property to be retrieved
      * @return the value of the given own property. {@code null} will be returned if the property value was not found
      */
-    <T> T getOwnProperty(Property property);
+    <T1> T1 getOwnProperty(Property property);
 
     /**
      * Gets the default property from this entity.
-     * @param <T> the return type associated with the property
+     * @param <T1> the return type associated with the property
      * @param property the property to be retrieved
      * @return the default property value. If the default property is not defined, {@code null} will be returned
      */
-    <T> T getDefaultProperty(Property property);
+    <T1> T1 getDefaultProperty(Property property);
 
     /**
      * Sets a property for this entity.

layout/src/main/java/com/itextpdf/layout/RootElement.java

@@ -96,7 +96,7 @@ public abstract class RootElement<T extends IPropertyContainer> extends ElementP
      * @return this element
      * @see BlockElement
      */
-    public RootElement<T> add(BlockElement element) {
+    public <T2 extends IElement> RootElement<T> add(BlockElement<T2> element) {
         childElements.add(element);
         ensureRootRendererNotNull().addChild(element.createRendererSubTree());
         return this;

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

@@ -142,10 +142,8 @@ public T addStyle(Style style) {
      */
     protected void propagateArtifactRoleToChildElements() {
         for (IElement child : childElements) {
-            if (child instanceof AbstractElement) {
-                if (child instanceof IAccessibleElement) {
-                    ((IAccessibleElement) child).setRole(PdfName.Artifact);
-                }
+            if (child instanceof IAccessibleElement) {
+                ((IAccessibleElement) child).setRole(PdfName.Artifact);
             }
         }
     }

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

@@ -48,13 +48,14 @@ This file is part of the iText (R) project.
 import com.itextpdf.layout.property.AreaBreakType;
 import com.itextpdf.layout.property.Property;
 import com.itextpdf.layout.renderer.AreaBreakRenderer;
+import com.itextpdf.layout.renderer.IRenderer;
 
 /**
  * A layout object that terminates the current content area and creates a new
  * one. If no {@link PageSize} is given, the new content area will have the same
  * size as the current one.
  */
-public class AreaBreak extends AbstractElement {
+public class AreaBreak extends AbstractElement<AreaBreak> {
 
     protected PageSize pageSize;
 
@@ -109,7 +110,7 @@ public AreaBreakType getType() {
     }
 
     @Override
-    protected AreaBreakRenderer makeNewRenderer() {
+    protected IRenderer makeNewRenderer() {
         return new AreaBreakRenderer(this);
     }
 }

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

@@ -47,7 +47,6 @@ This file is part of the iText (R) project.
 import com.itextpdf.kernel.pdf.tagutils.IAccessibleElement;
 import com.itextpdf.layout.property.Property;
 import com.itextpdf.layout.property.VerticalAlignment;
-import com.itextpdf.layout.renderer.BlockRenderer;
 
 /**
  * A {@link BlockElement} will try to take up as much horizontal space as
@@ -340,9 +339,4 @@ public T setRotationAngle(double angle) {
         setProperty(Property.ROTATION_ANGLE, (float) angle);
         return (T) this;
     }
-
-    @Override
-    protected BlockRenderer makeNewRenderer() {
-        return new BlockRenderer(this);
-    }
 }

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

@@ -105,7 +105,7 @@ public Cell () {
      * @return a cell renderer for this element
      */
     @Override
-    public CellRenderer getRenderer() {
+    public IRenderer getRenderer() {
         CellRenderer cellRenderer = null;
         if (nextRenderer != null) {
             if (nextRenderer instanceof CellRenderer) {
@@ -143,7 +143,7 @@ public int getColspan() {
      * @param element a {@link BlockElement}
      * @return this Element
      */
-    public Cell add(BlockElement element) {
+    public <T extends IElement> Cell add(BlockElement<T> element) {
         childElements.add(element);
         return this;
     }
@@ -240,7 +240,7 @@ public AccessibilityProperties getAccessibilityProperties() {
     }
 
     @Override
-    protected CellRenderer makeNewRenderer() {
+    protected IRenderer makeNewRenderer() {
         return new CellRenderer(this);
     }
 

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

@@ -46,6 +46,8 @@ This file is part of the iText (R) project.
 
 import com.itextpdf.kernel.pdf.PdfName;
 import com.itextpdf.kernel.pdf.tagutils.AccessibilityProperties;
+import com.itextpdf.layout.renderer.DivRenderer;
+import com.itextpdf.layout.renderer.IRenderer;
 
 /**
  * A {@link Div} is a container object that defines a section in a document,
@@ -65,7 +67,7 @@ public class Div extends BlockElement<Div> {
      * @param element a {@link BlockElement}
      * @return this Element
      */
-    public Div add(BlockElement element) {
+    public <T extends IElement> Div add(BlockElement<T> element) {
         childElements.add(element);
         return this;
     }
@@ -101,4 +103,9 @@ public AccessibilityProperties getAccessibilityProperties() {
         }
         return tagProperties;
     }
+
+    @Override
+    protected IRenderer makeNewRenderer() {
+        return new DivRenderer(this);
+    }
 }

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

@@ -48,7 +48,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.kernel.pdf.canvas.draw.ILineDrawer;
 import com.itextpdf.kernel.pdf.tagutils.AccessibilityProperties;
 import com.itextpdf.layout.property.Property;
-import com.itextpdf.layout.renderer.BlockRenderer;
+import com.itextpdf.layout.renderer.IRenderer;
 import com.itextpdf.layout.renderer.LineSeparatorRenderer;
 
 /**
@@ -70,7 +70,7 @@ public LineSeparator(ILineDrawer lineDrawer) {
     }
 
     @Override
-    protected BlockRenderer makeNewRenderer() {
+    protected IRenderer makeNewRenderer() {
         return new LineSeparatorRenderer(this);
     }
 

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

@@ -49,6 +49,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.kernel.pdf.action.PdfAction;
 import com.itextpdf.kernel.pdf.annot.PdfLinkAnnotation;
 import com.itextpdf.kernel.pdf.navigation.PdfDestination;
+import com.itextpdf.layout.renderer.IRenderer;
 import com.itextpdf.layout.renderer.LinkRenderer;
 
 /**
@@ -101,7 +102,7 @@ public PdfLinkAnnotation getLinkAnnotation() {
     }
 
     @Override
-    protected LinkRenderer makeNewRenderer() {
+    protected IRenderer makeNewRenderer() {
         return new LinkRenderer(this, text);
     }
 }