Skip to content

Commit 697c00e

Browse files
Eugene BochiloAnhelinaM
Eugene Bochilo
authored and
AnhelinaM
committed
Finalize code related to form fields renderers separation
DEVSIX-7385 Autoported commit. Original commit hash: [65673bbf0] Manual files: forms/pom.xml
1 parent 90f0dfa commit 697c00e

20 files changed

+132
-643
lines changed

‎itext.tests/itext.commons.tests/itext/commons/utils/ExperimentalFeaturesTest.cs

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎itext.tests/itext.forms.tests/itext/forms/PdfAcroFormIntegrationTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public static void BeforeClass() {
4747
public virtual void OrphanedNamelessFormFieldTest() {
4848
using (PdfDocument pdfDoc = new PdfDocument(new PdfReader(SOURCE_FOLDER + "orphanedFormField.pdf"))) {
4949
PdfAcroForm form = PdfAcroForm.GetAcroForm(pdfDoc, true);
50-
NUnit.Framework.Assert.AreEqual(3, form.GetDirectFormFields().Count);
50+
NUnit.Framework.Assert.AreEqual(3, form.GetRootFormFields().Count);
5151
}
5252
}
5353

‎itext.tests/itext.forms.tests/itext/forms/PdfAcroFormTest.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -277,7 +277,7 @@ public virtual void NamelessFieldTest() {
277277
e = NUnit.Framework.Assert.Catch(typeof(PdfException), () => acroForm.AddField(field, page));
278278
NUnit.Framework.Assert.AreEqual(FormsExceptionMessageConstant.FORM_FIELD_MUST_HAVE_A_NAME, e.Message);
279279
acroForm.AddField(field, page, false);
280-
NUnit.Framework.Assert.AreEqual(0, acroForm.GetDirectFormFields().Count);
280+
NUnit.Framework.Assert.AreEqual(0, acroForm.GetRootFormFields().Count);
281281
}
282282
}
283283

@@ -602,14 +602,14 @@ public virtual void ReplaceFormFieldRootLevelReplacesExistingFieldTest() {
602602
PdfFormField field = PdfFormField.MakeFormField(fieldDict.MakeIndirect(outputDoc), outputDoc);
603603
System.Diagnostics.Debug.Assert(field != null);
604604
acroForm.AddField(field);
605-
NUnit.Framework.Assert.AreEqual(1, acroForm.GetDirectFormFields().Count);
605+
NUnit.Framework.Assert.AreEqual(1, acroForm.GetRootFormFields().Count);
606606
PdfDictionary fieldDictReplace = new PdfDictionary();
607607
fieldDictReplace.Put(PdfName.FT, PdfName.Tx);
608608
fieldDictReplace.Put(PdfName.T, new PdfString("field2"));
609609
PdfFormField fieldReplace = PdfFormField.MakeFormField(fieldDictReplace.MakeIndirect(outputDoc), outputDoc
610610
);
611611
acroForm.ReplaceField("field1", fieldReplace);
612-
NUnit.Framework.Assert.AreEqual(1, acroForm.GetDirectFormFields().Count);
612+
NUnit.Framework.Assert.AreEqual(1, acroForm.GetRootFormFields().Count);
613613
NUnit.Framework.Assert.AreEqual("field2", acroForm.GetField("field2").GetFieldName().ToUnicodeString());
614614
}
615615
}
@@ -626,14 +626,14 @@ public virtual void ReplaceWithNullNameLogsErrorTest() {
626626
PdfFormField field = PdfFormField.MakeFormField(fieldDict.MakeIndirect(outputDoc), outputDoc);
627627
System.Diagnostics.Debug.Assert(field != null);
628628
acroForm.AddField(field);
629-
NUnit.Framework.Assert.AreEqual(1, acroForm.GetDirectFormFields().Count);
629+
NUnit.Framework.Assert.AreEqual(1, acroForm.GetRootFormFields().Count);
630630
PdfDictionary fieldDictReplace = new PdfDictionary();
631631
fieldDictReplace.Put(PdfName.FT, PdfName.Tx);
632632
fieldDictReplace.Put(PdfName.T, new PdfString("field2"));
633633
PdfFormField fieldReplace = PdfFormField.MakeFormField(fieldDictReplace.MakeIndirect(outputDoc), outputDoc
634634
);
635635
acroForm.ReplaceField(null, fieldReplace);
636-
NUnit.Framework.Assert.AreEqual(1, acroForm.GetDirectFormFields().Count);
636+
NUnit.Framework.Assert.AreEqual(1, acroForm.GetRootFormFields().Count);
637637
}
638638
}
639639

