Merge branch 'hotfix/fontstring' into develop

Author: Benoit Lagae

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

@@ -69,6 +69,7 @@ public final class LogMessageConstant {
     public static final String FILE_CHANNEL_CLOSING_FAILED = "Closing of the file channel this source is based on failed.";
     public static final String FONT_HAS_INVALID_GLYPH = "Font {0} has invalid glyph: {1}";
     public static final String FORBID_RELEASE_IS_SET = "ForbidRelease flag is set and release is called. Releasing will not be performed.";
+    public static final String FONT_PROPERTY_MUST_BE_PDF_FONT_OBJECT = "The Font Property must be a PdfFont object";
     public static final String FORM_FIELD_WAS_FLUSHED = "A form field was flushed. There's no way to create this field in the AcroForm dictionary.";
     public static final String IMAGE_HAS_AMBIGUOUS_SCALE = "The image cannot be auto scaled and scaled by a certain parameter simultaneously";
     public static final String IMAGE_HAS_JBIG2DECODE_FILTER = "Image cannot be inline if it has JBIG2Decode filter. It will be added as an ImageXObject";

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

@@ -1265,7 +1265,14 @@ private boolean isGlyphPartOfWordForHyphenation(Glyph g) {
 
     private void updateFontAndText() {
         if (strToBeConverted != null) {
-            font = getPropertyAsFont(Property.FONT);
+            try {
+                font = getPropertyAsFont(Property.FONT);
+            }
+            catch (ClassCastException cce) {
+                font = resolveFirstPdfFont();
+                Logger logger = LoggerFactory.getLogger(TextRenderer.class);
+                logger.error(LogMessageConstant.FONT_PROPERTY_MUST_BE_PDF_FONT_OBJECT);
+            }
             text = convertToGlyphLine(strToBeConverted);
             otfFeaturesApplied = false;
             strToBeConverted = null;

layout/src/test/java/com/itextpdf/layout/renderer/TextRendererTest.java

@@ -42,17 +42,25 @@ This file is part of the iText (R) project.
  */
 package com.itextpdf.layout.renderer;
 
+import com.itextpdf.io.LogMessageConstant;
 import com.itextpdf.kernel.geom.Rectangle;
 import com.itextpdf.kernel.pdf.ByteBufferOutputStream;
 import com.itextpdf.kernel.pdf.PdfDocument;
 import com.itextpdf.kernel.pdf.PdfWriter;
 import com.itextpdf.layout.Document;
+import com.itextpdf.layout.element.Paragraph;
 import com.itextpdf.layout.element.Text;
+import com.itextpdf.layout.font.FontProvider;
 import com.itextpdf.layout.layout.LayoutArea;
 import com.itextpdf.layout.layout.LayoutContext;
+import com.itextpdf.layout.layout.LayoutPosition;
 import com.itextpdf.layout.layout.LayoutResult;
+import com.itextpdf.layout.property.Property;
 import com.itextpdf.test.ExtendedITextTest;
+import com.itextpdf.test.annotations.LogMessage;
+import com.itextpdf.test.annotations.LogMessages;
 import com.itextpdf.test.annotations.type.UnitTest;
+
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -84,4 +92,42 @@ public void nextRendererTest() {
         Assert.assertEquals(result1.getOccupiedArea(), result2.getOccupiedArea());
     }
 
+    @Test
+    @LogMessages(messages = {
+            @LogMessage(messageTemplate = LogMessageConstant.FONT_PROPERTY_MUST_BE_PDF_FONT_OBJECT)
+    })
+    public void setTextException() {
+        final String val = "other text";
+        final String fontName = "Helvetica";
+        TextRenderer rend = (TextRenderer) new Text("basic text").getRenderer();
+        FontProvider fp = new FontProvider();
+        fp.addFont(fontName);
+        rend.setProperty(Property.FONT_PROVIDER, fp);
+        rend.setProperty(Property.FONT, fontName);
+        rend.setText(val);
+        Assert.assertEquals(val, rend.getText().toString());
+    }
+
+    /**
+     * This test assumes that absolute positioning for {@link Text} elements is
+     * not supported. Adding this support is the subject of DEVSIX-1393.
+     */
+    @Test
+    @LogMessages(messages = {
+            @LogMessage(messageTemplate = LogMessageConstant.FONT_PROPERTY_MUST_BE_PDF_FONT_OBJECT)
+    })
+    public void setFontAsText() {
+        PdfDocument pdfDoc = new PdfDocument(new PdfWriter(new ByteBufferOutputStream()));
+        pdfDoc.addNewPage();
+        Document doc = new Document(pdfDoc);
+        Text txt = new Text("text");
+        txt.setProperty(Property.POSITION, LayoutPosition.ABSOLUTE);
+        txt.setProperty(Property.TOP, 5f);
+        FontProvider fp = new FontProvider();
+        fp.addFont("Helvetica");
+        txt.setProperty(Property.FONT_PROVIDER, fp);
+        txt.setFont("Helvetica");
+        doc.add(new Paragraph().add(txt));
+        doc.close();
+    }
 }