You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pdfbox.apache.org by ms...@apache.org on 2018/03/12 06:15:22 UTC
svn commit: r1826499 - in
/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox:
pdfwriter/COSWriter.java pdmodel/font/FileSystemFontProvider.java
Author: msahyoun
Date: Mon Mar 12 06:15:22 2018
New Revision: 1826499
URL: http://svn.apache.org/viewvc?rev=1826499&view=rev
Log:
PDFBOX-4071: remove unused field; split large method
Modified:
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java
pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java?rev=1826499&r1=1826498&r2=1826499&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdfwriter/COSWriter.java Mon Mar 12 06:15:22 2018
@@ -39,8 +39,6 @@ import java.util.Locale;
import java.util.Map;
import java.util.Set;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.pdfbox.cos.COSArray;
import org.apache.pdfbox.cos.COSBase;
import org.apache.pdfbox.cos.COSBoolean;
@@ -77,8 +75,6 @@ import org.apache.pdfbox.util.Hex;
*/
public class COSWriter implements ICOSVisitor, Closeable
{
- private static final Log LOG = LogFactory.getLog(COSWriter.class);
-
/**
* The dictionary open token.
*/
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java?rev=1826499&r1=1826498&r2=1826499&view=diff
==============================================================================
--- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java (original)
+++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FileSystemFontProvider.java Mon Mar 12 06:15:22 2018
@@ -298,7 +298,27 @@ final class FileSystemFontProvider exten
{
for (FSFontInfo fontInfo : fontInfoList)
{
- writer.write(fontInfo.postScriptName.trim());
+ writeFontInfo(writer, fontInfo);
+ }
+ }
+ catch (IOException e)
+ {
+ LOG.warn("Could not write to font cache", e);
+ LOG.warn("Installed fonts information will have to be reloaded for each start");
+ LOG.warn("You can assign a directory to the 'pdfbox.fontcache' property");
+ }
+
+ }
+ catch (SecurityException e)
+ {
+ LOG.debug("Couldn't create writer for font cache file", e);
+ return;
+ }
+ }
+
+ private void writeFontInfo(BufferedWriter writer, FSFontInfo fontInfo) throws IOException
+ {
+ writer.write(fontInfo.postScriptName.trim());
writer.write("|");
writer.write(fontInfo.format.toString());
writer.write("|");
@@ -344,21 +364,6 @@ final class FileSystemFontProvider exten
writer.write("|");
writer.write(fontInfo.file.getAbsolutePath());
writer.newLine();
- }
- }
- catch (IOException e)
- {
- LOG.warn("Could not write to font cache", e);
- LOG.warn("Installed fonts information will have to be reloaded for each start");
- LOG.warn("You can assign a directory to the 'pdfbox.fontcache' property");
- }
-
- }
- catch (SecurityException e)
- {
- LOG.debug("Couldn't create writer for font cache file", e);
- return;
- }
}
/**