@@ -654,14 +654,14 @@ public virtual void ReplaceFormFieldOneDeepReplacesExistingFieldTest() {
654654
System.Diagnostics.Debug.Assert(fieldChild != null);
655655
field.AddKid(fieldChild);
656656
acroForm.AddField(field);
657-
NUnit.Framework.Assert.AreEqual(1, acroForm.GetDirectFormFields().Count);
657+
NUnit.Framework.Assert.AreEqual(1, acroForm.GetRootFormFields().Count);
658658
PdfDictionary fieldDictReplace = new PdfDictionary();
659659
fieldDictReplace.Put(PdfName.FT, PdfName.Tx);
660660
fieldDictReplace.Put(PdfName.T, new PdfString("field2"));
661661
PdfFormField fieldReplace = PdfFormField.MakeFormField(fieldDictReplace.MakeIndirect(outputDoc), outputDoc
662662
);
663663
acroForm.ReplaceField("field1.child1", fieldReplace);
664-
NUnit.Framework.Assert.AreEqual(1, acroForm.GetDirectFormFields().Count);
664+
NUnit.Framework.Assert.AreEqual(1, acroForm.GetRootFormFields().Count);
665665
NUnit.Framework.Assert.AreEqual("field1.field2", acroForm.GetField("field1.field2").GetFieldName().ToUnicodeString
666666
());
667667
}

‎itext/itext.commons/itext/commons/utils/ExperimentalFeatures.cs

Lines changed: 0 additions & 35 deletions
This file was deleted.

‎itext/itext.forms/itext/forms/PdfAcroForm.cs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -312,18 +312,13 @@ public virtual void AddFieldAppearanceToPage(PdfFormField field, PdfPage page) {
312312
}
313313
}
314314

315-
/// <summary>
316-
/// Gets the high-level
317-
/// <see cref="iText.Forms.Fields.PdfFormField">form field</see>
318-
/// s as a
319-
/// <see cref="System.Collections.IDictionary{K, V}"/>.
320-
/// </summary>
315+
/// <summary>Gets root fields (i.e. direct children of Acroform dictionary).</summary>
321316
/// <returns>
322317
/// a map of field names and their associated
323318
/// <see cref="iText.Forms.Fields.PdfFormField">form field</see>
324319
/// objects
325320
/// </returns>
326-
public virtual IDictionary<String, PdfFormField> GetDirectFormFields() {
321+
public virtual IDictionary<String, PdfFormField> GetRootFormFields() {
327322
if (fields.Count == 0) {
328323
fields = PopulateFormFieldsMap();
329324
}
@@ -1242,7 +1237,7 @@ public virtual void RemoveXfaForm() {
12421237
}
12431238
}
12441239

1245-
/// <summary>Put a key/value pair in the dictionary and overwrites the previous value if it already exists.</summary>
1240+
/// <summary>Put a key/value pair in the dictionary and overwrite previous value if it already exists.</summary>
12461241
/// <param name="key">the key as pdf name</param>
12471242
/// <param name="value">the value as pdf object</param>
12481243
/// <returns>

‎itext/itext.forms/itext/forms/PdfPageFormCopier.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public virtual void Copy(PdfPage fromPage, PdfPage toPage) {
8181
if (fieldsFrom.Count <= 0) {
8282
return;
8383
}
84-
IDictionary<String, PdfFormField> fieldsTo = formTo.GetDirectFormFields();
84+
IDictionary<String, PdfFormField> fieldsTo = formTo.GetRootFormFields();
8585
IList<PdfAnnotation> annots = toPage.GetAnnotations();
8686
try {
8787
foreach (PdfAnnotation annot in annots) {

0 commit comments

Comments
 (0)