You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ti...@apache.org on 2019/09/26 18:17:57 UTC
svn commit: r1867600 -
/pdfbox/branches/issue4569/fontbox/src/main/java/org/apache/fontbox/util/autodetect/FontFileFinder.java
Author: tilman
Date: Thu Sep 26 18:17:56 2019
New Revision: 1867600
URL: http://svn.apache.org/viewvc?rev=1867600&view=rev
Log:
PDFBOX-4071: simplify code
Modified:
pdfbox/branches/issue4569/fontbox/src/main/java/org/apache/fontbox/util/autodetect/FontFileFinder.java
Modified: pdfbox/branches/issue4569/fontbox/src/main/java/org/apache/fontbox/util/autodetect/FontFileFinder.java
URL: http://svn.apache.org/viewvc/pdfbox/branches/issue4569/fontbox/src/main/java/org/apache/fontbox/util/autodetect/FontFileFinder.java?rev=1867600&r1=1867599&r2=1867600&view=diff
==============================================================================
--- pdfbox/branches/issue4569/fontbox/src/main/java/org/apache/fontbox/util/autodetect/FontFileFinder.java (original)
+++ pdfbox/branches/issue4569/fontbox/src/main/java/org/apache/fontbox/util/autodetect/FontFileFinder.java Thu Sep 26 18:17:56 2019
@@ -19,6 +19,7 @@ package org.apache.fontbox.util.autodete
import java.io.File;
import java.net.URI;
+import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import org.apache.commons.logging.Log;
@@ -74,7 +75,7 @@ public class FontFileFinder
fontDirFinder = determineDirFinder();
}
List<File> fontDirs = fontDirFinder.find();
- List<URI> results = new java.util.ArrayList<>();
+ List<URI> results = new ArrayList<>();
for (File dir : fontDirs)
{
walk(dir, results);
@@ -90,7 +91,7 @@ public class FontFileFinder
*/
public List<URI> find(String dir)
{
- List<URI> results = new java.util.ArrayList<>();
+ List<URI> results = new ArrayList<>();
File directory = new File(dir);
if (directory.isDirectory())
{
@@ -108,37 +109,39 @@ public class FontFileFinder
private void walk(File directory, List<URI> results)
{
// search for font files recursively in the given directory
- if (directory.isDirectory())
+ if (!directory.isDirectory())
+ {
+ return;
+ }
+ File[] filelist = directory.listFiles();
+ if (filelist == null)
{
- File[] filelist = directory.listFiles();
- if (filelist != null)
+ return;
+ }
+ for (File file : filelist)
+ {
+ if (file.isDirectory())
{
- for (File file : filelist)
+ // skip hidden directories
+ if (file.getName().startsWith("."))
{
- if (file.isDirectory())
- {
- // skip hidden directories
- if (file.getName().startsWith("."))
- {
- continue;
- }
- walk(file, results);
- }
- else
+ continue;
+ }
+ walk(file, results);
+ }
+ else
+ {
+ if (LOG.isDebugEnabled())
+ {
+ LOG.debug("checkFontfile check " + file);
+ }
+ if (checkFontfile(file))
+ {
+ if (LOG.isDebugEnabled())
{
- if (LOG.isDebugEnabled())
- {
- LOG.debug("checkFontfile check " + file);
- }
- if (checkFontfile(file))
- {
- if (LOG.isDebugEnabled())
- {
- LOG.debug("checkFontfile found " + file);
- }
- results.add(file.toURI());
- }
+ LOG.debug("checkFontfile found " + file);
}
+ results.add(file.toURI());
}
}
}