From bd3c4b60f3440ed7da7f0179477196a665df5b2d Mon Sep 17 00:00:00 2001 From: HaoZhong Date: Tue, 12 May 2020 15:34:53 +0800 Subject: [PATCH] Add InvalidAfmPfm to IOException. --- io/src/main/java/com/itextpdf/io/IOException.java | 1 + io/src/main/java/com/itextpdf/io/font/Type1Parser.java | 4 ++-- kernel/src/test/java/com/itextpdf/kernel/pdf/PdfFontTest.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/io/src/main/java/com/itextpdf/io/IOException.java b/io/src/main/java/com/itextpdf/io/IOException.java index 6cb6d53e5e..7e2bee5a23 100644 --- a/io/src/main/java/com/itextpdf/io/IOException.java +++ b/io/src/main/java/com/itextpdf/io/IOException.java @@ -112,6 +112,7 @@ public class IOException extends RuntimeException { public static final String InvalidWoffFile = "Invalid WOFF font file."; public static final String InvalidMagicValueForBmpFileMustBeBM = "Invalid magic value for bmp file. Must be 'BM'"; public static final String InvalidTtcFile = "{0} is not a valid TTC file."; + public static final String InvalidAfmPfm = "Invalid afm or pfm font file."; public static final String IoException = "I/O exception."; public static final String Jbig2ImageException = "JBIG2 image exception."; public static final String Jpeg2000ImageException = "JPEG2000 image exception."; diff --git a/io/src/main/java/com/itextpdf/io/font/Type1Parser.java b/io/src/main/java/com/itextpdf/io/font/Type1Parser.java index fbb1fb6079..be9fcef797 100644 --- a/io/src/main/java/com/itextpdf/io/font/Type1Parser.java +++ b/io/src/main/java/com/itextpdf/io/font/Type1Parser.java @@ -129,14 +129,14 @@ public RandomAccessFileOrArray getMetricsFile() throws java.io.IOException { try { Pfm2afm.convert(rf, ba); } catch (Exception ignored) { - throw new IOException("Invalid afm or pfm font file."); + throw new IOException(IOException.InvalidAfmPfm); } finally { rf.close(); } return new RandomAccessFileOrArray(sourceFactory.createSource(ba.toByteArray())); } } else { - throw new IOException("Invalid afm or pfm font file."); + throw new IOException(IOException.InvalidAfmPfm); } } diff --git a/kernel/src/test/java/com/itextpdf/kernel/pdf/PdfFontTest.java b/kernel/src/test/java/com/itextpdf/kernel/pdf/PdfFontTest.java index ce0b7e86f0..d9dc3d4a79 100644 --- a/kernel/src/test/java/com/itextpdf/kernel/pdf/PdfFontTest.java +++ b/kernel/src/test/java/com/itextpdf/kernel/pdf/PdfFontTest.java @@ -1374,7 +1374,7 @@ public void createWrongAfm1() throws IOException { } catch (com.itextpdf.io.IOException e) { message = e.getMessage(); } - Assert.assertEquals("Invalid afm or pfm font file.", message); + Assert.assertEquals(IOException.InvalidAfmPfm, message); } @Test