code review fixes

DEVSIX-1267

Author: pavel-morozov-duallab

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

@@ -538,17 +538,23 @@ public void drawBackground(DrawContext drawContext) {
      * @param drawContext the context (canvas, document, etc) of this drawing operation.
      */
     public void drawChildren(DrawContext drawContext) {
+        List<IRenderer> waitingRenderers = new ArrayList<>();
         for (IRenderer child : childRenderers) {
             if (FloatingHelper.isRendererFloating(child)) {
                 RootRenderer rootRenderer = getRootRenderer();
                 if (rootRenderer != null) {
                     rootRenderer.waitingDrawingElements.add(child);
                     child.setProperty(Property.FLOAT, null);
+                } else {
+                    waitingRenderers.add(child);
                 }
             } else {
                 child.draw(drawContext);
             }
         }
+        for (IRenderer waitingRenderer : waitingRenderers) {
+            waitingRenderer.draw(drawContext);
+        }
     }
 
     /**

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

@@ -165,7 +165,7 @@ public LayoutResult layout(LayoutContext layoutContext) {
         // the first renderer (one of childRenderers or their children) to produce LayoutResult.NOTHING
         IRenderer causeOfNothing = null;
         boolean anythingPlaced = false;
-        for (int childPos = 0, length = childRenderers.size(); childPos < length; childPos++) {
+        for (int childPos = 0; childPos < childRenderers.size(); childPos++) {
             IRenderer childRenderer = childRenderers.get(childPos);
             LayoutResult result;
             childRenderer.setParent(this);
@@ -363,7 +363,6 @@ public LayoutResult layout(LayoutContext layoutContext) {
                                 result.getOverflowRenderer().setProperty(Property.MARGIN_LEFT, marginLeft + leftPoint - occupiedArea.getBBox().getLeft());
                             }
                             childRenderers.remove(childPos);
-                            length--;
                             childPos--;
                             waitingOverflowRenderers.add(result.getOverflowRenderer());
                             break;

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

@@ -122,7 +122,6 @@ public LayoutResult layout(LayoutContext layoutContext) {
         applyBorderBox(layoutBox, borders, false);
 
         if (isAbsolutePosition()) {
-            // TODO applying it after floats processing here and everywhere. is it correct?
             applyAbsolutePosition(layoutBox);
         }
 

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

@@ -425,7 +425,7 @@ public LineLayoutResult layout(LayoutContext layoutContext) {
                     if (anythingPlaced || floatsPlaced) {
                         result = new LineLayoutResult(LayoutResult.PARTIAL, occupiedArea, split[0], split[1], causeOfNothing);
                     } else {
-                        result = new LineLayoutResult(LayoutResult.NOTHING, null, split[0], split[1], causeOfNothing);
+                        result = new LineLayoutResult(LayoutResult.NOTHING, null, split[0], split[1], null);
                     }
                 }
                 if (newLineOccurred) {

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

@@ -183,39 +183,6 @@ public LayoutResult layout(LayoutContext layoutContext) {
             float lineIndent = anythingPlaced ? 0 : (float) this.getPropertyAsFloat(Property.FIRST_LINE_INDENT);
             float childBBoxWidth = layoutBox.getWidth() - lineIndent;
             Rectangle childLayoutBox = new Rectangle(layoutBox.getX() + lineIndent, layoutBox.getY(), childBBoxWidth, layoutBox.getHeight());
-
-//            if (childAffectedByFloat) {
-//                currentRenderer.layout(new LayoutContext(new LayoutArea(pageNumber, childLayoutBox), layoutContext.getMarginsCollapseInfo(), floatRendererAreas));
-//                float bottom = currentRenderer.getOccupiedArea().getBBox().getBottom();
-//                float top = currentRenderer.getOccupiedArea().getBBox().getTop();
-//                float left = currentRenderer.getOccupiedArea().getBBox().getLeft();
-//                float right = currentRenderer.getOccupiedArea().getBBox().getRight();
-//                boolean childLayoutBoxWasAdjusted;
-//                float rightBorder = childLayoutBox.getRight();
-//                float curRendWidth = currentRenderer.getOccupiedAreaBBox().getWidth();
-//                do {
-//                    childLayoutBoxWasAdjusted = false;
-//                    for (Rectangle floatRendereArea : floatRendererAreas) {
-//                        if ((bottom > floatRendereArea.getBottom() && bottom < floatRendereArea.getTop()) || (top > floatRendereArea.getBottom() && top < floatRendereArea.getTop())) {
-//                            if ((left >= floatRendereArea.getLeft() && left < floatRendereArea.getRight()) ||
-//                                    (right > floatRendereArea.getLeft() && right < floatRendereArea.getRight()) ||
-//                                    (left > floatRendereArea.getLeft() && right < floatRendereArea.getRight())) {
-//                                childLayoutBox.setX(floatRendereArea.getRight());
-//
-//
-//                                if (childLayoutBox.getLeft() + curRendWidth > rightBorder) {
-//                                    childLayoutBox.setWidth(rightBorder - childLayoutBox.getLeft());
-//                                } else {
-//                                    childLayoutBox.setWidth(curRendWidth);
-//                                }
-//                                left = childLayoutBox.getLeft();
-//                                right = childLayoutBox.getRight();
-//                                childLayoutBoxWasAdjusted = true;
-//                            }
-//                        }
-//                    }
-//                } while(childLayoutBoxWasAdjusted);
-//            }
             LineLayoutResult result = ((LineRenderer) currentRenderer.setParent(this)).layout(new LayoutContext(
                     new LayoutArea(pageNumber, childLayoutBox), null,
                     floatRendererAreas));

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

@@ -103,7 +103,7 @@ public void addChild(IRenderer renderer) {
         }
 
         // Static layout
-        for (int i = 0, l = addedRenderers.size(); currentArea != null && i < l; i++) {
+        for (int i = 0; currentArea != null && i <  addedRenderers.size(); i++) {
             renderer = addedRenderers.get(i);
 
             processWaitingKeepWithNextElement(renderer);
@@ -193,7 +193,6 @@ public void addChild(IRenderer renderer) {
                     renderer = waitingRenderers.remove(0);
                     addedRenderers.addAll(waitingRenderers);
                     addedRenderers.add(result.getOverflowRenderer());
-                    l+= waitingRenderers.size() + 1;
                 } else {
                     renderer = result.getOverflowRenderer();
                 }
@@ -320,7 +319,7 @@ protected void shrinkCurrentAreaAndProcessRenderer(IRenderer renderer, List<IRen
         if (currentArea != null) {
             float resultRendererHeight = result.getOccupiedArea().getBBox().getHeight();
             currentArea.getBBox().setHeight(currentArea.getBBox().getHeight() - resultRendererHeight);
-            if (currentArea.isEmptyArea() && resultRendererHeight > 0) {
+            if (currentArea.isEmptyArea() && (resultRendererHeight > 0 || FloatingHelper.isRendererFloating(renderer))) {
                 currentArea.setEmptyArea(false);
             }
             processRenderer(renderer, resultRenderers);

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

@@ -336,8 +336,8 @@ public LayoutResult layout(LayoutContext layoutContext) {
         // if this is the last renderer, we will use that information to enlarge rows proportionally
         List<Boolean> rowsHasCellWithSetHeight = new ArrayList<>();
 
-        List<Rectangle> childFloatRendererAreas = new ArrayList<>();
         for (row = 0; row < rows.size(); row++) {
+            List<Rectangle> childFloatRendererAreas = new ArrayList<>();
             // if forced placement was earlier set, this means the element did not fit into the area, and in this case
             // we only want to place the first row in a forced way, not the next ones, otherwise they will be invisible
             if (row == 1 && Boolean.TRUE.equals(this.<Boolean>getProperty(Property.FORCED_PLACEMENT))) {

layout/src/test/java/com/itextpdf/layout/FloatTest.java

@@ -68,7 +68,6 @@ This file is part of the iText (R) project.
 import com.itextpdf.test.annotations.type.IntegrationTest;
 import org.junit.Assert;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -222,12 +221,7 @@ public void floatDivTest02() throws IOException, InterruptedException {
     }
 
     @Test
-    @Ignore("block level floating elements page-overflow and splitting not supported yet")
     public void floatDivTest03() throws IOException, InterruptedException {
-        //
-        // TODO probably we shouldn't review forced placement applying on floated elements
-        // May be check if there are any floated elements already on page
-        //
         String cmpFileName = sourceFolder + "cmp_floatDivTest03.pdf";
         String outFile = destinationFolder + "floatDivTest03.pdf";
 
@@ -289,7 +283,7 @@ public void floatingImageInCell() throws IOException, InterruptedException {
     }
 
     @Test
-    @Ignore("block level floating elements page-overflow and splitting not supported yet")
+    @LogMessages(messages = @LogMessage(messageTemplate = LogMessageConstant.ELEMENT_DOES_NOT_FIT_AREA))
     public void floatingImageToNextPage() throws IOException, InterruptedException {
         String cmpFileName = sourceFolder + "cmp_floatingImageToNextPage.pdf";
         String outFile = destinationFolder + "floatingImageToNextPage.pdf";