Skip to content

Commit 7309ce8

Browse files
nikitakovaliov92yulian-gaponenko
nikitakovaliov92
authored and
yulian-gaponenko
committed
Rename the LogMessageConstant classes and move them into a separate package
DEVSIX-5773
1 parent bb13e6c commit 7309ce8

File tree

261 files changed

+2039
-1485
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

261 files changed

+2039
-1485
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ This file is part of the iText (R) project.
4646
import com.itextpdf.forms.exceptions.FormsExceptionMessageConstant;
4747
import com.itextpdf.forms.fields.PdfFormField;
4848
import com.itextpdf.forms.xfa.XfaForm;
49-
import com.itextpdf.io.LogMessageConstant;
49+
import com.itextpdf.io.logs.IoLogMessageConstant;
5050
import com.itextpdf.commons.utils.MessageFormatUtil;
5151
import com.itextpdf.kernel.exceptions.PdfException;
5252
import com.itextpdf.kernel.geom.AffineTransform;
@@ -720,7 +720,7 @@ public void flattenFields() {
720720
}
721721
}
722722
} else {
723-
logger.error(LogMessageConstant.N_ENTRY_IS_REQUIRED_FOR_APPEARANCE_DICTIONARY);
723+
logger.error(IoLogMessageConstant.N_ENTRY_IS_REQUIRED_FOR_APPEARANCE_DICTIONARY);
724724
}
725725

