Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFont.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFont.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFont.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFont.java Fri Oct 27 06:05:21 2023 @@ -20,8 +20,8 @@ import java.io.IOException; import java.io.InputStream; import java.util.HashMap; import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.pdfbox.cos.COSArray; import org.apache.pdfbox.cos.COSBase; @@ -43,7 +43,7 @@ import org.apache.pdfbox.util.Vector; */ public abstract class PDCIDFont implements COSObjectable, PDFontLike, PDVectorFont { - private static final Log LOG = LogFactory.getLog(PDCIDFont.class); + private static final Logger LOG = LogManager.getLogger(PDCIDFont.class); protected final PDType0Font parent; @@ -85,7 +85,7 @@ public abstract class PDCIDFont implemen COSBase firstCodeBase = wArray.getObject(counter++); if (!(firstCodeBase instanceof COSNumber)) { - LOG.warn("Expected a number array member, got " + firstCodeBase); + LOG.warn("Expected a number array member, got {}", firstCodeBase); continue; } COSNumber firstCode = (COSNumber) firstCodeBase; @@ -105,7 +105,7 @@ public abstract class PDCIDFont implemen } else { - LOG.warn("Expected a number array member, got " + widthBase); + LOG.warn("Expected a number array member, got {}", widthBase); } } } @@ -120,7 +120,8 @@ public abstract class PDCIDFont implemen COSBase rangeWidthBase = wArray.getObject(counter++); if (!(secondCodeBase instanceof COSNumber) || !(rangeWidthBase instanceof COSNumber)) { - LOG.warn("Expected two numbers, got " + secondCodeBase + " and " + rangeWidthBase); + LOG.warn("Expected two numbers, got {} and {}", secondCodeBase, + rangeWidthBase); continue; } COSNumber secondCode = (COSNumber) secondCodeBase;
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType0.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType0.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType0.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType0.java Fri Oct 27 06:05:21 2023 @@ -23,8 +23,8 @@ import java.io.IOException; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.fontbox.FontBoxFont; import org.apache.fontbox.cff.CFFCIDFont; import org.apache.fontbox.cff.CFFFont; @@ -49,7 +49,7 @@ import static org.apache.pdfbox.pdmodel. */ public class PDCIDFontType0 extends PDCIDFont { - private static final Log LOG = LogFactory.getLog(PDCIDFontType0.class); + private static final Logger LOG = LogManager.getLogger(PDCIDFontType0.class); private final CFFCIDFont cidFont; // Top DICT that uses CIDFont operators private final FontBoxFont t1Font; // Top DICT that does not use CIDFont operators @@ -88,7 +88,7 @@ public class PDCIDFontType0 extends PDCI if (randomAccessRead.length() > 0 && randomAccessRead.peek() == '%') { // PDFBOX-2642 contains a corrupt PFB font instead of a CFF - LOG.warn("Found PFB but expected embedded CFF font " + fd.getFontName()); + LOG.warn("Found PFB but expected embedded CFF font {}", fd.getFontName()); fontIsDamaged = true; } else @@ -99,7 +99,7 @@ public class PDCIDFontType0 extends PDCI } catch (IOException e) { - LOG.error("Can't read the embedded CFF font " + fd.getFontName(), e); + LOG.error("Can't read the embedded CFF font {}", fd.getFontName(), e); fontIsDamaged = true; } } @@ -156,8 +156,7 @@ public class PDCIDFontType0 extends PDCI if (mapping.isFallback()) { - LOG.warn("Using fallback " + font.getName() + " for CID-keyed font " + - getBaseFont()); + LOG.warn("Using fallback {} for CID-keyed font {}", font.getName(), getBaseFont()); } isEmbedded = false; isDamaged = fontIsDamaged; Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2.java Fri Oct 27 06:05:21 2023 @@ -23,8 +23,8 @@ import java.nio.charset.StandardCharsets import java.util.HashSet; import java.util.Set; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.fontbox.cff.CFFFont; import org.apache.fontbox.cff.Type2CharString; import org.apache.fontbox.cmap.CMap; @@ -48,7 +48,7 @@ import org.apache.pdfbox.util.Matrix; */ public class PDCIDFontType2 extends PDCIDFont { - private static final Log LOG = LogFactory.getLog(PDCIDFontType2.class); + private static final Logger LOG = LogManager.getLogger(PDCIDFontType2.class); private final TrueTypeFont ttf; private final OpenTypeFont otf; @@ -126,15 +126,16 @@ public class PDCIDFontType2 extends PDCI catch (IOException e) { fontIsDamaged = true; - LOG.warn("Could not read embedded OTF for font " + getBaseFont(), e); + LOG.warn("Could not read embedded OTF for font {}", getBaseFont(), e); } if (ttfFont instanceof OpenTypeFont && !((OpenTypeFont) ttfFont).isSupportedOTF()) { // the OpenType font contains CFF2 outlines which are not supported yet ttfFont = null; fontIsDamaged = true; - LOG.warn("Found an OpenType font using CFF2 outlines which are not supported " - + fd.getFontName()); + LOG.warn( + "Found an OpenType font using CFF2 outlines which are not supported {}", + fd.getFontName()); } } @@ -175,8 +176,8 @@ public class PDCIDFontType2 extends PDCI } if (mapping.isFallback()) { - LOG.warn("Using fallback font " + ttfFont.getName() + - " for CID-keyed TrueType font " + getBaseFont()); + LOG.warn("Using fallback font {} for CID-keyed TrueType font {}", ttfFont.getName(), + getBaseFont()); } return ttfFont; } @@ -262,7 +263,7 @@ public class PDCIDFontType2 extends PDCI // PDFBOX-5612: should happen only if it's really the same font // this is not perfect, we may have to improve this because some identical fonts // have different names - LOG.warn("Using non-embedded GIDs in font " + getName()); + LOG.warn("Using non-embedded GIDs in font {}", getName()); int cid = codeToCID(code); if (cid < cid2gid.length) { @@ -283,7 +284,8 @@ public class PDCIDFontType2 extends PDCI { // we keep track of which warnings have been issued, so we don't log multiple times noMapping.add(code); - LOG.warn("Failed to find a character mapping for " + code + " in " + getName()); + LOG.warn("Failed to find a character mapping for {} in {}", code, + getName()); } // Acrobat is willing to use the CID as a GID, even when the font isn't embedded // see PDFBOX-2599 Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2Embedder.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2Embedder.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2Embedder.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDCIDFontType2Embedder.java Fri Oct 27 06:05:21 2023 @@ -26,8 +26,8 @@ import java.util.Map; import java.util.Set; import java.util.TreeMap; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.fontbox.ttf.GlyphData; import org.apache.fontbox.ttf.GlyphTable; import org.apache.fontbox.ttf.HorizontalMetricsTable; @@ -51,7 +51,7 @@ import org.apache.pdfbox.pdmodel.common. final class PDCIDFontType2Embedder extends TrueTypeEmbedder { - private static final Log LOG = LogFactory.getLog(PDCIDFontType2Embedder.class); + private static final Logger LOG = LogManager.getLogger(PDCIDFontType2Embedder.class); private final PDDocument document; private final PDType0Font parent; Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFont.java Fri Oct 27 06:05:21 2023 @@ -25,8 +25,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.fontbox.afm.FontMetrics; import org.apache.fontbox.cmap.CMap; import org.apache.pdfbox.cos.COSArray; @@ -49,7 +49,7 @@ import org.apache.pdfbox.util.Vector; */ public abstract class PDFont implements COSObjectable, PDFontLike { - private static final Log LOG = LogFactory.getLog(PDFont.class); + private static final Logger LOG = LogManager.getLogger(PDFont.class); protected static final Matrix DEFAULT_FONT_MATRIX = new Matrix(0.001f, 0, 0, 0.001f, 0, 0); protected final COSDictionary dict; @@ -144,7 +144,7 @@ public abstract class PDFont implements cmap = readCMap(toUnicode); if (cmap != null && !cmap.hasUnicodeMappings()) { - LOG.warn("Invalid ToUnicode CMap in font " + getName()); + LOG.warn("Invalid ToUnicode CMap in font {}", getName()); String cmapName = cmap.getName() != null ? cmap.getName() : ""; String ordering = cmap.getOrdering() != null ? cmap.getOrdering() : ""; COSName encoding = dict.getCOSName(COSName.ENCODING); @@ -165,7 +165,7 @@ public abstract class PDFont implements } catch (IOException ex) { - LOG.error("Could not read ToUnicode CMap in font " + getName(), ex); + LOG.error("Could not read ToUnicode CMap in font {}", getName(), ex); } return cmap; } Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFontFactory.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFontFactory.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFontFactory.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDFontFactory.java Fri Oct 27 06:05:21 2023 @@ -20,8 +20,8 @@ import java.io.IOException; import org.apache.pdfbox.cos.COSDictionary; import org.apache.pdfbox.cos.COSName; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.pdfbox.pdmodel.ResourceCache; /** @@ -30,7 +30,7 @@ import org.apache.pdfbox.pdmodel.Resourc */ public final class PDFontFactory { - private static final Log LOG = LogFactory.getLog(PDFontFactory.class); + private static final Logger LOG = LogManager.getLogger(PDFontFactory.class); private PDFontFactory() { @@ -61,7 +61,7 @@ public final class PDFontFactory COSName type = dictionary.getCOSName(COSName.TYPE, COSName.FONT); if (!COSName.FONT.equals(type)) { - LOG.error("Expected 'Font' dictionary but found '" + type.getName() + "'"); + LOG.error("Expected 'Font' dictionary but found '{}'", type.getName()); } COSName subType = dictionary.getCOSName(COSName.SUBTYPE); @@ -107,7 +107,7 @@ public final class PDFontFactory { // assuming Type 1 font (see PDFBOX-1988) because it seems that Adobe Reader does this // however, we may need more sophisticated logic perhaps looking at the FontFile - LOG.warn("Invalid font subtype '" + subType + "'"); + LOG.warn("Invalid font subtype '{}'", subType); return new PDType1Font(dictionary); } } Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDSimpleFont.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDSimpleFont.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDSimpleFont.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDSimpleFont.java Fri Oct 27 06:05:21 2023 @@ -21,8 +21,8 @@ import java.io.IOException; import java.util.HashSet; import java.util.Map; import java.util.Set; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.fontbox.FontBoxFont; import org.apache.pdfbox.cos.COSBase; import org.apache.pdfbox.cos.COSDictionary; @@ -44,7 +44,7 @@ import org.apache.pdfbox.pdmodel.font.en */ public abstract class PDSimpleFont extends PDFont { - private static final Log LOG = LogFactory.getLog(PDSimpleFont.class); + private static final Logger LOG = LogManager.getLogger(PDSimpleFont.class); protected Encoding encoding; protected GlyphList glyphList; @@ -101,7 +101,7 @@ public abstract class PDSimpleFont exten this.encoding = Encoding.getInstance(encodingName); if (this.encoding == null) { - LOG.warn("Unknown encoding: " + encodingName.getName()); + LOG.warn("Unknown encoding: {}", encodingName.getName()); this.encoding = readEncodingFromFont(); // fallback } } @@ -319,13 +319,11 @@ public abstract class PDSimpleFont exten noUnicode.add(code); if (name != null) { - LOG.warn("No Unicode mapping for " + name + " (" + code + ") in font " + - getName()); + LOG.warn("No Unicode mapping for {} ({}) in font {}", name, code, getName()); } else { - LOG.warn("No Unicode mapping for character code " + code + " in font " + - getName()); + LOG.warn("No Unicode mapping for character code {} in font {}", code, getName()); } } Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDTrueTypeFont.java Fri Oct 27 06:05:21 2023 @@ -24,8 +24,8 @@ import java.io.InputStream; import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.fontbox.FontBoxFont; import org.apache.fontbox.cff.CFFFont; import org.apache.fontbox.cff.Type2CharString; @@ -67,7 +67,7 @@ import static org.apache.pdfbox.pdmodel. */ public class PDTrueTypeFont extends PDSimpleFont implements PDVectorFont { - private static final Log LOG = LogFactory.getLog(PDTrueTypeFont.class); + private static final Logger LOG = LogManager.getLogger(PDTrueTypeFont.class); private static final int START_RANGE_F000 = 0xF000; private static final int START_RANGE_F100 = 0xF100; @@ -126,7 +126,7 @@ public class PDTrueTypeFont extends PDSi } catch (IOException e) { - LOG.warn("Could not read embedded TTF for font " + getBaseFont(), e); + LOG.warn("Could not read embedded TTF for font {}", getBaseFont(), e); fontIsDamaged = true; IOUtils.closeQuietly(view); } @@ -145,7 +145,7 @@ public class PDTrueTypeFont extends PDSi if (mapping.isFallback()) { - LOG.warn("Using fallback font " + ttfFont + " for " + getBaseFont()); + LOG.warn("Using fallback font {} for {}", ttfFont, getBaseFont()); } } otf = ttfFont instanceof OpenTypeFont && ((OpenTypeFont) ttfFont).isSupportedOTF() Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType0Font.java Fri Oct 27 06:05:21 2023 @@ -24,8 +24,8 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.fontbox.cmap.CMap; import org.apache.fontbox.ttf.CmapLookup; import org.apache.fontbox.ttf.TTFParser; @@ -50,7 +50,7 @@ import org.apache.pdfbox.util.Vector; */ public class PDType0Font extends PDFont implements PDVectorFont { - private static final Log LOG = LogFactory.getLog(PDType0Font.class); + private static final Logger LOG = LogManager.getLogger(PDType0Font.class); private final PDCIDFont descendantFont; private final Set<Integer> noUnicode = new HashSet<>(); @@ -337,7 +337,7 @@ public class PDType0Font extends PDFont } else if (!cMap.hasCIDMappings()) { - LOG.warn("Invalid Encoding CMap in font " + getName()); + LOG.warn("Invalid Encoding CMap in font {}", getName()); } } @@ -400,7 +400,7 @@ public class PDType0Font extends PDFont } catch (IOException ex) { - LOG.warn("Could not get " + strName + " UC2 map for font " + getName(), ex); + LOG.warn("Could not get {} UC2 map for font {}", strName, getName(), ex); } } } @@ -595,7 +595,7 @@ public class PDType0Font extends PDFont { // if no value has been produced, there is no way to obtain Unicode for the character. String cid = "CID+" + codeToCID(code); - LOG.warn("No Unicode mapping for " + cid + " (" + code + ") in font " + getName()); + LOG.warn("No Unicode mapping for {} ({}) in font {}", cid, code, getName()); // we keep track of which warnings have been issued, so we don't log multiple times noUnicode.add(code); } Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1CFont.java Fri Oct 27 06:05:21 2023 @@ -25,8 +25,8 @@ import java.io.InputStream; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.fontbox.EncodedFont; import org.apache.fontbox.FontBoxFont; import org.apache.fontbox.cff.CFFFont; @@ -54,7 +54,7 @@ import static org.apache.pdfbox.pdmodel. */ public class PDType1CFont extends PDSimpleFont implements PDVectorFont { - private static final Log LOG = LogFactory.getLog(PDType1CFont.class); + private static final Logger LOG = LogManager.getLogger(PDType1CFont.class); private final Map<String, Float> glyphHeights = new HashMap<>(); private final AffineTransform fontMatrixTransform; @@ -89,7 +89,7 @@ public class PDType1CFont extends PDSimp { if (randomAccessRead.length() == 0) { - LOG.error("Invalid data for embedded Type1C font " + getName()); + LOG.error("Invalid data for embedded Type1C font {}", getName()); } else { @@ -102,15 +102,15 @@ public class PDType1CFont extends PDSimp } else { - LOG.error("Expected CFFType1Font, got " - + parsedCffFont.getClass().getSimpleName()); + LOG.error("Expected CFFType1Font, got {}", + parsedCffFont.getClass().getSimpleName()); fontIsDamaged = true; } } } catch (IOException e) { - LOG.error("Can't read the embedded Type1C font " + getName(), e); + LOG.error("Can't read the embedded Type1C font {}", getName(), e); fontIsDamaged = true; } } @@ -130,7 +130,7 @@ public class PDType1CFont extends PDSimp if (mapping.isFallback()) { - LOG.warn("Using fallback font " + genericFont.getName() + " for " + getBaseFont()); + LOG.warn("Using fallback font {} for {}", genericFont.getName(), getBaseFont()); } isEmbedded = false; } Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType1Font.java Fri Oct 27 06:05:21 2023 @@ -25,8 +25,8 @@ import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.fontbox.EncodedFont; import org.apache.fontbox.FontBoxFont; import org.apache.fontbox.type1.DamagedFontException; @@ -57,7 +57,7 @@ import org.apache.pdfbox.pdmodel.font.en */ public class PDType1Font extends PDSimpleFont implements PDVectorFont { - private static final Log LOG = LogFactory.getLog(PDType1Font.class); + private static final Logger LOG = LogManager.getLogger(PDType1Font.class); // alternative names for glyphs which are commonly encountered private static final Map<String, String> ALT_NAMES = new HashMap<>(); @@ -140,7 +140,7 @@ public class PDType1Font extends PDSimpl LOG.debug("Couldn't get font name - setting to '?'", e); fontName = "?"; } - LOG.warn("Using fallback font " + fontName + " for base font " + getBaseFont()); + LOG.warn("Using fallback font {} for base font {}", fontName, getBaseFont()); } isEmbedded = false; isDamaged = false; @@ -246,12 +246,12 @@ public class PDType1Font extends PDSimpl } catch (DamagedFontException e) { - LOG.warn("Can't read damaged embedded Type1 font " + fd.getFontName(), e); + LOG.warn("Can't read damaged embedded Type1 font {}", fd.getFontName(), e); fontIsDamaged = true; } catch (IOException e) { - LOG.error("Can't read the embedded Type1 font " + fd.getFontName(), e); + LOG.error("Can't read the embedded Type1 font {}", fd.getFontName(), e); fontIsDamaged = true; } } @@ -273,7 +273,7 @@ public class PDType1Font extends PDSimpl if (mapping.isFallback()) { - LOG.warn("Using fallback font " + genericFont.getName() + " for " + getBaseFont()); + LOG.warn("Using fallback font {} for {}", genericFont.getName(), getBaseFont()); } } readEncoding(); @@ -309,7 +309,7 @@ public class PDType1Font extends PDSimpl { if (LOG.isWarnEnabled()) { - LOG.warn("Ignored invalid Length1 " + length1 + " for Type 1 font " + getName()); + LOG.warn("Ignored invalid Length1 {} for Type 1 font {}", length1, getName()); } return offset; } @@ -357,7 +357,7 @@ public class PDType1Font extends PDSimpl // repair Length2 if necessary if (length2 < 0 || length2 > bytes.length - length1) { - LOG.warn("Ignored invalid Length2 " + length2 + " for Type 1 font " + getName()); + LOG.warn("Ignored invalid Length2 {} for Type 1 font {}", length2, getName()); return bytes.length - length1; } return length2; Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3CharProc.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3CharProc.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3CharProc.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3CharProc.java Fri Oct 27 06:05:21 2023 @@ -21,8 +21,8 @@ import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.pdfbox.contentstream.PDContentStream; import org.apache.pdfbox.contentstream.operator.Operator; import org.apache.pdfbox.cos.COSBase; @@ -46,7 +46,7 @@ import org.apache.pdfbox.util.Matrix; */ public final class PDType3CharProc implements COSObjectable, PDContentStream { - private static final Log LOG = LogFactory.getLog(PDType3CharProc.class); + private static final Logger LOG = LogManager.getLogger(PDType3CharProc.class); private final PDType3Font font; private final COSStream charStream; Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3Font.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3Font.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3Font.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/PDType3Font.java Fri Oct 27 06:05:21 2023 @@ -22,8 +22,8 @@ import java.io.InputStream; import java.util.List; import java.util.Objects; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.fontbox.FontBoxFont; import org.apache.fontbox.util.BoundingBox; @@ -51,7 +51,7 @@ public class PDType3Font extends PDSimpl /** * Log instance. */ - private static final Log LOG = LogFactory.getLog(PDType3Font.class); + private static final Logger LOG = LogManager.getLogger(PDType3Font.class); private PDResources resources; private COSDictionary charProcs; @@ -102,7 +102,7 @@ public class PDType3Font extends PDSimpl encoding = Encoding.getInstance(encodingName); if (encoding == null) { - LOG.warn("Unknown encoding: " + encodingName.getName()); + LOG.warn("Unknown encoding: {}", encodingName.getName()); } } else if (encodingBase instanceof COSDictionary) Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/GlyphList.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/GlyphList.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/GlyphList.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/font/encoding/GlyphList.java Fri Oct 27 06:05:21 2023 @@ -19,8 +19,8 @@ package org.apache.pdfbox.pdmodel.font.e import java.io.BufferedReader; import java.io.InputStream; import java.io.InputStreamReader; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import java.io.IOException; import java.nio.charset.StandardCharsets; @@ -34,7 +34,7 @@ import java.util.concurrent.ConcurrentHa */ public final class GlyphList { - private static final Log LOG = LogFactory.getLog(GlyphList.class); + private static final Logger LOG = LogManager.getLogger(GlyphList.class); // Adobe Glyph List (AGL) private static final GlyphList DEFAULT = load("glyphlist.txt", 4281); @@ -138,8 +138,8 @@ public final class GlyphList if (nameToUnicode.containsKey(name)) { - LOG.warn("duplicate value for " + name + " -> " + parts[1] + " " + - nameToUnicode.get(name)); + LOG.warn("duplicate value for {} -> {} {}", name, parts[1], + nameToUnicode.get(name)); } int[] codePoints = new int[unicodeList.length]; @@ -243,7 +243,7 @@ public final class GlyphList int codePoint = Integer.parseInt(name.substring(chPos, chPos + 4), 16); if (codePoint > 0xD7FF && codePoint < 0xE000) { - LOG.warn("Unicode character name with disallowed code area: " + name); + LOG.warn("Unicode character name with disallowed code area: {}", name); } else { @@ -254,7 +254,7 @@ public final class GlyphList } catch (NumberFormatException nfe) { - LOG.warn("Not a number in Unicode character name: " + name); + LOG.warn("Not a number in Unicode character name: {}", name); } } else if (name.startsWith("u") && name.length() == 5) @@ -265,7 +265,7 @@ public final class GlyphList int codePoint = Integer.parseInt(name.substring(1), 16); if (codePoint > 0xD7FF && codePoint < 0xE000) { - LOG.warn("Unicode character name with disallowed code area: " + name); + LOG.warn("Unicode character name with disallowed code area: {}", name); } else { @@ -274,7 +274,7 @@ public final class GlyphList } catch (NumberFormatException nfe) { - LOG.warn("Not a number in Unicode character name: " + name); + LOG.warn("Not a number in Unicode character name: {}", name); } } if (unicode != null) Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/blend/BlendComposite.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/blend/BlendComposite.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/blend/BlendComposite.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/blend/BlendComposite.java Fri Oct 27 06:05:21 2023 @@ -24,8 +24,8 @@ import java.awt.color.ColorSpace; import java.awt.image.ColorModel; import java.awt.image.Raster; import java.awt.image.WritableRaster; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** * AWT composite for blend modes. @@ -37,7 +37,7 @@ public final class BlendComposite implem /** * Log instance. */ - private static final Log LOG = LogFactory.getLog(BlendComposite.class); + private static final Logger LOG = LogManager.getLogger(BlendComposite.class); /** * Creates a blend composite @@ -52,12 +52,12 @@ public final class BlendComposite implem { if (constantAlpha < 0) { - LOG.warn("using 0 instead of incorrect Alpha " + constantAlpha); + LOG.warn("using 0 instead of incorrect Alpha {}", constantAlpha); constantAlpha = 0; } else if (constantAlpha > 1) { - LOG.warn("using 1 instead of incorrect Alpha " + constantAlpha); + LOG.warn("using 1 instead of incorrect Alpha {}", constantAlpha); constantAlpha = 1; } if (blendMode == null) Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColor.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColor.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColor.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDColor.java Fri Oct 27 06:05:21 2023 @@ -22,8 +22,8 @@ import org.apache.pdfbox.cos.COSNumber; import java.io.IOException; import java.util.Arrays; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.pdfbox.cos.COSBase; /** @@ -37,7 +37,7 @@ import org.apache.pdfbox.cos.COSBase; */ public final class PDColor { - private static final Log LOG = LogFactory.getLog(PDColor.class); + private static final Logger LOG = LogManager.getLogger(PDColor.class); private final float[] components; private final COSName patternName; @@ -64,7 +64,7 @@ public final class PDColor } else { - LOG.warn("pattern name in " + array + " isn't a name, ignored"); + LOG.warn("pattern name in {} isn't a name, ignored", array); patternName = COSName.getPDFName("Unknown"); } } @@ -89,7 +89,7 @@ public final class PDColor } else { - LOG.warn("color component " + i + " in " + array + " isn't a number, ignored"); + LOG.warn("color component {} in {} isn't a number, ignored", i, array); } } } Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceNAttributes.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceNAttributes.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceNAttributes.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceNAttributes.java Fri Oct 27 06:05:21 2023 @@ -25,8 +25,8 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** * Contains additional information about the components of colour space. @@ -40,7 +40,7 @@ public final class PDDeviceNAttributes /** * Log instance. */ - private static final Log LOG = LogFactory.getLog(PDDeviceNAttributes.class); + private static final Logger LOG = LogManager.getLogger(PDDeviceNAttributes.class); private final COSDictionary dictionary; Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceNProcess.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceNProcess.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceNProcess.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDDeviceNProcess.java Fri Oct 27 06:05:21 2023 @@ -25,8 +25,8 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** * A DeviceN Process Dictionary @@ -38,7 +38,7 @@ public class PDDeviceNProcess /** * Log instance. */ - private static final Log LOG = LogFactory.getLog(PDDeviceNProcess.class); + private static final Logger LOG = LogManager.getLogger(PDDeviceNProcess.class); private final COSDictionary dictionary; Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/color/PDICCBased.java Fri Oct 27 06:05:21 2023 @@ -31,8 +31,8 @@ import java.io.InputStream; import java.nio.charset.StandardCharsets; import java.util.Arrays; import java.util.List; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.pdfbox.cos.COSArray; import org.apache.pdfbox.cos.COSBase; import org.apache.pdfbox.cos.COSFloat; @@ -54,7 +54,7 @@ import org.apache.pdfbox.pdmodel.common. */ public final class PDICCBased extends PDCIEBasedColorSpace { - private static final Log LOG = LogFactory.getLog(PDICCBased.class); + private static final Logger LOG = LogManager.getLogger(PDICCBased.class); private final PDStream stream; private int numberOfComponents = -1; @@ -172,7 +172,7 @@ public final class PDICCBased extends PD } catch (IOException e) { - LOG.warn("Error initializing alternate color space: " + e.getLocalizedMessage()); + LOG.warn("Error initializing alternate color space: {}", e.getLocalizedMessage()); } } try (InputStream input = this.stream.createInputStream()) @@ -233,8 +233,8 @@ public final class PDICCBased extends PD } if (e != null) { - LOG.warn("Can't read embedded ICC profile (" + e.getLocalizedMessage() + - "), using alternate color space: " + alternateColorSpace.getName()); + LOG.warn("Can't read embedded ICC profile ({}), using alternate color space: {}", + e.getLocalizedMessage(), alternateColorSpace.getName()); } initialColor = alternateColorSpace.getInitialColor(); } @@ -344,8 +344,9 @@ public final class PDICCBased extends PD int numIccComponents = iccProfile.getNumComponents(); if (numIccComponents != numberOfComponents) { - LOG.warn("Using " + numIccComponents + " components from ICC profile info instead of " + - numberOfComponents + " components from /N entry"); + LOG.warn( + "Using {} components from ICC profile info instead of {} components from /N entry", + numIccComponents, numberOfComponents); numberOfComponents = numIccComponents; } } Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/JPEGFactory.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/JPEGFactory.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/JPEGFactory.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/JPEGFactory.java Fri Oct 27 06:05:21 2023 @@ -42,8 +42,8 @@ import javax.xml.xpath.XPath; import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.pdfbox.cos.COSArray; import org.apache.pdfbox.cos.COSInteger; import org.apache.pdfbox.cos.COSName; @@ -61,7 +61,7 @@ import org.w3c.dom.Element; */ public final class JPEGFactory { - private static final Log LOG = LogFactory.getLog(JPEGFactory.class); + private static final Logger LOG = LogManager.getLogger(JPEGFactory.class); private JPEGFactory() { Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PDImageXObject.java Fri Oct 27 06:05:21 2023 @@ -38,8 +38,8 @@ import java.util.List; import javax.imageio.ImageIO; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.pdfbox.cos.COSArray; import org.apache.pdfbox.cos.COSBase; import org.apache.pdfbox.cos.COSDictionary; @@ -71,7 +71,7 @@ public final class PDImageXObject extend /** * Log instance. */ - private static final Log LOG = LogFactory.getLog(PDImageXObject.class); + private static final Logger LOG = LogManager.getLogger(PDImageXObject.class); private SoftReference<BufferedImage> cachedImage; private PDColorSpace colorSpace; @@ -977,7 +977,7 @@ public final class PDImageXObject extend } else { - LOG.warn("getSuffix() returns null, filters: " + filters); + LOG.warn("getSuffix() returns null, filters: {}", filters); return null; } } Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PNGConverter.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PNGConverter.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PNGConverter.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/PNGConverter.java Fri Oct 27 06:05:21 2023 @@ -29,8 +29,8 @@ import java.util.List; import javax.imageio.stream.ImageInputStream; import javax.imageio.stream.MemoryCacheImageInputStream; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.pdfbox.cos.COSArray; import org.apache.pdfbox.cos.COSDictionary; import org.apache.pdfbox.cos.COSInteger; @@ -61,7 +61,7 @@ import org.apache.pdfbox.pdmodel.graphic */ final class PNGConverter { - private static final Log LOG = LogFactory.getLog(PNGConverter.class); + private static final Logger LOG = LogManager.getLogger(PNGConverter.class); // Chunk Type definitions. The bytes in the comments are the bytes in the spec. private static final int CHUNK_IHDR = 0x49484452; // IHDR: 73 72 68 82 @@ -200,7 +200,7 @@ final class PNGConverter "Can't handle truecolor with alpha, would need to separate alpha from image data"); return null; default: - LOG.error("Unknown PNG color type " + colorType); + LOG.error("Unknown PNG color type {}", colorType); return null; } } @@ -348,7 +348,7 @@ final class PNGConverter { if (state.gAMA.length != 4) { - LOG.error("Invalid gAMA chunk length " + state.gAMA.length); + LOG.error("Invalid gAMA chunk length {}", state.gAMA.length); return null; } float gamma = readPNGFloat(state.gAMA.bytes, state.gAMA.start); @@ -380,7 +380,7 @@ final class PNGConverter { if (state.cHRM.length != 32) { - LOG.error("Invalid cHRM chunk length " + state.cHRM.length); + LOG.error("Invalid cHRM chunk length {}", state.cHRM.length); return null; } LOG.debug("We can not handle cHRM chunks yet."); @@ -766,7 +766,7 @@ final class PNGConverter { if (imageData.length < 20) { - LOG.error("ByteArray way to small: " + imageData.length); + LOG.error("ByteArray way to small: {}", imageData.length); return null; } @@ -788,8 +788,9 @@ final class PNGConverter if (ptr + chunkLength + 4 > imageData.length) { - LOG.error("Not enough bytes. At offset " + ptr + " are " + chunkLength - + " bytes expected. Overall length is " + imageData.length); + LOG.error( + "Not enough bytes. At offset {} are {} bytes expected. Overall length is {}", + ptr, chunkLength, imageData.length); return null; } Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/SampledImageReader.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/SampledImageReader.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/SampledImageReader.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/image/SampledImageReader.java Fri Oct 27 06:05:21 2023 @@ -30,8 +30,8 @@ import java.io.InputStream; import java.util.Arrays; import javax.imageio.stream.ImageInputStream; import javax.imageio.stream.MemoryCacheImageInputStream; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.pdfbox.cos.COSArray; import org.apache.pdfbox.cos.COSNumber; import org.apache.pdfbox.filter.DecodeOptions; @@ -45,7 +45,7 @@ import org.apache.pdfbox.pdmodel.graphic */ final class SampledImageReader { - private static final Log LOG = LogFactory.getLog(SampledImageReader.class); + private static final Logger LOG = LogManager.getLogger(SampledImageReader.class); private SampledImageReader() { @@ -500,7 +500,8 @@ final class SampledImageReader int inputResult = input.readNBytes(bank, 0, bank.length); if (inputResult != (long) width * height * numComponents) { - LOG.debug("Tried reading " + (long) width * height * numComponents + " bytes but only " + inputResult + " bytes read"); + LOG.debug("Tried reading {} bytes but only {} bytes read", + (long) width * height * numComponents, inputResult); } return pdImage.getColorSpace().toRGBImage(raster); } @@ -518,7 +519,8 @@ final class SampledImageReader if (Long.compare(inputResult, tempBytes.length) != 0) { - LOG.debug("Tried reading " + tempBytes.length + " bytes but only " + inputResult + " bytes read"); + LOG.debug("Tried reading {} bytes but only {} bytes read", tempBytes.length, + inputResult); } if (y < starty || y % currentSubsampling > 0) @@ -604,8 +606,8 @@ final class SampledImageReader } else { - LOG.warn("colorKey mask size is " + colorKey.size() + - ", should be " + (numComponents * 2) + ", ignored"); + LOG.warn("colorKey mask size is {}, should be {}, ignored", colorKey.size(), + numComponents * 2); } } @@ -745,16 +747,17 @@ final class SampledImageReader float decode1 = ((COSNumber) cosDecode.get(1)).floatValue(); if (decode0 >= 0 && decode0 <= 1 && decode1 >= 0 && decode1 <= 1) { - LOG.warn("decode array " + cosDecode - + " not compatible with color space, using the first two entries"); + LOG.warn( + "decode array {} not compatible with color space, using the first two entries", + cosDecode); return new float[] { decode0, decode1 }; } } - LOG.error("decode array " + cosDecode - + " not compatible with color space, using default"); + LOG.error("decode array {} not compatible with color space, using default", + cosDecode); } else { Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingContext.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingContext.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingContext.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingContext.java Fri Oct 27 06:05:21 2023 @@ -23,8 +23,8 @@ import java.awt.image.ColorModel; import java.awt.image.Raster; import java.awt.image.WritableRaster; import java.io.IOException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.pdfbox.cos.COSArray; import org.apache.pdfbox.cos.COSBoolean; import org.apache.pdfbox.pdmodel.common.function.PDFunction; @@ -39,7 +39,7 @@ import org.apache.pdfbox.util.Matrix; */ public class AxialShadingContext extends ShadingContext { - private static final Log LOG = LogFactory.getLog(AxialShadingContext.class); + private static final Logger LOG = LogManager.getLogger(AxialShadingContext.class); private PDShadingType2 axialShadingType; @@ -111,7 +111,7 @@ public class AxialShadingContext extends } catch (NoninvertibleTransformException ex) { - LOG.error(ex.getMessage() + ", matrix: " + matrix, ex); + LOG.error("{}, matrix: {}", ex.getMessage(), matrix, ex); rat = new AffineTransform(); } Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingPaint.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingPaint.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingPaint.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/AxialShadingPaint.java Fri Oct 27 06:05:21 2023 @@ -24,8 +24,8 @@ import java.awt.geom.AffineTransform; import java.awt.geom.Rectangle2D; import java.awt.image.ColorModel; import java.io.IOException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.pdfbox.util.Matrix; /** @@ -34,7 +34,7 @@ import org.apache.pdfbox.util.Matrix; */ public class AxialShadingPaint extends ShadingPaint<PDShadingType2> { - private static final Log LOG = LogFactory.getLog(AxialShadingPaint.class); + private static final Logger LOG = LogManager.getLogger(AxialShadingPaint.class); /** * Constructor. Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/IntPoint.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/IntPoint.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/IntPoint.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/IntPoint.java Fri Oct 27 06:05:21 2023 @@ -19,8 +19,8 @@ package org.apache.pdfbox.pdmodel.graphi import java.awt.Point; import java.awt.geom.Point2D; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** * Point class with faster hashCode() to speed up the rendering of Gouraud shadings. Should only be @@ -33,7 +33,7 @@ import org.apache.commons.logging.LogFac */ class IntPoint extends Point { - private static final Log LOG = LogFactory.getLog(IntPoint.class); + private static final Logger LOG = LogManager.getLogger(IntPoint.class); IntPoint(int x, int y) { Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDMeshBasedShadingType.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDMeshBasedShadingType.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDMeshBasedShadingType.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDMeshBasedShadingType.java Fri Oct 27 06:05:21 2023 @@ -28,8 +28,8 @@ import java.util.List; import javax.imageio.stream.ImageInputStream; import javax.imageio.stream.MemoryCacheImageInputStream; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.pdfbox.cos.COSDictionary; import org.apache.pdfbox.cos.COSStream; import org.apache.pdfbox.pdmodel.common.PDRange; @@ -41,7 +41,7 @@ import org.apache.pdfbox.util.Matrix; abstract class PDMeshBasedShadingType extends PDShadingType4 { - private static final Log LOG = LogFactory.getLog(PDMeshBasedShadingType.class); + private static final Logger LOG = LogManager.getLogger(PDMeshBasedShadingType.class); PDMeshBasedShadingType(COSDictionary shadingDictionary) { @@ -138,7 +138,7 @@ abstract class PDMeshBasedShadingType ex implicitCornerColor = current.getFlag3Color(); break; default: - LOG.warn("bad flag: " + flag); + LOG.warn("bad flag: {}", flag); break; } } Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType4.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType4.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType4.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDShadingType4.java Fri Oct 27 06:05:21 2023 @@ -28,8 +28,8 @@ import java.util.List; import javax.imageio.stream.ImageInputStream; import javax.imageio.stream.MemoryCacheImageInputStream; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.pdfbox.cos.COSDictionary; import org.apache.pdfbox.cos.COSName; import org.apache.pdfbox.cos.COSStream; @@ -41,7 +41,7 @@ import org.apache.pdfbox.util.Matrix; */ public class PDShadingType4 extends PDTriangleBasedShadingType { - private static final Log LOG = LogFactory.getLog(PDShadingType4.class); + private static final Logger LOG = LogManager.getLogger(PDShadingType4.class); /** * Constructor using the given shading dictionary. @@ -150,14 +150,14 @@ public class PDShadingType4 extends PDTr flag = (byte) (mciis.readBits(bitsPerFlag) & 3); if (flag != 0) { - LOG.error("bad triangle: " + flag); + LOG.error("bad triangle: {}", flag); } p1 = readVertex(mciis, maxSrcCoord, maxSrcColor, rangeX, rangeY, colRange, matrix, xform); mciis.readBits(bitsPerFlag); if (flag != 0) { - LOG.error("bad triangle: " + flag); + LOG.error("bad triangle: {}", flag); } p2 = readVertex(mciis, maxSrcCoord, maxSrcColor, rangeX, rangeY, colRange, matrix, xform); @@ -171,7 +171,7 @@ public class PDShadingType4 extends PDTr lastIndex = list.size() - 1; if (lastIndex < 0) { - LOG.error("broken data stream: " + list.size()); + LOG.error("broken data stream: {}", list.size()); } else { @@ -189,7 +189,7 @@ public class PDShadingType4 extends PDTr } break; default: - LOG.warn("bad flag: " + flag); + LOG.warn("bad flag: {}", flag); break; } } Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDTriangleBasedShadingType.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDTriangleBasedShadingType.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDTriangleBasedShadingType.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/PDTriangleBasedShadingType.java Fri Oct 27 06:05:21 2023 @@ -23,8 +23,8 @@ import java.util.List; import javax.imageio.stream.ImageInputStream; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.pdfbox.cos.COSArray; import org.apache.pdfbox.cos.COSDictionary; import org.apache.pdfbox.cos.COSName; @@ -41,7 +41,7 @@ abstract class PDTriangleBasedShadingTyp // value: same as the value of Range private COSArray decode = null; - private static final Log LOG = LogFactory.getLog(PDTriangleBasedShadingType.class); + private static final Logger LOG = LogManager.getLogger(PDTriangleBasedShadingType.class); private int bitsPerCoordinate = -1; private int bitsPerColorComponent = -1; @@ -62,7 +62,7 @@ abstract class PDTriangleBasedShadingTyp if (bitsPerColorComponent == -1) { bitsPerColorComponent = getCOSObject().getInt(COSName.BITS_PER_COMPONENT, -1); - LOG.debug("bitsPerColorComponent: " + bitsPerColorComponent); + LOG.debug("bitsPerColorComponent: {}", bitsPerColorComponent); } return bitsPerColorComponent; } @@ -89,7 +89,7 @@ abstract class PDTriangleBasedShadingTyp if (bitsPerCoordinate == -1) { bitsPerCoordinate = getCOSObject().getInt(COSName.BITS_PER_COORDINATE, -1); - LOG.debug("bitsPerCoordinate: " + (Math.pow(2, bitsPerCoordinate) - 1)); + LOG.debug("bitsPerCoordinate: {}", Math.pow(2, bitsPerCoordinate) - 1); } return bitsPerCoordinate; } @@ -118,7 +118,7 @@ abstract class PDTriangleBasedShadingTyp { numberOfColorComponents = getFunction() != null ? 1 : getColorSpace().getNumberOfComponents(); - LOG.debug("numberOfColorComponents: " + numberOfColorComponents); + LOG.debug("numberOfColorComponents: {}", numberOfColorComponents); } return numberOfColorComponents; } @@ -202,7 +202,7 @@ abstract class PDTriangleBasedShadingTyp long y = input.readBits(bitsPerCoordinate); float dstX = interpolate(x, maxSrcCoord, rangeX.getMin(), rangeX.getMax()); float dstY = interpolate(y, maxSrcCoord, rangeY.getMin(), rangeY.getMax()); - LOG.debug("coord: " + String.format("[%06X,%06X] -> [%f,%f]", x, y, dstX, dstY)); + LOG.debug("coord: {}", String.format("[%06X,%06X] -> [%f,%f]", x, y, dstX, dstY)); Point2D p = matrix.transformPoint(dstX, dstY); xform.transform(p, p); @@ -211,8 +211,8 @@ abstract class PDTriangleBasedShadingTyp int color = (int) input.readBits(bitsPerColorComponent); colorComponentTab[n] = interpolate(color, maxSrcColor, colRangeTab[n].getMin(), colRangeTab[n].getMax()); - LOG.debug("color[" + n + "]: " + color + "/" + String.format("%02x", color) - + "-> color[" + n + "]: " + colorComponentTab[n]); + LOG.debug("color[{}]: {}/{}-> color[{}]: {}", n, color, String.format("%02x", color), n, + colorComponentTab[n]); } // "Each set of vertex data shall occupy a whole number of bytes. Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingContext.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingContext.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingContext.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingContext.java Fri Oct 27 06:05:21 2023 @@ -23,8 +23,8 @@ import java.awt.image.ColorModel; import java.awt.image.Raster; import java.awt.image.WritableRaster; import java.io.IOException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.pdfbox.cos.COSArray; import org.apache.pdfbox.cos.COSBoolean; import org.apache.pdfbox.pdmodel.common.function.PDFunction; @@ -39,7 +39,7 @@ import org.apache.pdfbox.util.Matrix; */ public class RadialShadingContext extends ShadingContext { - private static final Log LOG = LogFactory.getLog(RadialShadingContext.class); + private static final Logger LOG = LogManager.getLogger(RadialShadingContext.class); private PDShadingType3 radialShadingType; @@ -117,7 +117,7 @@ public class RadialShadingContext extend } catch (NoninvertibleTransformException ex) { - LOG.error(ex.getMessage() + ", matrix: " + matrix, ex); + LOG.error("{}, matrix: {}", ex.getMessage(), matrix, ex); rat = new AffineTransform(); } Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingPaint.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingPaint.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingPaint.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/RadialShadingPaint.java Fri Oct 27 06:05:21 2023 @@ -25,8 +25,8 @@ import java.awt.geom.Rectangle2D; import java.awt.image.ColorModel; import java.io.IOException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.pdfbox.util.Matrix; /** @@ -35,7 +35,7 @@ import org.apache.pdfbox.util.Matrix; */ public class RadialShadingPaint extends ShadingPaint<PDShadingType3> { - private static final Log LOG = LogFactory.getLog(RadialShadingPaint.class); + private static final Logger LOG = LogManager.getLogger(RadialShadingPaint.class); /** * Constructor. Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingContext.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingContext.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingContext.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingContext.java Fri Oct 27 06:05:21 2023 @@ -21,8 +21,8 @@ import java.awt.image.ColorModel; import java.awt.image.Raster; import java.awt.image.WritableRaster; import java.io.IOException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.pdfbox.pdmodel.graphics.color.PDColorSpace; import org.apache.pdfbox.util.Matrix; @@ -33,7 +33,7 @@ import org.apache.pdfbox.util.Matrix; */ class Type1ShadingContext extends ShadingContext { - private static final Log LOG = LogFactory.getLog(Type1ShadingContext.class); + private static final Logger LOG = LogManager.getLogger(Type1ShadingContext.class); private PDShadingType1 type1ShadingType; private AffineTransform rat; @@ -76,7 +76,7 @@ class Type1ShadingContext extends Shadin } catch (NoninvertibleTransformException ex) { - LOG.error(ex.getMessage() + ", matrix: " + matrix, ex); + LOG.error("{}, matrix: {}", ex.getMessage(), matrix, ex); rat = new AffineTransform(); } } Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingPaint.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingPaint.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingPaint.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type1ShadingPaint.java Fri Oct 27 06:05:21 2023 @@ -24,8 +24,8 @@ import java.awt.geom.AffineTransform; import java.awt.geom.Rectangle2D; import java.awt.image.ColorModel; import java.io.IOException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.pdfbox.util.Matrix; /** @@ -33,7 +33,7 @@ import org.apache.pdfbox.util.Matrix; */ class Type1ShadingPaint extends ShadingPaint<PDShadingType1> { - private static final Log LOG = LogFactory.getLog(Type1ShadingPaint.class); + private static final Logger LOG = LogManager.getLogger(Type1ShadingPaint.class); /** * Constructor. Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type4ShadingContext.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type4ShadingContext.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type4ShadingContext.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type4ShadingContext.java Fri Oct 27 06:05:21 2023 @@ -21,8 +21,8 @@ import java.awt.geom.AffineTransform; import java.awt.image.ColorModel; import java.io.IOException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.pdfbox.util.Matrix; /** @@ -33,7 +33,7 @@ import org.apache.pdfbox.util.Matrix; */ class Type4ShadingContext extends GouraudShadingContext { - private static final Log LOG = LogFactory.getLog(Type4ShadingContext.class); + private static final Logger LOG = LogManager.getLogger(Type4ShadingContext.class); private final int bitsPerFlag; /** @@ -52,7 +52,7 @@ class Type4ShadingContext extends Gourau bitsPerFlag = shading.getBitsPerFlag(); //TODO handle cases where bitperflag isn't 8 - LOG.debug("bitsPerFlag: " + bitsPerFlag); + LOG.debug("bitsPerFlag: {}", bitsPerFlag); setTriangleList(shading.collectTriangles(xform, matrix)); createPixelTable(deviceBounds); } Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type4ShadingPaint.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type4ShadingPaint.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type4ShadingPaint.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type4ShadingPaint.java Fri Oct 27 06:05:21 2023 @@ -24,8 +24,8 @@ import java.awt.geom.AffineTransform; import java.awt.geom.Rectangle2D; import java.awt.image.ColorModel; import java.io.IOException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.pdfbox.util.Matrix; /** @@ -33,7 +33,7 @@ import org.apache.pdfbox.util.Matrix; */ class Type4ShadingPaint extends ShadingPaint<PDShadingType4> { - private static final Log LOG = LogFactory.getLog(Type4ShadingPaint.class); + private static final Logger LOG = LogManager.getLogger(Type4ShadingPaint.class); /** * Constructor. Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type5ShadingContext.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type5ShadingContext.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type5ShadingContext.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type5ShadingContext.java Fri Oct 27 06:05:21 2023 @@ -21,8 +21,8 @@ import java.awt.geom.AffineTransform; import java.awt.image.ColorModel; import java.io.IOException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.pdfbox.util.Matrix; /** @@ -33,7 +33,7 @@ import org.apache.pdfbox.util.Matrix; */ class Type5ShadingContext extends GouraudShadingContext { - private static final Log LOG = LogFactory.getLog(Type5ShadingContext.class); + private static final Logger LOG = LogManager.getLogger(Type5ShadingContext.class); /** * Constructor creates an instance to be used for fill operations. Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type5ShadingPaint.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type5ShadingPaint.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type5ShadingPaint.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type5ShadingPaint.java Fri Oct 27 06:05:21 2023 @@ -24,8 +24,8 @@ import java.awt.geom.AffineTransform; import java.awt.geom.Rectangle2D; import java.awt.image.ColorModel; import java.io.IOException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.pdfbox.util.Matrix; /** @@ -33,7 +33,7 @@ import org.apache.pdfbox.util.Matrix; */ class Type5ShadingPaint extends ShadingPaint<PDShadingType5> { - private static final Log LOG = LogFactory.getLog(Type5ShadingPaint.class); + private static final Logger LOG = LogManager.getLogger(Type5ShadingPaint.class); /** * Constructor. Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type6ShadingPaint.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type6ShadingPaint.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type6ShadingPaint.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type6ShadingPaint.java Fri Oct 27 06:05:21 2023 @@ -23,8 +23,8 @@ import java.awt.geom.AffineTransform; import java.awt.geom.Rectangle2D; import java.awt.image.ColorModel; import java.io.IOException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.pdfbox.util.Matrix; /** @@ -35,7 +35,7 @@ import org.apache.pdfbox.util.Matrix; */ class Type6ShadingPaint extends ShadingPaint<PDShadingType6> { - private static final Log LOG = LogFactory.getLog(Type6ShadingPaint.class); + private static final Logger LOG = LogManager.getLogger(Type6ShadingPaint.class); /** * Constructor. Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type7ShadingPaint.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type7ShadingPaint.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type7ShadingPaint.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/shading/Type7ShadingPaint.java Fri Oct 27 06:05:21 2023 @@ -23,8 +23,8 @@ import java.awt.geom.AffineTransform; import java.awt.geom.Rectangle2D; import java.awt.image.ColorModel; import java.io.IOException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.pdfbox.util.Matrix; /** @@ -35,7 +35,7 @@ import org.apache.pdfbox.util.Matrix; */ class Type7ShadingPaint extends ShadingPaint<PDShadingType7> { - private static final Log LOG = LogFactory.getLog(Type7ShadingPaint.class); + private static final Logger LOG = LogManager.getLogger(Type7ShadingPaint.class); /** * Constructor. Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/state/PDSoftMask.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/state/PDSoftMask.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/state/PDSoftMask.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/graphics/state/PDSoftMask.java Fri Oct 27 06:05:21 2023 @@ -18,8 +18,8 @@ package org.apache.pdfbox.pdmodel.graphi import java.io.IOException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.pdfbox.cos.COSArray; import org.apache.pdfbox.cos.COSBase; import org.apache.pdfbox.cos.COSDictionary; @@ -54,7 +54,7 @@ public final class PDSoftMask implements } else { - LOG.warn("Invalid SMask " + dictionary); + LOG.warn("Invalid SMask {}", dictionary); return null; } } @@ -64,12 +64,12 @@ public final class PDSoftMask implements } else { - LOG.warn("Invalid SMask " + dictionary); + LOG.warn("Invalid SMask {}", dictionary); return null; } } - private static final Log LOG = LogFactory.getLog(PDSoftMask.class); + private static final Logger LOG = LogManager.getLogger(PDSoftMask.class); private final COSDictionary dictionary; private COSName subType = null; Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotation.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotation.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotation.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotation.java Fri Oct 27 06:05:21 2023 @@ -20,8 +20,8 @@ import java.io.IOException; import java.util.Calendar; import java.util.Objects; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.pdfbox.cos.COSArray; import org.apache.pdfbox.cos.COSBase; import org.apache.pdfbox.cos.COSDictionary; @@ -49,7 +49,7 @@ public abstract class PDAnnotation imple /** * Log instance. */ - private static final Log LOG = LogFactory.getLog(PDAnnotation.class); + private static final Logger LOG = LogManager.getLogger(PDAnnotation.class); /** * An annotation flag. @@ -191,7 +191,7 @@ public abstract class PDAnnotation imple // TODO not yet implemented: // Movie, Screen, PrinterMark, TrapNet, Watermark, 3D, Redact annot = new PDAnnotationUnknown(annotDic); - LOG.debug("Unknown or unsupported annotation subtype " + subtype); + LOG.debug("Unknown or unsupported annotation subtype {}", subtype); } } else @@ -226,7 +226,7 @@ public abstract class PDAnnotation imple } else if (!COSName.ANNOT.equals(type)) { - LOG.warn("Annotation has type " + type + ", further mayhem may follow"); + LOG.warn("Annotation has type {}, further mayhem may follow", type); } } @@ -302,7 +302,7 @@ public abstract class PDAnnotation imple } else { - LOG.warn(rectArray + " is not a rectangle array, returning null"); + LOG.warn("{} is not a rectangle array, returning null", rectArray); } } return rectangle; Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationPopup.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationPopup.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationPopup.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/PDAnnotationPopup.java Fri Oct 27 06:05:21 2023 @@ -18,8 +18,8 @@ package org.apache.pdfbox.pdmodel.intera import java.io.IOException; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; import org.apache.pdfbox.cos.COSDictionary; import org.apache.pdfbox.cos.COSName; @@ -31,7 +31,7 @@ import org.apache.pdfbox.cos.COSName; */ public class PDAnnotationPopup extends PDAnnotation { - private static final Log LOG = LogFactory.getLog(PDAnnotationPopup.class); + private static final Logger LOG = LogManager.getLogger(PDAnnotationPopup.class); /** * The type of annotation.
