CheckBox field bugs were fixed

IEA-12

Author: pavel-morozov-duallab

forms/src/main/java/com/itextpdf/forms/PdfAcroForm.java

@@ -144,8 +144,6 @@ public static PdfAcroForm getAcroForm(PdfDocument document, boolean createIfNotE
             acroForm.xfaForm = new XfaForm(document);
         }
 
-
-
         return acroForm;
     }
 

forms/src/main/java/com/itextpdf/forms/fields/PdfButtonFormField.java

@@ -1,7 +1,6 @@
 package com.itextpdf.forms.fields;
 
 import com.itextpdf.io.codec.Base64;
-import com.itextpdf.io.image.Image;
 import com.itextpdf.io.source.ByteArrayOutputStream;
 import com.itextpdf.kernel.pdf.PdfDictionary;
 import com.itextpdf.kernel.pdf.PdfDocument;
@@ -10,7 +9,6 @@
 import com.itextpdf.kernel.pdf.xobject.PdfFormXObject;
 
 import java.io.FileInputStream;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
 

forms/src/main/java/com/itextpdf/forms/fields/PdfFormField.java

@@ -552,7 +552,7 @@ public static PdfButtonFormField createPushButton(PdfDocument doc, Rectangle rec
      * @return a new {@link PdfButtonFormField checkbox}
      */
     public static PdfButtonFormField createCheckBox(PdfDocument doc, Rectangle rect, String name, String value) {
-        return createCheckBox(doc, rect, name, value, PdfButtonFormField.TYPE_CROSS);
+        return createCheckBox(doc, rect, name, value, TYPE_CROSS);
     }
 
     /**
@@ -572,10 +572,7 @@ public static PdfButtonFormField createCheckBox(PdfDocument doc, Rectangle rect,
         check.setFieldName(name);
         check.setValue(value);
         annot.setAppearanceState(new PdfName(value));
-        if (value.equals("Off")) {
-            value = "Yes";
-        }
-        check.drawCheckAppearance(rect.getWidth(), rect.getHeight(), value);
+        check.drawCheckAppearance(rect.getWidth(), rect.getHeight(), value.equals("Off") ? "Yes": value);
 
         return (PdfButtonFormField) check;
     }
@@ -2175,12 +2172,19 @@ protected void drawCheckAppearance(float width, float height, String value) {
 
         xObjectOn.getPdfObject().getOutputStream().writeBytes(streamOn.getBytes());
         xObjectOn.getResources().addFont(getDocument(), getFont());
-        widget.setNormalAppearance(new PdfDictionary());
-        widget.getNormalAppearanceObject().put(new PdfName(value), xObjectOn.getPdfObject());
+        setDefaultAppearance(generateDefaultAppearanceString(font, fontSize == 0 ? DEFAULT_FONT_SIZE : fontSize, xObjectOn.getResources()));
 
         xObjectOff.getPdfObject().getOutputStream().writeBytes(streamOff.getBytes());
         xObjectOff.getResources().addFont(getDocument(), getFont());
-        widget.getNormalAppearanceObject().put(new PdfName("Off"), xObjectOff.getPdfObject());
+
+        PdfDictionary normalAppearance = new PdfDictionary();
+        normalAppearance.put(new PdfName(value), xObjectOn.getPdfObject());
+        normalAppearance.put(new PdfName("Off"), xObjectOff.getPdfObject());
+
+        PdfDictionary mk = new PdfDictionary();
+        mk.put(PdfName.CA, new PdfString(text));
+        widget.put(PdfName.MK, mk);
+        widget.setNormalAppearance(normalAppearance);
     }
 
     /**
@@ -2255,6 +2259,17 @@ protected void drawCheckBox(PdfCanvas canvas, float width, float height, int fon
         if (!on) {
             return;
         }
+
+        if (checkType == TYPE_CROSS) {
+            float offset = borderWidth * 2;
+            canvas.
+                    moveTo((width - height) / 2 + offset, height - offset).
+                    lineTo((width + height) / 2 - offset, offset).
+                    moveTo((width + height) / 2 - offset, height - offset).
+                    lineTo((width - height) / 2 + offset, offset).
+                    stroke();
+            return;
+        }
         PdfFont ufont = getFont();
         // PdfFont gets all width in 1000 normalized units
         canvas.

forms/src/main/java/com/itextpdf/forms/xfa/XfaForm.java

@@ -6,7 +6,6 @@
 import com.itextpdf.kernel.pdf.PdfDocument;
 import com.itextpdf.kernel.pdf.PdfName;
 import com.itextpdf.kernel.pdf.PdfObject;
-import com.itextpdf.kernel.pdf.PdfReader;
 import com.itextpdf.kernel.pdf.PdfStream;
 import com.itextpdf.kernel.pdf.PdfString;
 import com.itextpdf.kernel.xmp.XmlDomWriter;

forms/src/test/java/com/itextpdf/forms/PdfFormFieldTest.java

@@ -1,16 +1,16 @@
 package com.itextpdf.forms;
 
+import com.itextpdf.forms.fields.PdfButtonFormField;
+import com.itextpdf.forms.fields.PdfChoiceFormField;
+import com.itextpdf.forms.fields.PdfFormField;
+import com.itextpdf.forms.fields.PdfTextFormField;
 import com.itextpdf.kernel.geom.Rectangle;
 import com.itextpdf.kernel.pdf.PdfDocument;
 import com.itextpdf.kernel.pdf.PdfPage;
 import com.itextpdf.kernel.pdf.PdfReader;
 import com.itextpdf.kernel.pdf.PdfWriter;
 import com.itextpdf.kernel.utils.CompareTool;
 import com.itextpdf.test.annotations.type.IntegrationTest;
-import com.itextpdf.forms.fields.PdfButtonFormField;
-import com.itextpdf.forms.fields.PdfChoiceFormField;
-import com.itextpdf.forms.fields.PdfFormField;
-import com.itextpdf.forms.fields.PdfTextFormField;
 import com.itextpdf.test.ExtendedITextTest;
 
 import java.io.FileOutputStream;