Return-Path: X-Original-To: apmail-pdfbox-commits-archive@www.apache.org Delivered-To: apmail-pdfbox-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id F235218BB7 for ; Wed, 1 Jul 2015 20:56:53 +0000 (UTC) Received: (qmail 65757 invoked by uid 500); 1 Jul 2015 20:56:53 -0000 Delivered-To: apmail-pdfbox-commits-archive@pdfbox.apache.org Received: (qmail 65741 invoked by uid 500); 1 Jul 2015 20:56:53 -0000 Mailing-List: contact commits-help@pdfbox.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@pdfbox.apache.org Delivered-To: mailing list commits@pdfbox.apache.org Received: (qmail 65732 invoked by uid 99); 1 Jul 2015 20:56:53 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Jul 2015 20:56:53 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id BF216AC006B for ; Wed, 1 Jul 2015 20:56:53 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1688735 - /pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FontMapper.java Date: Wed, 01 Jul 2015 20:56:53 -0000 To: commits@pdfbox.apache.org From: tilman@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150701205653.BF216AC006B@hades.apache.org> Author: tilman Date: Wed Jul 1 20:56:53 2015 New Revision: 1688735 URL: http://svn.apache.org/r1688735 Log: PDFBOX-2576: follow JLS conventions Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FontMapper.java Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FontMapper.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FontMapper.java?rev=1688735&r1=1688734&r2=1688735&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FontMapper.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/FontMapper.java Wed Jul 1 20:56:53 2015 @@ -48,7 +48,7 @@ final class FontMapper private FontMapper() {} private static final FontCache fontCache = new FontCache(); // todo: static cache isn't ideal - private static final Log log = LogFactory.getLog(FontMapper.class); + private static final Log LOG = LogFactory.getLog(FontMapper.class); private static FontProvider fontProvider; private static Map fontInfoByName; @@ -83,7 +83,7 @@ final class FontMapper /** * Sets the font service provider. */ - public synchronized static void setProvider(FontProvider fontProvider) + public static synchronized void setProvider(FontProvider fontProvider) { FontMapper.fontProvider = fontProvider; fontInfoByName = createFontInfoByName(fontProvider.getFontInfo()); @@ -92,7 +92,7 @@ final class FontMapper /** * Returns the font service provider. Defaults to using FileSystemFontProvider. */ - public synchronized static FontProvider getProvider() + public static synchronized FontProvider getProvider() { if (fontProvider == null) { @@ -337,7 +337,7 @@ final class FontMapper if (ttf == null) { // we have to return something here as TTFs aren't strictly required on the system - log.error("Using last-resort fallback for TTF font '" + fontName + "'"); + LOG.error("Using last-resort fallback for TTF font '" + fontName + "'"); ttf = lastResortFont; } return new FontMapping(ttf, true); @@ -366,7 +366,7 @@ final class FontMapper if (font == null) { // we have to return something here as TTFs aren't strictly required on the system - log.error("Using last-resort fallback for font '" + fallbackName + "'"); + LOG.error("Using last-resort fallback for font '" + fallbackName + "'"); font = lastResortFont; } return new FontMapping(font, true); @@ -457,7 +457,7 @@ final class FontMapper // strip subset tag (happens when we substitute a corrupt embedded font, see PDFBOX-2642) if (postScriptName.contains("+")) { - postScriptName = postScriptName.substring(postScriptName.indexOf("+") + 1); + postScriptName = postScriptName.substring(postScriptName.indexOf('+') + 1); } // look up the PostScript name