Update exception messages. Add test category to io tests.

Author: pavel-alay

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

@@ -1,29 +1,30 @@
 package com.itextpdf.io;
 
+import java.text.MessageFormat;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 public class IOException extends RuntimeException {
 
-    public static final String _1BitSamplesAreNotSupportedForHorizontalDifferencingPredictor = "1.bit.samples.are.not.supported.for.horizontal.differencing.predictor";
-    public static final String _1CorruptedJfifMarker = "1.corrupted.jfif.marker";
-    public static final String _1IsNotAValidJpegFile = "1.is.not.a.valid.jpeg.file";
-    public static final String _1MustHave8BitsPerComponent = "1.must.have.8.bits.per.component";
-    public static final String _1UnsupportedJpegMarker2 = "1.unsupported.jpeg.marker.2";
-    public static final String _1IsNotAnAFMorPfmFontFile = "1.is.not.an.afm.or.pfm.font.file";
+    public static final String _1BitSamplesAreNotSupportedForHorizontalDifferencingPredictor = "{0} bit.samples.are.not.supported.for.horizontal.differencing.predictor";
+    public static final String _1CorruptedJfifMarker = "{0} corrupted.jfif.marker";
+    public static final String _1IsNotAValidJpegFile = "{0} is.not.a.valid.jpeg.file";
+    public static final String _1MustHave8BitsPerComponent = "{0} must.have.8.bits.per.component";
+    public static final String _1UnsupportedJpegMarker2 = "{0} unsupported.jpeg.marker {1}";
+    public static final String _1IsNotAnAFMorPfmFontFile = "{0} is.not.an.afm.or.pfm.font.file";
 
     public static final String AllFillBitsPrecedingEolCodeMustBe0 = "all.fill.bits.preceding.eol.code.must.be.0";
     public static final String BadEndiannessTagNot0x4949Or0x4d4d = "bad.endianness.tag.not.0x4949.or.0x4d4d";
     public static final String BadMagicNumberShouldBe42 = "bad.magic.number.should.be.42";
     public static final String BitsPerComponentMustBe1_2_4or8 = "bits.per.component.must.be.1.2.4.or.8";
-    public static final String BitsPerSample1IsNotSupported = "bits.per.sample.1.is.not.supported";
+    public static final String BitsPerSample1IsNotSupported = "bits.per.sample {0} is.not.supported";
     public static final String BmpImageException = "bmp.image.exception";
     public static final String BytesCanBeAssignedToByteArrayOutputStreamOnly = "bytes.can.be.assigned.to.bytearrayoutputstream.only";
     public static final String BytesCanBeResetInByteArrayOutputStreamOnly = "bytes.can.be.reset.in.bytearrayoutputstream.only";
 
     public static final String CannotGetTiffImageColor = "cannot.get.tiff.image.color";
-    public static final String CannotFind1Frame = "cannot.find.1.frame";
+    public static final String CannotFind1Frame = "cannot.find {0} frame";
     public static final String CannotHandleBoxSizesHigherThan2_32 = "cannot.handle.box.sizes.higher.than.2.32";
     public static final String CannotInflateTiffImage = "cannot.inflate.tiff.image";
     public static final String CannotReadTiffImage = "cannot.read.tiff.image";
@@ -33,12 +34,12 @@ public class IOException extends RuntimeException {
     public static final String CannotWriteIntNumber = "cannot.write.int.number";
     public static final String CcittCompressionTypeMustBeCcittg4Ccittg3_1dOrCcittg3_2d = "ccitt.compression.type.must.be.ccittg4.ccittg3.1d.or.ccittg3.2d";
     public static final String ComponentsMustBe1_3Or4 = "components.must.be.1.3.or.4";
-    public static final String Compression1IsNotSupported = "compression.1.is.not.supported";
-    public static final String CompressionJpegIsOnlySupportedWithASingleStripThisImageHas1Strips = "compression.jpeg.is.only.supported.with.a.single.strip.this.image.has.1.strips";
+    public static final String Compression1IsNotSupported = "compression {0} is.not.supported";
+    public static final String CompressionJpegIsOnlySupportedWithASingleStripThisImageHas1Strips = "compression.jpeg.is.only.supported.with.a.single.strip.this.image.has {0} strips";
     public static final String DirectoryNumberTooLarge = "directory.number.too.large";
     public static final String EolCodeWordEncounteredInBlackRun = "eol.code.word.encountered.in.black.run";
     public static final String EolCodeWordEncounteredInWhiteRun = "eol.code.word.encountered.in.white.run";
-    public static final String ErrorAtFilePointer1 = "error.at.file.pointer.1";
+    public static final String ErrorAtFilePointer1 = "error.at.file.pointer {0}";
     public static final String ErrorReadingString = "error.reading.string";
     public static final String ErrorWithJpMarker = "error.with.jp.marker";
 
@@ -51,22 +52,21 @@ public class IOException extends RuntimeException {
     public static final String FdfStartxrefNotFound = "fdf.startxref.not.found";
 
     public static final String FirstScanlineMustBe1dEncoded = "first.scanline.must.be.1d.encoded";
-    // TODO parametrized message
-    public static final String FontFileNotFound = "font.file.not.found";
+    public static final String FontFile1NotFound = "font.file {0} not.found";
     public static final String ImageFormatCannotBeRecognized = "image.format.cannot.be.recognized";
     public static final String GifImageException = "gif.image.exception";
     public static final String GtNotExpected = "gt.not.expected";
     public static final String GifSignatureNotFound = "gif.signature.not.found";
     public static final String IllegalValueForPredictorInTiffFile = "illegal.value.for.predictor.in.tiff.file";
-    public static final String Font1IsNotRecognized = "font.1.is.not.recognized";
+    public static final String Font1IsNotRecognized = "font {0} is.not.recognized";
     public static final String FontIsNotRecognized = "font.is.not.recognized";
 
     public static final String ImageCanNotBeAnImageMask = "image.can.not.be.an.image.mask";
     public static final String ImageMaskCannotContainAnotherImageMask = "image.mask.cannot.contain.another.image.mask";
     public static final String ImageMaskIsNotAMaskDidYouDoMakeMask = "image.mask.is.not.a.mask.did.you.do.makemask";
     public static final String IncompletePalette = "incomplete.palette";
 
-    public static final String InvalidTTCFile = "1.is.not.a.valid.ttc.file";
+    public static final String InvalidTTCFile = "{0} is.not.a.valid.ttc.file";
     public static final String InvalidBmpFileCompression = "invalid.bmp.file.compression";
     public static final String InvalidCodeEncountered = "invalid.code.encountered";
     public static final String InvalidCodeEncounteredWhileDecoding2dGroup3CompressedData = "invalid.code.encountered.while.decoding.2d.group.3.compressed.data";
@@ -79,7 +79,7 @@ public class IOException extends RuntimeException {
     public static final String JpegImageException = "jpeg.image.exception";
     public static final String Jpeg2000ImageException = "jpeg2000.image.exception";
     public static final String MissingTagSForOjpegCompression = "missing.tag.s.for.ojpeg.compression";
-    public static final String PageNumberMustBeGtEq1 = "page.number.must.be.gt.eq.1";
+    public static final String PageNumberMustBeGtEq1 = "page.number.must.be.gt.eq {0}";
     public static final String PdfEncodings = "pdf.encodings";
     public static final String PdfHeaderNotFound = "pdf.header.not.found";
     public static final String PdfStartxrefNotFound = "pdf.startxref.not.found";
@@ -97,15 +97,13 @@ public class IOException extends RuntimeException {
     public static final String TransparencyLengthMustBeEqualTo2WithCcittImages = "transparency.length.must.be.equal.to.2.with.ccitt.images";
     public static final String UnexpectedCloseBracket = "unexpected.close.bracket";
     public static final String UnexpectedGtGt = "unexpected.gt.gt";
-    public static final String UnknownCompressionType1 = "unknown.compression.type.1";
+    public static final String UnknownCompressionType1 = "unknown.compression.type {0}";
     public static final String UnsupportedBoxSizeEqEq0 = "unsupported.box.size.eq.eq.0";
-    public static final String WrongNumberOfComponentsInIccProfile = "icc.profile.contains.1.components.the.image.data.contains.2.components";
+    public static final String WrongNumberOfComponentsInIccProfile = "icc.profile.contains {0} components.the.image.data.contains {2} components";
 
     protected Object object;
     private List<Object> messageParams;
 
-    private final String ERROR_MESSAGE_LOCALE_PATH = "com.itextpdf.io.l10n.error.exception_messages";
-
     public IOException(String message) {
         super(message);
     }
@@ -130,7 +128,11 @@ public IOException(String message, Throwable cause, Object object) {
 
     @Override
     public String getMessage() {
-        return ResourceLocaleBundle.getMessage(ERROR_MESSAGE_LOCALE_PATH, super.getMessage(), messageParams);
+        if (messageParams == null || messageParams.isEmpty()) {
+            return super.getMessage();
+        } else {
+            return MessageFormat.format(super.getMessage(), messageParams.toArray());
+        }
     }
 
     public IOException setMessageParams(Object... messageParams) {

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

@@ -226,12 +226,11 @@ protected void setFontFamily(String fontFamily) {
         fontNames.setFamilyName(fontFamily);
     }
 
-
     protected  void checkFilePath(String path){
         if(path != null) {
             File f = new File(path);
             if (!FontConstants.BUILTIN_FONTS_14.contains(path) && (!f.exists() || !f.isFile())) {
-                throw new IOException(IOException.FontFileNotFound).setMessageParams(path);
+                throw new IOException(IOException.FontFile1NotFound).setMessageParams(path);
             }
         }
     }

io/src/main/java/com/itextpdf/io/font/FontProgram.java

@@ -81,7 +81,7 @@ protected  void checkFilePath(String path){
         if(path != null) {
             File f = new File(path);
             if ((!f.exists() || !f.isFile())) {
-                throw new IOException(IOException.FontFileNotFound).setMessageParams(path);
+                throw new IOException(IOException.FontFile1NotFound).setMessageParams(path);
             }
         }
     }