726726
PdfArray fFields = getFields();
@@ -861,7 +861,7 @@ public void replaceField(String name, PdfFormField field) {
861861
protected PdfArray getFields() {
862862
PdfArray fields = getPdfObject().getAsArray(PdfName.Fields);
863863
if (fields == null) {
864-
logger.warn(LogMessageConstant.NO_FIELDS_IN_ACROFORM);
864+
logger.warn(IoLogMessageConstant.NO_FIELDS_IN_ACROFORM);
865865
fields = new PdfArray();
866866
getPdfObject().put(PdfName.Fields, fields);
867867
}
@@ -877,12 +877,12 @@ private Map<String, PdfFormField> iterateFields(PdfArray array, Map<String, PdfF
877877
int index = 1;
878878
for (PdfObject field : array) {
879879
if (field.isFlushed()) {
880-
logger.info(LogMessageConstant.FORM_FIELD_WAS_FLUSHED);
880+
logger.info(IoLogMessageConstant.FORM_FIELD_WAS_FLUSHED);
881881
continue;
882882
}
883883
PdfFormField formField = PdfFormField.makeFormField(field, document);
884884
if (formField == null) {
885-
logger.warn(MessageFormatUtil.format(LogMessageConstant.CANNOT_CREATE_FORMFIELD,
885+
logger.warn(MessageFormatUtil.format(IoLogMessageConstant.CANNOT_CREATE_FORMFIELD,
886886
field.getIndirectReference() == null ? field : field.getIndirectReference()));
887887
continue;
888888
}

‎forms/src/main/java/com/itextpdf/forms/PdfPageFormCopier.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ This file is part of the iText (R) project.
4444
package com.itextpdf.forms;
4545

4646
import com.itextpdf.forms.fields.PdfFormField;
47-
import com.itextpdf.io.LogMessageConstant;
47+
import com.itextpdf.io.logs.IoLogMessageConstant;
4848
import com.itextpdf.commons.utils.MessageFormatUtil;
4949
import com.itextpdf.kernel.pdf.IPdfPageExtraCopier;
5050
import com.itextpdf.kernel.pdf.PdfArray;
@@ -123,7 +123,7 @@ public void copy(PdfPage fromPage, PdfPage toPage) {
123123
private PdfFormField makeFormField(PdfObject fieldDict) {
124124
PdfFormField field = PdfFormField.makeFormField(fieldDict, documentTo);
125125
if (field == null) {
126-
logger.warn(MessageFormatUtil.format(LogMessageConstant.CANNOT_CREATE_FORMFIELD,
126+
logger.warn(MessageFormatUtil.format(IoLogMessageConstant.CANNOT_CREATE_FORMFIELD,
127127
fieldDict.getIndirectReference()));
128128
}
129129
return field;
@@ -223,7 +223,7 @@ private PdfFormField mergeFieldsWithTheSameName(PdfFormField newField) {
223223
fullFieldName = newField.getFieldName().toUnicodeString();
224224
}
225225

226-
logger.warn(MessageFormatUtil.format(LogMessageConstant.DOCUMENT_ALREADY_HAS_FIELD, fullFieldName));
226+
logger.warn(MessageFormatUtil.format(IoLogMessageConstant.DOCUMENT_ALREADY_HAS_FIELD, fullFieldName));
227227

228228
PdfFormField existingField = formTo.getField(fullFieldName);
229229
if (existingField.isFlushed()) {

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ This file is part of the iText (R) project.
4343
*/
4444
package com.itextpdf.forms.fields;
4545

46-
import com.itextpdf.io.LogMessageConstant;
46+
import com.itextpdf.io.logs.IoLogMessageConstant;
4747
import com.itextpdf.io.font.PdfEncodings;
4848
import com.itextpdf.commons.utils.MessageFormatUtil;
4949
import com.itextpdf.kernel.pdf.PdfArray;
@@ -148,7 +148,7 @@ public PdfChoiceFormField setListSelected(String[] optionValues) {
148148
public PdfChoiceFormField setListSelected(String[] optionValues, boolean generateAppearance) {
149149
if (optionValues.length > 1 && !isMultiSelect()) {
150150
Logger logger = LoggerFactory.getLogger(this.getClass());
151-
logger.warn(LogMessageConstant.MULTIPLE_VALUES_ON_A_NON_MULTISELECT_FIELD);
151+
logger.warn(IoLogMessageConstant.MULTIPLE_VALUES_ON_A_NON_MULTISELECT_FIELD);
152152
}
153153
PdfArray options = getOptions();
154154
PdfArray indices = new PdfArray();
@@ -167,7 +167,7 @@ public PdfChoiceFormField setListSelected(String[] optionValues, boolean generat
167167
if (!(this.isCombo() && this.isEdit())) {
168168
Logger logger = LoggerFactory.getLogger(this.getClass());
169169
logger.warn(MessageFormatUtil
170-
.format(LogMessageConstant.FIELD_VALUE_IS_NOT_CONTAINED_IN_OPT_ARRAY, element,
170+
.format(IoLogMessageConstant.FIELD_VALUE_IS_NOT_CONTAINED_IN_OPT_ARRAY, element,
171171
this.getFieldName()));
172172
}
173173
values.add(new PdfString(element, PdfEncodings.UNICODE_BIG));
@@ -199,7 +199,7 @@ public PdfChoiceFormField setListSelected(String[] optionValues, boolean generat
199199
public PdfChoiceFormField setListSelected(int[] optionNumbers) {
200200
if (optionNumbers.length > 1 && !isMultiSelect()) {
201201
Logger logger = LoggerFactory.getLogger(this.getClass());
202-
logger.warn(LogMessageConstant.MULTIPLE_VALUES_ON_A_NON_MULTISELECT_FIELD);
202+
logger.warn(IoLogMessageConstant.MULTIPLE_VALUES_ON_A_NON_MULTISELECT_FIELD);
203203
}
204204
PdfArray indices = new PdfArray();
205205
PdfArray values = new PdfArray();

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ This file is part of the iText (R) project.
4949
import com.itextpdf.forms.exceptions.FormsExceptionMessageConstant;
5050
import com.itextpdf.forms.fields.borders.FormBorderFactory;
5151
import com.itextpdf.forms.util.DrawingUtil;
52-
import com.itextpdf.io.LogMessageConstant;
52+
import com.itextpdf.io.logs.IoLogMessageConstant;
5353
import com.itextpdf.io.font.FontProgram;
5454
import com.itextpdf.io.font.PdfEncodings;
5555
import com.itextpdf.io.font.constants.StandardFonts;
@@ -2433,7 +2433,7 @@ protected void drawTextAppearance(Rectangle rect, PdfFont font, float fontSize,
24332433
} else {
24342434
if (this.getFieldFlag(PdfTextFormField.FF_COMB)) {
24352435
Logger logger = LoggerFactory.getLogger(PdfFormField.class);
2436-
logger.error(MessageFormatUtil.format(LogMessageConstant.COMB_FLAG_MAY_BE_SET_ONLY_IF_MAXLEN_IS_PRESENT));
2436+
logger.error(MessageFormatUtil.format(IoLogMessageConstant.COMB_FLAG_MAY_BE_SET_ONLY_IF_MAXLEN_IS_PRESENT));
24372437
}
24382438
modelCanvas.showTextAligned(createParagraphForTextFieldValue(value).addStyle(paragraphStyle).setPaddings(0, X_OFFSET, 0, X_OFFSET),
24392439
x, rect.getHeight() / 2, textAlignment, VerticalAlignment.MIDDLE);
@@ -3347,7 +3347,7 @@ private boolean regenerateTextAndChoiceField(String value, PdfName type) {
33473347
} else {
33483348
//Avoid NPE when handling corrupt pdfs
33493349
Logger logger = LoggerFactory.getLogger(PdfFormField.class);
3350-
logger.error(LogMessageConstant.INCORRECT_PAGEROTATION);
3350+
logger.error(IoLogMessageConstant.INCORRECT_PAGEROTATION);
33513351
matrix = new PdfArray(new double[]{1, 0, 0, 1, 0, 0});
33523352
}
33533353
//Apply field rotation
@@ -3536,7 +3536,7 @@ private static PdfString generateDefaultAppearance(PdfName font, float fontSize,
35363536
.writeBytes(k);
35373537
} else {
35383538
Logger logger = LoggerFactory.getLogger(PdfFormField.class);
3539-
logger.error(LogMessageConstant.UNSUPPORTED_COLOR_IN_DA);
3539+
logger.error(IoLogMessageConstant.UNSUPPORTED_COLOR_IN_DA);
35403540
}
35413541
}
35423542
return new PdfString(output.toByteArray());

‎forms/src/main/java/com/itextpdf/forms/xfdf/XfdfObjectFactory.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ This file is part of the iText (R) project.
4343
package com.itextpdf.forms.xfdf;
4444

4545
import com.itextpdf.forms.PdfAcroForm;
46-
import com.itextpdf.io.LogMessageConstant;
46+
import com.itextpdf.io.logs.IoLogMessageConstant;
4747
import com.itextpdf.kernel.pdf.PdfArray;
4848
import com.itextpdf.kernel.pdf.PdfDictionary;
4949
import com.itextpdf.kernel.pdf.PdfDocument;
@@ -352,7 +352,7 @@ private void addAnnotObjectAttribute(AnnotObject annotObject, Node attributeNode
352352
case XfdfConstants.FRINGE:
353353
annotObject.addAttribute(new AttributeObject(attributeName, attributeNode.getNodeValue()));
354354
break;
355-
default: logger.warn(LogMessageConstant.XFDF_UNSUPPORTED_ANNOTATION_ATTRIBUTE);
355+
default: logger.warn(IoLogMessageConstant.XFDF_UNSUPPORTED_ANNOTATION_ATTRIBUTE);
356356
break;
357357
}
358358
}

‎forms/src/main/java/com/itextpdf/forms/xfdf/XfdfReader.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ This file is part of the iText (R) project.
4444

4545
import com.itextpdf.forms.PdfAcroForm;
4646
import com.itextpdf.forms.fields.PdfFormField;
47-
import com.itextpdf.io.LogMessageConstant;
47+
import com.itextpdf.io.logs.IoLogMessageConstant;
4848
import com.itextpdf.commons.utils.MessageFormatUtil;
4949
import com.itextpdf.kernel.geom.Rectangle;
5050
import com.itextpdf.kernel.pdf.PdfDocument;
@@ -81,10 +81,10 @@ void mergeXfdfIntoPdf(XfdfObject xfdfObject, PdfDocument pdfDocument, String pdf
8181
if (pdfDocumentName.equalsIgnoreCase(xfdfObject.getF().getHref())) {
8282
logger.info("Xfdf href and pdf name are equal. Continue merge");
8383
} else {
84-
logger.warn(LogMessageConstant.XFDF_HREF_ATTRIBUTE_AND_PDF_DOCUMENT_NAME_ARE_DIFFERENT);
84+
logger.warn(IoLogMessageConstant.XFDF_HREF_ATTRIBUTE_AND_PDF_DOCUMENT_NAME_ARE_DIFFERENT);
8585
}
8686
} else {
87-
logger.warn(LogMessageConstant.XFDF_NO_F_OBJECT_TO_COMPARE);
87+
logger.warn(IoLogMessageConstant.XFDF_NO_F_OBJECT_TO_COMPARE);
8888
}
8989
//TODO DEVSIX-4026 check for ids original/modified compatability with those in pdf document
9090

@@ -112,7 +112,7 @@ private void mergeFields(FieldsObject fieldsObject, PdfAcroForm form) {
112112
if (formFields.get(name) != null && xfdfField.getValue() != null) {
113113
formFields.get(name).setValue(xfdfField.getValue());
114114
} else {
115-
logger.error(LogMessageConstant.XFDF_NO_SUCH_FIELD_IN_PDF_DOCUMENT);
115+
logger.error(IoLogMessageConstant.XFDF_NO_SUCH_FIELD_IN_PDF_DOCUMENT);
116116
}
117117
}
118118
}
@@ -279,7 +279,9 @@ private void addAnnotationToPdf(AnnotObject annotObject, PdfDocument pdfDocument
279279
//XfdfConstants.LINK
280280
//XfdfConstants.REDACT
281281
//XfdfConstants.PROJECTION
282-
default: logger.warn(MessageFormatUtil.format(LogMessageConstant.XFDF_ANNOTATION_IS_NOT_SUPPORTED, annotName));
282+
default:
283+
logger.warn(
284+
MessageFormatUtil.format(IoLogMessageConstant.XFDF_ANNOTATION_IS_NOT_SUPPORTED, annotName));
283285
break;
284286
}
285287

‎forms/src/test/java/com/itextpdf/forms/FlatteningTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ This file is part of the iText (R) project.
4242
*/
4343
package com.itextpdf.forms;
4444

45-
import com.itextpdf.io.LogMessageConstant;
45+
import com.itextpdf.io.logs.IoLogMessageConstant;
4646
import com.itextpdf.kernel.pdf.PdfDocument;
4747
import com.itextpdf.kernel.pdf.PdfReader;
4848
import com.itextpdf.kernel.pdf.PdfWriter;
@@ -83,7 +83,7 @@ public void flatteningFormFieldNoSubtypeInAPTest() throws IOException, Interrupt
8383
}
8484

8585
@Test
86-
@LogMessages(messages = @LogMessage(messageTemplate = LogMessageConstant.N_ENTRY_IS_REQUIRED_FOR_APPEARANCE_DICTIONARY))
86+
@LogMessages(messages = @LogMessage(messageTemplate = IoLogMessageConstant.N_ENTRY_IS_REQUIRED_FOR_APPEARANCE_DICTIONARY))
8787
public void formFlatteningTestWithoutNEntry() throws IOException, InterruptedException {
8888
String filename = "formFlatteningTestWithoutNEntry";
8989
String src = sourceFolder + filename + ".pdf";

‎forms/src/test/java/com/itextpdf/forms/FormFieldFlatteningTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ This file is part of the iText (R) project.
4444

4545
import com.itextpdf.forms.fields.PdfFormField;
4646
import com.itextpdf.forms.fields.PdfTextFormField;
47-
import com.itextpdf.io.LogMessageConstant;
47+
import com.itextpdf.io.logs.IoLogMessageConstant;
4848
import com.itextpdf.kernel.colors.DeviceRgb;
4949
import com.itextpdf.kernel.pdf.PdfDocument;
5050
import com.itextpdf.kernel.pdf.PdfReader;
@@ -246,7 +246,7 @@ private static void fillTextFieldsThenFlattenThenCompare(String testName) throws
246246
}
247247

248248
@Test
249-
@LogMessages(messages = {@LogMessage(messageTemplate = LogMessageConstant.DOCUMENT_ALREADY_HAS_FIELD, count = 5)})
249+
@LogMessages(messages = {@LogMessage(messageTemplate = IoLogMessageConstant.DOCUMENT_ALREADY_HAS_FIELD, count = 5)})
250250
//Logging is expected since there are duplicate field names
251251
//isReadOnly should be true after DEVSIX-2156
252252
public void flattenReadOnly() throws IOException {

‎forms/src/test/java/com/itextpdf/forms/PdfChoiceFieldTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ This file is part of the iText (R) project.
2424

2525
import com.itextpdf.forms.fields.PdfChoiceFormField;
2626
import com.itextpdf.forms.fields.PdfFormField;
27-
import com.itextpdf.io.LogMessageConstant;
27+
import com.itextpdf.io.logs.IoLogMessageConstant;
2828
import com.itextpdf.io.font.PdfEncodings;
2929
import com.itextpdf.kernel.colors.ColorConstants;
3030
import com.itextpdf.kernel.font.PdfFont;
@@ -148,7 +148,7 @@ public void noWarningOnValueNotOfOptComboEditTest() throws IOException, Interrup
148148

149149
@Test
150150
@LogMessages(messages = {
151-
@LogMessage(messageTemplate = LogMessageConstant.FIELD_VALUE_IS_NOT_CONTAINED_IN_OPT_ARRAY, count = 2)})
151+
@LogMessage(messageTemplate = IoLogMessageConstant.FIELD_VALUE_IS_NOT_CONTAINED_IN_OPT_ARRAY, count = 2)})
152152
public void multiSelectByValueTest() throws IOException, InterruptedException {
153153
String outPdf = destinationFolder + "multiSelectByValueTest.pdf";
154154
String cmpPdf = sourceFolder + "cmp_multiSelectByValueTest.pdf";
@@ -191,7 +191,7 @@ public void corruptedOptAndValueSetToNullTest() throws IOException, InterruptedE
191191

192192
@Test
193193
@LogMessages(messages = {
194-
@LogMessage(messageTemplate = LogMessageConstant.FIELD_VALUE_IS_NOT_CONTAINED_IN_OPT_ARRAY)})
194+
@LogMessage(messageTemplate = IoLogMessageConstant.FIELD_VALUE_IS_NOT_CONTAINED_IN_OPT_ARRAY)})
195195
public void multiSelectByValueRemoveIKeyTest() throws IOException, InterruptedException {
196196
String srcPdf = sourceFolder + "listWithPreselectedValue.pdf";
197197
String outPdf = destinationFolder + "selectByValueRemoveIKeyTest.pdf";

0 commit comments

Comments
 (0)