[RELEASE] Merge branch 'release/7.0.6' into 7.0-master

Author: amedee

barcodes/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.itextpdf</groupId>
     <artifactId>root</artifactId>
-    <version>7.0.5</version>
+    <version>7.0.6</version>
   </parent>
 
   <artifactId>barcodes</artifactId>

font-asian/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.itextpdf</groupId>
     <artifactId>root</artifactId>
-    <version>7.0.5</version>
+    <version>7.0.6</version>
   </parent>
 
   <artifactId>font-asian</artifactId>

forms/pom.xml

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.itextpdf</groupId>
     <artifactId>root</artifactId>
-    <version>7.0.5</version>
+    <version>7.0.6</version>
   </parent>
 
   <artifactId>forms</artifactId>

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

@@ -76,7 +76,7 @@ protected PdfChoiceFormField(PdfDictionary pdfObject) {
 
     /**
      * Returns <code>Ch</code>, the form type for choice form fields.
-     * 
+     *
      * @return the form type, as a {@link PdfName}
      */
     @Override
@@ -86,7 +86,7 @@ public PdfName getFormType() {
 
     /**
      * Sets the index of the first visible option in a scrollable list.
-     * 
+     *
      * @param index the index of the first option
      * @return current {@link PdfChoiceFormField}
      */
@@ -106,7 +106,7 @@ public PdfNumber getTopIndex() {
 
     /**
      * Sets the selected items in the field.
-     * 
+     *
      * @param indices a sorted array of indices representing selected items in the field
      * @return current {@link PdfChoiceFormField}
      */
@@ -185,7 +185,7 @@ public PdfChoiceFormField setListSelected(int[] optionNumbers) {
 
     /**
      * Gets the currently selected items in the field
-     * 
+     *
      * @return a sorted array of indices representing the currently selected items in the field
      */
     public PdfArray getIndices() {
@@ -203,7 +203,7 @@ public PdfChoiceFormField setCombo(boolean combo) {
 
     /**
      * If true, the field is a combo box; if false, the field is a list box.
-     * 
+     *
      * @return whether or not the field is now a combo box.
      */
     public boolean isCombo() {
@@ -232,7 +232,7 @@ public boolean isEdit() {
     }
 
     /**
-     * If true, the field???s option items shall be sorted alphabetically.
+     * If true, the field's option items shall be sorted alphabetically.
      * This flag is intended for use by writers, not by readers.
      * @param sort whether or not to sort the items
      * @return current {@link PdfChoiceFormField}
@@ -242,7 +242,7 @@ public PdfChoiceFormField setSort(boolean sort) {
     }
 
     /**
-     * If true, the field???s option items shall be sorted alphabetically.
+     * If true, the field's option items shall be sorted alphabetically.
      * This flag is intended for use by writers, not by readers.
      * @return whether or not the items are currently sorted
      */
@@ -251,7 +251,7 @@ public boolean isSort() {
     }
 
     /**
-     * If true, more than one of the field???s option items may be selected
+     * If true, more than one of the field's option items may be selected
      * simultaneously; if false, at most one item shall be selected.
      * @param multiSelect whether or not to allow multiple selection
      * @return current {@link PdfChoiceFormField}
@@ -261,7 +261,7 @@ public PdfChoiceFormField setMultiSelect(boolean multiSelect) {
     }
 
     /**
-     * If true, more than one of the field???s option items may be selected simultaneously; if false, at most one item shall be selected.
+     * If true, more than one of the field's option items may be selected simultaneously; if false, at most one item shall be selected.
      * @return whether or not multiple selection is currently allowed
      */
     public boolean isMultiSelect() {

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

@@ -629,7 +629,7 @@ public static PdfChoiceFormField createChoice(PdfDocument doc, Rectangle rect, S
         field.put(PdfName.Opt, options);
         field.setFieldFlags(flags);
         field.setFieldName(name);
-        field.getPdfObject().put(PdfName.V, new PdfString(value));
+        field.getPdfObject().put(PdfName.V, new PdfString(value, PdfEncodings.UNICODE_BIG));
         if ((flags & PdfChoiceFormField.FF_COMBO) == 0) {
             value = field.optionsArrayToString(options);
         }
@@ -1035,13 +1035,10 @@ public PdfFormField setValue(String value, boolean generateAppearance) {
             put(PdfName.V, new PdfString(value, PdfEncodings.UNICODE_BIG));
         }
 
-        if (PdfName.Btn.equals(formType) && (getFieldFlags() & PdfButtonFormField.FF_PUSH_BUTTON) == 0) {
-            if (generateAppearance) {
-                regenerateField();
-            }
-        } else {
+        if (generateAppearance) {
             regenerateField();
         }
+
         this.setModified();
         return this;
     }
@@ -1901,12 +1898,11 @@ public boolean regenerateField() {
 
                 } else {
                     if (!getFieldFlag(PdfChoiceFormField.FF_COMBO)) {
-                        PdfNumber topIndex = ((PdfChoiceFormField) this).getTopIndex();
-                        PdfArray options = (PdfArray) getOptions().clone();
-                        if (topIndex != null) {
-                            PdfObject object = options.get(topIndex.intValue());
-                            options.remove(topIndex.intValue());
-                            options.add(0, object);
+                        PdfNumber topIndex = this.getPdfObject().getAsNumber(PdfName.TI);
+                        PdfArray options = getOptions();
+                        if (null != options) {
+                            PdfArray visibleOptions = null != topIndex ? new PdfArray(options.subList(topIndex.intValue(), options.size() - 1)) : (PdfArray) options.clone();
+                            value = optionsArrayToString(visibleOptions);
                         }
                         value = optionsArrayToString(options);
                     }
@@ -2427,8 +2423,8 @@ protected Rectangle getRect(PdfDictionary field) {
     protected static PdfArray processOptions(String[][] options) {
         PdfArray array = new PdfArray();
         for (String[] option : options) {
-            PdfArray subArray = new PdfArray(new PdfString(option[0]));
-            subArray.add(new PdfString(option[1]));
+            PdfArray subArray = new PdfArray(new PdfString(option[0], PdfEncodings.UNICODE_BIG));
+            subArray.add(new PdfString(option[1], PdfEncodings.UNICODE_BIG));
             array.add(subArray);
         }
         return array;
@@ -2437,7 +2433,7 @@ protected static PdfArray processOptions(String[][] options) {
     protected static PdfArray processOptions(String[] options) {
         PdfArray array = new PdfArray();
         for (String option : options) {
-            array.add(new PdfString(option));
+            array.add(new PdfString(option, PdfEncodings.UNICODE_BIG));
         }
         return array;
     }
@@ -3226,21 +3222,20 @@ private void applyRotation(PdfFormXObject xObject, float height, float width) {
         }
     }
 
-    private String optionsArrayToString(PdfArray options) {
-        String value = "";
+    private static String optionsArrayToString(PdfArray options) {
+        StringBuffer stringBuffer = new StringBuffer();
         for (PdfObject obj : options) {
             if (obj.isString()) {
-                value += ((PdfString) obj).toUnicodeString() + '\n';
+                stringBuffer.append(((PdfString) obj).toUnicodeString()).append('\n');
             } else if (obj.isArray()) {
                 PdfObject element = ((PdfArray) obj).get(1);
                 if (element.isString()) {
-                    value += ((PdfString) element).toUnicodeString() + '\n';
+                    stringBuffer.append(((PdfString) element).toUnicodeString()).append('\n');
                 }
             }
         }
-        value = value.substring(0, value.length() - 1);
-
-        return value;
+        stringBuffer.deleteCharAt(stringBuffer.length() - 1); // last '\n'
+        return stringBuffer.toString();
     }
 
     private static double degreeToRadians(double angle) {

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

@@ -49,10 +49,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.io.LogMessageConstant;
 import com.itextpdf.io.source.ByteArrayOutputStream;
 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.pdf.*;
 import com.itextpdf.kernel.utils.CompareTool;
 import com.itextpdf.test.ExtendedITextTest;
 import com.itextpdf.test.annotations.LogMessage;
@@ -362,4 +359,39 @@ public void acroFieldDictionaryNoFields() throws IOException, InterruptedExcepti
             Assert.fail(errorMessage);
         }
     }
+
+    @Test
+    public void regenerateAppearance() throws IOException, InterruptedException {
+        String input = "regenerateAppearance.pdf";
+        String output = "regenerateAppearance.pdf";
+        PdfDocument document = new PdfDocument(new PdfReader(sourceFolder + input ),
+                new PdfWriter(destinationFolder + output),
+                new StampingProperties().useAppendMode());
+        PdfAcroForm acro = PdfAcroForm.getAcroForm(document, false);
+        int i = 1;
+        for (Map.Entry<String, PdfFormField> entry : acro.getFormFields().entrySet()) {
+            if (entry.getKey().contains("field")) {
+                PdfFormField field = entry.getValue();
+                field.setValue("test" + i++, false);
+            }
+        }
+        document.close();
+        Assert.assertNull(new CompareTool().compareByContent(destinationFolder + output,
+                sourceFolder + "cmp_" + output, destinationFolder, "diff"));
+    }
+    @Test
+    public void regenerateAppearance2() throws IOException, InterruptedException {
+        String input = "regenerateAppearance2.pdf";
+        String output = "regenerateAppearance2.pdf";
+        PdfDocument document = new PdfDocument(new PdfReader(sourceFolder + input ),
+                new PdfWriter(destinationFolder + output),
+                new StampingProperties().useAppendMode());
+        PdfAcroForm acro = PdfAcroForm.getAcroForm(document, false);
+        acro.setNeedAppearances(true);
+        PdfFormField field = acro.getField("number");
+        field.setValue("20150044DR");
+        document.close();
+        Assert.assertNull(new CompareTool().compareByContent(destinationFolder + output,
+                sourceFolder + "cmp_" + output, destinationFolder, "diff"));
+    }
 }