diff options
| author | Simon Pepping <spepping@apache.org> | 2010-11-26 18:37:40 +0000 |
|---|---|---|
| committer | Simon Pepping <spepping@apache.org> | 2010-11-26 18:37:40 +0000 |
| commit | 347387b317df9ea899e96955232d5ccba3d355fd (patch) | |
| tree | 2630de4552e7da01dcd89badc16f6330b52ff96b /src/java/org/apache/fop/fonts/FontDetector.java | |
| parent | dbe01e0fa2bf8916be0d5d5f9a9bd83b2a726462 (diff) | |
| download | xmlgraphics-fop-347387b317df9ea899e96955232d5ccba3d355fd.tar.gz xmlgraphics-fop-347387b317df9ea899e96955232d5ccba3d355fd.zip | |
Second part of patch 50245 by Mehdi Houshmand
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1039502 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/java/org/apache/fop/fonts/FontDetector.java')
| -rw-r--r-- | src/java/org/apache/fop/fonts/FontDetector.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/java/org/apache/fop/fonts/FontDetector.java b/src/java/org/apache/fop/fonts/FontDetector.java index d69dfc9bd..88e4c6e69 100644 --- a/src/java/org/apache/fop/fonts/FontDetector.java +++ b/src/java/org/apache/fop/fonts/FontDetector.java @@ -42,9 +42,9 @@ public class FontDetector { "application/x-font", "application/x-font-truetype" }; - private FontManager fontManager; - private FontAdder fontAdder; - private boolean strict; + private final FontManager fontManager; + private final FontAdder fontAdder; + private final boolean strict; /** * Main constructor @@ -72,8 +72,7 @@ public class FontDetector { try { File fontBase = FileUtils.toFile(new URL(fontBaseURL)); if (fontBase != null) { - List/*<URL>*/ fontURLList = fontFileFinder.find( - fontBase.getAbsolutePath()); + List<URL> fontURLList = fontFileFinder.find(fontBase.getAbsolutePath()); fontAdder.add(fontURLList, fontInfoList); //Can only use the font base URL if it's a file URL @@ -84,7 +83,7 @@ public class FontDetector { } // native o/s font directory finding - List/*<URL>*/ systemFontList; + List<URL> systemFontList; try { systemFontList = fontFileFinder.find(); fontAdder.add(systemFontList, fontInfoList); |