Skip to content

Commit 6425ded

Browse files
pavel-alaypavel-alay
committed
Split io.util.Utilities into separate classes
1 parent 690db0b commit 6425ded

Some content is hidden

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

51 files changed

+694
-641
lines changed

‎io/src/main/java/com/itextpdf/io/font/AdobeGlyphList.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.itextpdf.io.font;
22

3-
import com.itextpdf.io.util.Utilities;
3+
import com.itextpdf.io.util.ResourceUtil;
44

55
import java.io.ByteArrayOutputStream;
66
import java.io.InputStream;
@@ -16,7 +16,7 @@ public class AdobeGlyphList {
1616
static {
1717
InputStream resource = null;
1818
try {
19-
resource = Utilities.getResourceStream(FontConstants.RESOURCE_PATH + "AdobeGlyphList.txt");
19+
resource = ResourceUtil.getResourceStream(FontConstants.RESOURCE_PATH + "AdobeGlyphList.txt");
2020
if (resource == null) {
2121
String msg = "AdobeGlyphList.txt not found as resource. (It must exist as resource in the package com.itextpdf.text.pdf.fonts)";
2222
throw new Exception(msg);

‎io/src/main/java/com/itextpdf/io/font/CidFontProperties.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.itextpdf.io.font;
22

33
import com.itextpdf.io.util.IntHashtable;
4-
import com.itextpdf.io.util.Utilities;
4+
import com.itextpdf.io.util.ResourceUtil;
55

66
import java.io.InputStream;
77
import java.util.Enumeration;
@@ -68,7 +68,7 @@ public static Map<String, Set<String>> getRegistryNames() {
6868
}
6969

7070
private static void loadRegistry() throws java.io.IOException {
71-
InputStream resource = Utilities.getResourceStream(RESOURCE_PATH_CMAP + "cjk_registry.properties");
71+
InputStream resource = ResourceUtil.getResourceStream(RESOURCE_PATH_CMAP + "cjk_registry.properties");
7272
Properties p = new Properties();
7373
p.load(resource);
7474
resource.close();
@@ -86,7 +86,7 @@ private static void loadRegistry() throws java.io.IOException {
8686

8787
private static Map<String, Object> readFontProperties(String name) throws java.io.IOException {
8888
name += ".properties";
89-
InputStream resource = Utilities.getResourceStream(RESOURCE_PATH_CMAP + name);
89+
InputStream resource = ResourceUtil.getResourceStream(RESOURCE_PATH_CMAP + name);
9090
Properties p = new Properties();
9191
p.load(resource);
9292
resource.close();

‎io/src/main/java/com/itextpdf/io/font/FontCache.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.itextpdf.io.IOException;
44
import com.itextpdf.io.util.IntHashtable;
5-
import com.itextpdf.io.util.Utilities;
5+
import com.itextpdf.io.util.ResourceUtil;
66
import com.itextpdf.io.font.cmap.AbstractCMap;
77
import com.itextpdf.io.font.cmap.CMapByteCid;
88
import com.itextpdf.io.font.cmap.CMapCidByte;
@@ -134,7 +134,7 @@ public static FontProgram saveFont(FontProgram font, String fontName) {
134134
}
135135

136136
private static void loadRegistry() throws java.io.IOException {
137-
InputStream resource = Utilities.getResourceStream(CMAP_RESOURCE_PATH + CJK_REGISTRY_FILENAME);
137+
InputStream resource = ResourceUtil.getResourceStream(CMAP_RESOURCE_PATH + CJK_REGISTRY_FILENAME);
138138
try {
139139
Properties p = new Properties();
140140
p.load(resource);
@@ -160,7 +160,7 @@ private static void loadRegistry() throws java.io.IOException {
160160
}
161161

162162
private static Map<String, Object> readFontProperties(String name) throws java.io.IOException {
163-
InputStream resource = Utilities.getResourceStream(CMAP_RESOURCE_PATH + name + ".properties");
163+
InputStream resource = ResourceUtil.getResourceStream(CMAP_RESOURCE_PATH + name + ".properties");
164164

165165
try {
166166
Properties p = new Properties();

‎io/src/main/java/com/itextpdf/io/font/FontEncoding.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.itextpdf.io.font;
22

3+
import com.itextpdf.io.util.ArrayUtil;
34
import com.itextpdf.io.util.IntHashtable;
4-
import com.itextpdf.io.util.Utilities;
55

66
import java.io.Serializable;
77
import java.util.StringTokenizer;
@@ -140,7 +140,7 @@ public byte[] convertToBytes(String text) {
140140
bytes[ptr++] = (byte)convertToByte(text.charAt(i));
141141
}
142142
}
143-
return Utilities.shortenArray(bytes, ptr);
143+
return ArrayUtil.shortenArray(bytes, ptr);
144144
}
145145

146146
/**

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import com.itextpdf.io.IOException;
44
import com.itextpdf.io.font.otf.Glyph;
5-
import com.itextpdf.io.util.FileUtils;
5+
import com.itextpdf.io.util.FileUtil;
66

77
import java.io.Serializable;
88
import java.util.HashMap;
@@ -234,7 +234,7 @@ protected void setFontFamily(String fontFamily) {
234234
}
235235

236236
protected void checkFilePath(String path) {
237-
if (path != null && !FontConstants.BUILTIN_FONTS_14.contains(path) && !FileUtils.fileExists(path)) {
237+
if (path != null && !FontConstants.BUILTIN_FONTS_14.contains(path) && !FileUtil.fileExists(path)) {
238238
throw new IOException(IOException.FontFile1NotFound).setMessageParams(path);
239239
}
240240
}

‎io/src/main/java/com/itextpdf/io/font/FontRegisterProvider.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package com.itextpdf.io.font;
22

33
import com.itextpdf.io.IOException;
4-
import com.itextpdf.io.util.FileUtils;
5-
import com.itextpdf.io.util.Utilities;
4+
import com.itextpdf.io.util.FileUtil;
65
import org.slf4j.Logger;
76
import org.slf4j.LoggerFactory;
87

@@ -339,12 +338,12 @@ public int registerDirectory(final String dir, final boolean scanSubdirectories)
339338
}
340339
int count = 0;
341340
try {
342-
String[] files = FileUtils.getDirectoryList(dir);
341+
String[] files = FileUtil.getDirectoryList(dir);
343342
if (files == null)
344343
return 0;
345344
for (String file : files) {
346345
try {
347-
if (FileUtils.isDirectory(file)) {
346+
if (FileUtil.isDirectory(file)) {
348347
if (scanSubdirectories) {
349348
count += registerDirectory(file, true);
350349
}
@@ -353,7 +352,7 @@ public int registerDirectory(final String dir, final boolean scanSubdirectories)
353352
if (".afm".equals(suffix) || ".pfm".equals(suffix)) {
354353
/* Only register Type 1 fonts with matching .pfb files */
355354
String pfb = file.substring(0, file.length() - 4) + ".pfb";
356-
if (FileUtils.fileExists(pfb)) {
355+
if (FileUtil.fileExists(pfb)) {
357356
register(file, null);
358357
++count;
359358
}
@@ -381,7 +380,7 @@ public int registerDirectory(final String dir, final boolean scanSubdirectories)
381380
public int registerSystemDirectories() {
382381
int count = 0;
383382
String[] withSubDirs = {
384-
FileUtils.getFontsDir(),
383+
FileUtil.getFontsDir(),
385384
"/usr/share/X11/fonts",
386385
"/usr/X/lib/X11/fonts",
387386
"/usr/openwin/lib/X11/fonts",

‎io/src/main/java/com/itextpdf/io/font/OpenTypeParser.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.itextpdf.io.IOException;
44
import com.itextpdf.io.source.RandomAccessFileOrArray;
55
import com.itextpdf.io.source.RandomAccessSourceFactory;
6-
import com.itextpdf.io.util.FileUtils;
6+
import com.itextpdf.io.util.FileUtil;
77
import com.itextpdf.io.util.IntHashtable;
88

99
import java.util.ArrayList;
@@ -204,7 +204,7 @@ public String getPsFontName() {
204204
if (names != null && names.size() > 0) {
205205
fontName = names.get(0)[3];
206206
} else {
207-
fontName = FileUtils.getFileName(fileName).replace(' ', '-');
207+
fontName = FileUtil.getFileName(fileName).replace(' ', '-');
208208
}
209209
}
210210
return fontName;

‎io/src/main/java/com/itextpdf/io/font/TrueTypeCollection.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.itextpdf.io.IOException;
44
import com.itextpdf.io.source.RandomAccessFileOrArray;
55
import com.itextpdf.io.source.RandomAccessSourceFactory;
6-
import com.itextpdf.io.util.FileUtils;
6+
import com.itextpdf.io.util.FileUtil;
77

88
/**
99
* Use this class for working with true type collection font (*.ttc)
@@ -25,7 +25,7 @@ public TrueTypeCollection(byte[] ttc, String encoding) throws java.io.IOExceptio
2525
}
2626

2727
public TrueTypeCollection(String ttcPath, String encoding) throws java.io.IOException {
28-
if (!FileUtils.fileExists(ttcPath)) {
28+
if (!FileUtil.fileExists(ttcPath)) {
2929
throw new IOException(IOException.FontFile1NotFound).setMessageParams(ttcPath);
3030
}
3131
raf = new RandomAccessFileOrArray(new RandomAccessSourceFactory().createBestSource(ttcPath));

‎io/src/main/java/com/itextpdf/io/font/Type1Parser.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.itextpdf.io.font;
22

33
import com.itextpdf.io.IOException;
4-
import com.itextpdf.io.util.Utilities;
4+
import com.itextpdf.io.util.ResourceUtil;
55
import com.itextpdf.io.source.RandomAccessFileOrArray;
66
import com.itextpdf.io.source.RandomAccessSourceFactory;
77

@@ -47,7 +47,7 @@ public RandomAccessFileOrArray getMetricsFile() throws java.io.IOException {
4747
InputStream resource = null;
4848
try {
4949
String resourcePath = FontConstants.RESOURCE_PATH + "afm/" + afmPath + ".afm";
50-
resource = Utilities.getResourceStream(resourcePath);
50+
resource = ResourceUtil.getResourceStream(resourcePath);
5151
if (resource == null) {
5252
throw new IOException("1.not.found.as.resource").setMessageParams(resourcePath);
5353
}

‎io/src/main/java/com/itextpdf/io/font/cmap/CMapCidUni.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.itextpdf.io.font.cmap;
22

33
import com.itextpdf.io.util.IntHashtable;
4-
import com.itextpdf.io.util.Utilities;
4+
import com.itextpdf.io.util.TextUtil;
55

66
/**
77
* @author psoares
@@ -15,8 +15,8 @@ void addChar(String mark, CMapObject code) {
1515
if (code.isNumber()) {
1616
int codePoint;
1717
String s = toUnicodeString(mark, true);
18-
if (Utilities.isSurrogatePair(s, 0)) {
19-
codePoint = Utilities.convertToUtf32(s, 0);
18+
if (TextUtil.isSurrogatePair(s, 0)) {
19+
codePoint = TextUtil.convertToUtf32(s, 0);
2020
} else {
2121
codePoint = (int) s.charAt(0);
2222
}

0 commit comments

Comments
 (0)