Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDCaretAppearanceHandler.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDCaretAppearanceHandler.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDCaretAppearanceHandler.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDCaretAppearanceHandler.java Fri Oct 27 06:05:21 2023 @@ -16,8 +16,8 @@ package org.apache.pdfbox.pdmodel.interactive.annotation.handlers; 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.COSName; import org.apache.pdfbox.pdmodel.common.PDRectangle; import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation; @@ -34,7 +34,7 @@ import org.apache.pdfbox.util.Matrix; */ public class PDCaretAppearanceHandler extends PDAbstractAppearanceHandler { - private static final Log LOG = LogFactory.getLog(PDCaretAppearanceHandler.class); + private static final Logger LOG = LogManager.getLogger(PDCaretAppearanceHandler.class); public PDCaretAppearanceHandler(PDAnnotation annotation) {
Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDCircleAppearanceHandler.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDCircleAppearanceHandler.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDCircleAppearanceHandler.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDCircleAppearanceHandler.java Fri Oct 27 06:05:21 2023 @@ -18,8 +18,8 @@ package org.apache.pdfbox.pdmodel.interactive.annotation.handlers; 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.COSNumber; @@ -39,7 +39,7 @@ import org.apache.pdfbox.pdmodel.interac */ public class PDCircleAppearanceHandler extends PDAbstractAppearanceHandler { - private static final Log LOG = LogFactory.getLog(PDCircleAppearanceHandler.class); + private static final Logger LOG = LogManager.getLogger(PDCircleAppearanceHandler.class); public PDCircleAppearanceHandler(PDAnnotation annotation) { Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDFileAttachmentAppearanceHandler.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDFileAttachmentAppearanceHandler.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDFileAttachmentAppearanceHandler.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDFileAttachmentAppearanceHandler.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.pdmodel.PDAppearanceContentStream; import org.apache.pdfbox.pdmodel.PDDocument; import org.apache.pdfbox.pdmodel.common.PDRectangle; @@ -32,7 +32,7 @@ import org.apache.pdfbox.pdmodel.interac */ public class PDFileAttachmentAppearanceHandler extends PDAbstractAppearanceHandler { - private static final Log LOG = LogFactory.getLog(PDFileAttachmentAppearanceHandler.class); + private static final Logger LOG = LogManager.getLogger(PDFileAttachmentAppearanceHandler.class); public PDFileAttachmentAppearanceHandler(PDAnnotation annotation) { Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDFreeTextAppearanceHandler.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDFreeTextAppearanceHandler.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDFreeTextAppearanceHandler.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDFreeTextAppearanceHandler.java Fri Oct 27 06:05:21 2023 @@ -19,8 +19,8 @@ import java.io.IOException; import java.nio.charset.StandardCharsets; import java.util.regex.Matcher; import java.util.regex.Pattern; -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.operator.Operator; import org.apache.pdfbox.contentstream.operator.OperatorName; import org.apache.pdfbox.cos.COSArray; @@ -50,7 +50,7 @@ import org.apache.pdfbox.util.Matrix; public class PDFreeTextAppearanceHandler extends PDAbstractAppearanceHandler { - private static final Log LOG = LogFactory.getLog(PDFreeTextAppearanceHandler.class); + private static final Logger LOG = LogManager.getLogger(PDFreeTextAppearanceHandler.class); private static final Pattern COLOR_PATTERN = Pattern.compile(".*color\\:\\s*\\#([0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F][0-9a-fA-F]).*"); Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDHighlightAppearanceHandler.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDHighlightAppearanceHandler.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDHighlightAppearanceHandler.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDHighlightAppearanceHandler.java Fri Oct 27 06:05:21 2023 @@ -17,8 +17,8 @@ package org.apache.pdfbox.pdmodel.interactive.annotation.handlers; 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; import org.apache.pdfbox.pdmodel.PDFormContentStream; @@ -39,7 +39,7 @@ import org.apache.pdfbox.pdmodel.PDDocum */ public class PDHighlightAppearanceHandler extends PDAbstractAppearanceHandler { - private static final Log LOG = LogFactory.getLog(PDHighlightAppearanceHandler.class); + private static final Logger LOG = LogManager.getLogger(PDHighlightAppearanceHandler.class); public PDHighlightAppearanceHandler(PDAnnotation annotation) { Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDInkAppearanceHandler.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDInkAppearanceHandler.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDInkAppearanceHandler.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDInkAppearanceHandler.java Fri Oct 27 06:05:21 2023 @@ -17,8 +17,8 @@ package org.apache.pdfbox.pdmodel.interactive.annotation.handlers; 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.PDColor; import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation; import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationInk; @@ -32,7 +32,7 @@ import org.apache.pdfbox.pdmodel.common. */ public class PDInkAppearanceHandler extends PDAbstractAppearanceHandler { - private static final Log LOG = LogFactory.getLog(PDInkAppearanceHandler.class); + private static final Logger LOG = LogManager.getLogger(PDInkAppearanceHandler.class); public PDInkAppearanceHandler(PDAnnotation annotation) { Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDLineAppearanceHandler.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDLineAppearanceHandler.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDLineAppearanceHandler.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDLineAppearanceHandler.java Fri Oct 27 06:05:21 2023 @@ -17,8 +17,8 @@ package org.apache.pdfbox.pdmodel.interactive.annotation.handlers; 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.common.PDRectangle; import org.apache.pdfbox.pdmodel.font.PDFont; import org.apache.pdfbox.pdmodel.graphics.color.PDColor; @@ -34,7 +34,7 @@ import org.apache.pdfbox.util.Matrix; */ public class PDLineAppearanceHandler extends PDAbstractAppearanceHandler { - private static final Log LOG = LogFactory.getLog(PDLineAppearanceHandler.class); + private static final Logger LOG = LogManager.getLogger(PDLineAppearanceHandler.class); static final int FONT_SIZE = 9; @@ -178,7 +178,7 @@ public class PDLineAppearanceHandler ext catch (IllegalArgumentException ex) { // Adobe Reader displays placeholders instead - LOG.error("line text '" + annotation.getContents() + "' can't be shown", ex); + LOG.error("line text '{}' can't be shown", annotation.getContents(), ex); } float xOffset = (lineLength - contentLength) / 2; float yOffset; Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDLinkAppearanceHandler.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDLinkAppearanceHandler.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDLinkAppearanceHandler.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDLinkAppearanceHandler.java Fri Oct 27 06:05:21 2023 @@ -18,8 +18,8 @@ package org.apache.pdfbox.pdmodel.interactive.annotation.handlers; 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; @@ -39,7 +39,7 @@ import org.apache.pdfbox.pdmodel.interac */ public class PDLinkAppearanceHandler extends PDAbstractAppearanceHandler { - private static final Log LOG = LogFactory.getLog(PDLinkAppearanceHandler.class); + private static final Logger LOG = LogManager.getLogger(PDLinkAppearanceHandler.class); public PDLinkAppearanceHandler(PDAnnotation annotation) { @@ -90,10 +90,9 @@ public class PDLinkAppearanceHandler ext { if (!rect.contains(pathsArray[i * 2], pathsArray[i * 2 + 1])) { - LOG.warn("At least one /QuadPoints entry (" + - pathsArray[i * 2] + ";" + pathsArray[i * 2 + 1] + - ") is outside of rectangle, " + rect + - ", /QuadPoints are ignored and /Rect is used instead"); + LOG.warn( + "At least one /QuadPoints entry ({};{}) is outside of rectangle, {}, /QuadPoints are ignored and /Rect is used instead", + pathsArray[i * 2], pathsArray[i * 2 + 1], rect); pathsArray = null; break; } Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDPolygonAppearanceHandler.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDPolygonAppearanceHandler.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDPolygonAppearanceHandler.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDPolygonAppearanceHandler.java Fri Oct 27 06:05:21 2023 @@ -18,8 +18,8 @@ package org.apache.pdfbox.pdmodel.interactive.annotation.handlers; 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; @@ -40,7 +40,7 @@ import org.apache.pdfbox.pdmodel.interac */ public class PDPolygonAppearanceHandler extends PDAbstractAppearanceHandler { - private static final Log LOG = LogFactory.getLog(PDPolygonAppearanceHandler.class); + private static final Logger LOG = LogManager.getLogger(PDPolygonAppearanceHandler.class); public PDPolygonAppearanceHandler(PDAnnotation annotation) { Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDPolylineAppearanceHandler.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDPolylineAppearanceHandler.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDPolylineAppearanceHandler.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDPolylineAppearanceHandler.java Fri Oct 27 06:05:21 2023 @@ -18,8 +18,8 @@ package org.apache.pdfbox.pdmodel.interactive.annotation.handlers; 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.COSNumber; @@ -40,7 +40,7 @@ import org.apache.pdfbox.util.Matrix; */ public class PDPolylineAppearanceHandler extends PDAbstractAppearanceHandler { - private static final Log LOG = LogFactory.getLog(PDPolylineAppearanceHandler.class); + private static final Logger LOG = LogManager.getLogger(PDPolylineAppearanceHandler.class); public PDPolylineAppearanceHandler(PDAnnotation annotation) { Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDSquareAppearanceHandler.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDSquareAppearanceHandler.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDSquareAppearanceHandler.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDSquareAppearanceHandler.java Fri Oct 27 06:05:21 2023 @@ -18,8 +18,8 @@ package org.apache.pdfbox.pdmodel.interactive.annotation.handlers; 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; @@ -40,7 +40,7 @@ import org.apache.pdfbox.pdmodel.interac */ public class PDSquareAppearanceHandler extends PDAbstractAppearanceHandler { - private static final Log LOG = LogFactory.getLog(PDSquareAppearanceHandler.class); + private static final Logger LOG = LogManager.getLogger(PDSquareAppearanceHandler.class); public PDSquareAppearanceHandler(PDAnnotation annotation) { Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDSquigglyAppearanceHandler.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDSquigglyAppearanceHandler.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDSquigglyAppearanceHandler.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDSquigglyAppearanceHandler.java Fri Oct 27 06:05:21 2023 @@ -18,8 +18,8 @@ package org.apache.pdfbox.pdmodel.intera import java.awt.geom.AffineTransform; 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.COSName; import org.apache.pdfbox.pdmodel.PDAppearanceContentStream; import org.apache.pdfbox.pdmodel.PDDocument; @@ -42,7 +42,7 @@ import org.apache.pdfbox.util.Matrix; */ public class PDSquigglyAppearanceHandler extends PDAbstractAppearanceHandler { - private static final Log LOG = LogFactory.getLog(PDSquigglyAppearanceHandler.class); + private static final Logger LOG = LogManager.getLogger(PDSquigglyAppearanceHandler.class); public PDSquigglyAppearanceHandler(PDAnnotation annotation) { Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDStrikeoutAppearanceHandler.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDStrikeoutAppearanceHandler.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDStrikeoutAppearanceHandler.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDStrikeoutAppearanceHandler.java Fri Oct 27 06:05:21 2023 @@ -17,8 +17,8 @@ package org.apache.pdfbox.pdmodel.interactive.annotation.handlers; 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.common.PDRectangle; import org.apache.pdfbox.pdmodel.graphics.color.PDColor; import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation; @@ -31,7 +31,7 @@ import org.apache.pdfbox.pdmodel.PDDocum */ public class PDStrikeoutAppearanceHandler extends PDAbstractAppearanceHandler { - private static final Log LOG = LogFactory.getLog(PDStrikeoutAppearanceHandler.class); + private static final Logger LOG = LogManager.getLogger(PDStrikeoutAppearanceHandler.class); public PDStrikeoutAppearanceHandler(PDAnnotation annotation) { Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDTextAppearanceHandler.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDTextAppearanceHandler.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDTextAppearanceHandler.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDTextAppearanceHandler.java Fri Oct 27 06:05:21 2023 @@ -21,8 +21,8 @@ import java.awt.geom.PathIterator; import java.io.IOException; 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.pdfbox.cos.COSName; import org.apache.pdfbox.pdmodel.PDAppearanceContentStream; import org.apache.pdfbox.pdmodel.PDDocument; @@ -42,7 +42,7 @@ import org.apache.pdfbox.util.Matrix; */ public class PDTextAppearanceHandler extends PDAbstractAppearanceHandler { - private static final Log LOG = LogFactory.getLog(PDTextAppearanceHandler.class); + private static final Logger LOG = LogManager.getLogger(PDTextAppearanceHandler.class); private static final Set<String> SUPPORTED_NAMES = new HashSet<>(); Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDUnderlineAppearanceHandler.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDUnderlineAppearanceHandler.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDUnderlineAppearanceHandler.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/annotation/handlers/PDUnderlineAppearanceHandler.java Fri Oct 27 06:05:21 2023 @@ -17,8 +17,8 @@ package org.apache.pdfbox.pdmodel.interactive.annotation.handlers; 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.common.PDRectangle; import org.apache.pdfbox.pdmodel.graphics.color.PDColor; import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotation; @@ -31,7 +31,7 @@ import org.apache.pdfbox.pdmodel.PDDocum */ public class PDUnderlineAppearanceHandler extends PDAbstractAppearanceHandler { - private static final Log LOG = LogFactory.getLog(PDUnderlineAppearanceHandler.class); + private static final Logger LOG = LogManager.getLogger(PDUnderlineAppearanceHandler.class); public PDUnderlineAppearanceHandler(PDAnnotation annotation) { Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/PDFTemplateCreator.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/PDFTemplateCreator.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/PDFTemplateCreator.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/PDFTemplateCreator.java Fri Oct 27 06:05:21 2023 @@ -22,8 +22,8 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; -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.COSDocument; import org.apache.pdfbox.cos.COSName; import org.apache.pdfbox.pdfwriter.COSWriter; @@ -44,7 +44,7 @@ import org.apache.pdfbox.pdmodel.interac public class PDFTemplateCreator { private final PDFTemplateBuilder pdfBuilder; - private static final Log LOG = LogFactory.getLog(PDFTemplateCreator.class); + private static final Logger LOG = LogManager.getLogger(PDFTemplateCreator.class); /** * Constructor. @@ -148,7 +148,7 @@ public class PDFTemplateCreator pdfBuilder.createVisualSignature(template); pdfBuilder.createWidgetDictionary(pdSignatureField, holderFormResources); InputStream in = getVisualSignatureAsStream(pdfStructure.getVisualSignature()); - LOG.info("stream returning started, size= " + in.available()); + LOG.info("stream returning started, size= {}", in.available()); // return result of the stream return in; } Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/PDVisibleSigBuilder.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/PDVisibleSigBuilder.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/PDVisibleSigBuilder.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/digitalsignature/visible/PDVisibleSigBuilder.java Fri Oct 27 06:05:21 2023 @@ -23,8 +23,8 @@ import java.io.OutputStream; import java.nio.charset.StandardCharsets; 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.COSDictionary; import org.apache.pdfbox.cos.COSName; @@ -53,7 +53,7 @@ import org.apache.pdfbox.pdmodel.interac public class PDVisibleSigBuilder implements PDFTemplateBuilder { private final PDFTemplateStructure pdfStructure; - private static final Log LOG = LogFactory.getLog(PDVisibleSigBuilder.class); + private static final Logger LOG = LogManager.getLogger(PDVisibleSigBuilder.class); /** * Constructor, creates PDF template structure. Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/AppearanceGeneratorHelper.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/AppearanceGeneratorHelper.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/AppearanceGeneratorHelper.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/AppearanceGeneratorHelper.java Fri Oct 27 06:05:21 2023 @@ -24,8 +24,8 @@ import java.io.IOException; import java.io.OutputStream; 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.fontbox.util.BoundingBox; import org.apache.pdfbox.contentstream.operator.Operator; import org.apache.pdfbox.cos.COSDictionary; @@ -61,7 +61,7 @@ import org.apache.pdfbox.util.Matrix; */ class AppearanceGeneratorHelper { - private static final Log LOG = LogFactory.getLog(AppearanceGeneratorHelper.class); + private static final Logger LOG = LogManager.getLogger(AppearanceGeneratorHelper.class); private static final Operator BMC = Operator.getOperator("BMC"); private static final Operator EMC = Operator.getOperator("EMC"); @@ -161,7 +161,8 @@ class AppearanceGeneratorHelper { if (acroFormResources.getFont(fontResourceName) == null) { - LOG.debug("Adding font resource " + fontResourceName + " from widget to AcroForm"); + LOG.debug("Adding font resource {} from widget to AcroForm", + fontResourceName); // use the COS-object to preserve a possible indirect object reference acroFormFontDict.setItem(fontResourceName, widgetFontDict.getItem(fontResourceName)); @@ -200,7 +201,9 @@ class AppearanceGeneratorHelper { if (widget.getCOSObject().containsKey("PMD")) { - LOG.warn("widget of field " + field.getFullyQualifiedName() + " is a PaperMetaData widget, no appearance stream created"); + LOG.warn( + "widget of field {} is a PaperMetaData widget, no appearance stream created", + field.getFullyQualifiedName()); continue; } @@ -217,7 +220,8 @@ class AppearanceGeneratorHelper if (rect == null) { widget.getCOSObject().removeItem(COSName.AP); - LOG.warn("widget of field " + field.getFullyQualifiedName() + " has no rectangle, no appearance stream created"); + LOG.warn("widget of field {} has no rectangle, no appearance stream created", + field.getFullyQualifiedName()); continue; } @@ -495,15 +499,15 @@ class AppearanceGeneratorHelper } if (font.getName().contains("+")) { - LOG.warn("Font '" + defaultAppearance.getFontName().getName() + - "' of field '" + field.getFullyQualifiedName() + - "' contains subsetted font '" + font.getName() + "'"); + LOG.warn("Font '{}' of field '{}' contains subsetted font '{}'", + defaultAppearance.getFontName().getName(), field.getFullyQualifiedName(), + font.getName()); LOG.warn("This may bring trouble with PDField.setValue(), PDAcroForm.flatten() or " + "PDAcroForm.refreshAppearances()"); LOG.warn("You should replace this font with a non-subsetted font:"); LOG.warn("PDFont font = PDType0Font.load(doc, new FileInputStream(fontfile), false);"); - LOG.warn("acroForm.getDefaultResources().put(COSName.getPDFName(\"" + - defaultAppearance.getFontName().getName() + "\", font);"); + LOG.warn("acroForm.getDefaultResources().put(COSName.getPDFName(\"{}\", font);", + defaultAppearance.getFontName().getName()); } // calculate the fontSize (because 0 = autosize) float fontSize = defaultAppearance.getFontSize(); @@ -542,7 +546,8 @@ class AppearanceGeneratorHelper } else { float fontCapHeight = resolveCapHeight(font); float fontDescent = resolveDescent(font); - LOG.debug("missing font descriptor - resolved Cap/Descent to " + fontCapHeight + "/" + fontDescent); + LOG.debug("missing font descriptor - resolved Cap/Descent to {}/{}", fontCapHeight, + fontDescent); fontCapAtSize = fontCapHeight * fontScaleY; fontDescentAtSize = fontDescent * fontScaleY; } @@ -969,7 +974,7 @@ class AppearanceGeneratorHelper path = simpleFont.getPath(name); } else { // shouldn't happen, please open issue in JIRA - LOG.warn("Unknown font class: " + font.getClass()); + LOG.warn("Unknown font class: {}", font.getClass()); } if (path == null) { return -1; Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroForm.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroForm.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroForm.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDAcroForm.java Fri Oct 27 06:05:21 2023 @@ -30,8 +30,8 @@ import java.util.List; 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.pdfbox.cos.COSArray; import org.apache.pdfbox.cos.COSBase; import org.apache.pdfbox.cos.COSDictionary; @@ -63,7 +63,7 @@ import org.apache.pdfbox.util.Matrix; */ public final class PDAcroForm implements COSObjectable { - private static final Log LOG = LogFactory.getLog(PDAcroForm.class); + private static final Logger LOG = LogManager.getLogger(PDAcroForm.class); private static final int FLAG_SIGNATURES_EXIST = 1; private static final int FLAG_APPEND_ONLY = 1 << 1; Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDFieldTree.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDFieldTree.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDFieldTree.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDFieldTree.java Fri Oct 27 06:05:21 2023 @@ -25,8 +25,8 @@ import java.util.Queue; import java.util.List; import java.util.NoSuchElementException; 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.pdfbox.cos.COSDictionary; /** @@ -34,7 +34,7 @@ import org.apache.pdfbox.cos.COSDictiona */ public class PDFieldTree implements Iterable<PDField> { - private static final Log LOG = LogFactory.getLog(PDFieldTree.class); + private static final Logger LOG = LogManager.getLogger(PDFieldTree.class); private final PDAcroForm acroForm; @@ -116,8 +116,9 @@ public class PDFieldTree implements Iter { if (set.contains(kid.getCOSObject())) { - LOG.error("Child of field '" + node.getFullyQualifiedName() + - "' already exists elsewhere, ignored to avoid recursion"); + LOG.error( + "Child of field '{}' already exists elsewhere, ignored to avoid recursion", + node.getFullyQualifiedName()); } else { Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDNonTerminalField.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDNonTerminalField.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDNonTerminalField.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDNonTerminalField.java Fri Oct 27 06:05:21 2023 @@ -20,8 +20,8 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Collections; 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.COSDictionary; @@ -41,7 +41,7 @@ import org.apache.pdfbox.pdmodel.interac */ public class PDNonTerminalField extends PDField { - private static final Log LOG = LogFactory.getLog(PDNonTerminalField.class); + private static final Logger LOG = LogManager.getLogger(PDNonTerminalField.class); /** * Constructor. Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDSignatureField.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDSignatureField.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDSignatureField.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/pdmodel/interactive/form/PDSignatureField.java Fri Oct 27 06:05:21 2023 @@ -20,8 +20,8 @@ import java.io.IOException; 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.pdfbox.cos.COSDictionary; import org.apache.pdfbox.cos.COSName; import org.apache.pdfbox.pdmodel.interactive.annotation.PDAnnotationWidget; @@ -36,7 +36,7 @@ import org.apache.pdfbox.pdmodel.interac */ public class PDSignatureField extends PDTerminalField { - private static final Log LOG = LogFactory.getLog(PDSignatureField.class); + private static final Logger LOG = LogManager.getLogger(PDSignatureField.class); /** * @see PDTerminalField#PDTerminalField(PDAcroForm) Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/GlyphCache.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/GlyphCache.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/GlyphCache.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/GlyphCache.java Fri Oct 27 06:05:21 2023 @@ -20,8 +20,8 @@ import java.awt.geom.GeneralPath; 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; import org.apache.pdfbox.pdmodel.font.PDFontLike; import org.apache.pdfbox.pdmodel.font.PDSimpleFont; import org.apache.pdfbox.pdmodel.font.PDType0Font; @@ -34,7 +34,7 @@ import org.apache.pdfbox.pdmodel.font.PD */ final class GlyphCache { - private static final Log LOG = LogFactory.getLog(GlyphCache.class); + private static final Logger LOG = LogManager.getLogger(GlyphCache.class); private final PDVectorFont font; private final Map<Integer, GeneralPath> cache = new HashMap<>(); @@ -61,14 +61,14 @@ final class GlyphCache { int cid = ((PDType0Font) font).codeToCID(code); String cidHex = String.format("%04x", cid); - LOG.warn("No glyph for code " + code + " (CID " + cidHex + ") in font " + fontName); + LOG.warn("No glyph for code {} (CID {}) in font {}", code, cidHex, fontName); } else if (font instanceof PDSimpleFont) { PDSimpleFont simpleFont = (PDSimpleFont) font; - LOG.warn("No glyph for code " + code + " in " + font.getClass().getSimpleName() - + " " + fontName + " (embedded or system font used: " - + simpleFont.getFontBoxFont().getName() + ")"); + LOG.warn("No glyph for code {} in {} {} (embedded or system font used: {})", + code, font.getClass().getSimpleName(), fontName, + simpleFont.getFontBoxFont().getName()); if (code == 10 && simpleFont.isStandard14()) { // PDFBOX-4001 return empty path for line feed on std14 @@ -79,7 +79,7 @@ final class GlyphCache } else { - LOG.warn("No glyph for code " + code + " in font " + fontName); + LOG.warn("No glyph for code {} in font {}", code, fontName); } } @@ -91,7 +91,7 @@ final class GlyphCache { // todo: escalate this error? String fontName = ((PDFontLike) font).getName(); - LOG.error("Glyph rendering failed for code " + code + " in font " + fontName, e); + LOG.error("Glyph rendering failed for code {} in font {}", code, fontName, e); return new GeneralPath(); } } Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/PageDrawer.java Fri Oct 27 06:05:21 2023 @@ -59,8 +59,8 @@ import java.util.List; 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.pdfbox.contentstream.PDFGraphicsStreamEngine; import org.apache.pdfbox.cos.COSArray; import org.apache.pdfbox.cos.COSBase; @@ -120,7 +120,7 @@ import org.apache.pdfbox.util.Vector; */ public class PageDrawer extends PDFGraphicsStreamEngine { - private static final Log LOG = LogFactory.getLog(PageDrawer.class); + private static final Logger LOG = LogManager.getLogger(PageDrawer.class); private static final String OS_NAME = System.getProperty("os.name").toLowerCase(); private static final boolean IS_WINDOWS = OS_NAME.startsWith("windows"); @@ -725,7 +725,7 @@ public class PageDrawer extends PDFGraph float miterLimit = state.getMiterLimit(); if (miterLimit < 1) { - LOG.warn("Miter limit must be >= 1, value " + miterLimit + " is ignored"); + LOG.warn("Miter limit must be >= 1, value {} is ignored", miterLimit); miterLimit = 10; } return new BasicStroke(lineWidth, lineCap, lineJoin, @@ -1414,7 +1414,7 @@ public class PageDrawer extends PDFGraph PDShading shading = getResources().getShading(shadingName); if (shading == null) { - LOG.error("shading " + shadingName + " does not exist in resources dictionary"); + LOG.error("shading {} does not exist in resources dictionary", shadingName); return; } Matrix ctm = getGraphicsState().getCurrentTransformationMatrix(); Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/SoftMask.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/SoftMask.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/SoftMask.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/SoftMask.java Fri Oct 27 06:05:21 2023 @@ -30,8 +30,8 @@ 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.common.function.PDFunction; import org.apache.pdfbox.pdmodel.common.function.PDFunctionTypeIdentity; @@ -48,7 +48,7 @@ import org.apache.pdfbox.pdmodel.graphic class SoftMask implements Paint { - private static final Log LOG = LogFactory.getLog(SoftMask.class); + private static final Logger LOG = LogManager.getLogger(SoftMask.class); private static final ColorModel ARGB_COLOR_MODEL = new BufferedImage(1, 1, BufferedImage.TYPE_INT_ARGB).getColorModel(); Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/TilingPaint.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/TilingPaint.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/TilingPaint.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/TilingPaint.java Fri Oct 27 06:05:21 2023 @@ -30,8 +30,8 @@ import java.awt.image.ColorModel; import java.io.IOException; import java.math.BigDecimal; import java.math.RoundingMode; -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.common.PDRectangle; import org.apache.pdfbox.pdmodel.graphics.color.PDColor; import org.apache.pdfbox.pdmodel.graphics.color.PDColorSpace; @@ -45,7 +45,7 @@ import org.apache.pdfbox.util.Matrix; */ class TilingPaint implements Paint { - private static final Log LOG = LogFactory.getLog(TilingPaint.class); + private static final Logger LOG = LogManager.getLogger(TilingPaint.class); private final Paint paint; private final Matrix patternMatrix; private static final int MAXEDGE; @@ -227,12 +227,12 @@ class TilingPaint implements Paint if (Math.abs(width * height) > MAXEDGE * MAXEDGE) { // PDFBOX-3653: prevent huge sizes - LOG.warn("Pattern surface larger than " + MAXEDGE + " x " + MAXEDGE + ", will be clipped"); - LOG.warn("width: " + width + ", height: " + height); - LOG.warn("XStep: " + xStep + ", YStep: " + yStep); - LOG.warn("bbox: " + bbox); - LOG.warn("pattern matrix: " + pattern.getMatrix()); - LOG.warn("concatenated matrix: " + patternMatrix); + LOG.warn("Pattern surface larger than {} x {}, will be clipped", MAXEDGE, MAXEDGE); + LOG.warn("width: {}, height: {}", width, height); + LOG.warn("XStep: {}, YStep: {}", xStep, yStep); + LOG.warn("bbox: {}", bbox); + LOG.warn("pattern matrix: {}", pattern.getMatrix()); + LOG.warn("concatenated matrix: {}", patternMatrix); LOG.warn("increase the property 'pdfbox.rendering.tilingpaint.maxedge'"); width = Math.min(MAXEDGE, Math.abs(width)) * Math.signum(width); height = Math.min(MAXEDGE, Math.abs(height)) * Math.signum(height); Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/TilingPaintFactory.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/TilingPaintFactory.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/TilingPaintFactory.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/rendering/TilingPaintFactory.java Fri Oct 27 06:05:21 2023 @@ -22,8 +22,8 @@ import java.lang.ref.WeakReference; import java.util.Map; import java.util.WeakHashMap; -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.pdmodel.graphics.color.PDColor; @@ -38,7 +38,7 @@ import org.apache.pdfbox.util.Matrix; */ class TilingPaintFactory { - private static final Log LOG = LogFactory.getLog(TilingPaintFactory.class); + private static final Logger LOG = LogManager.getLogger(TilingPaintFactory.class); private final PageDrawer drawer; private final Map<TilingPaintParameter, WeakReference<Paint>> weakCache Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/LegacyPDFStreamEngine.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/LegacyPDFStreamEngine.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/LegacyPDFStreamEngine.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/LegacyPDFStreamEngine.java Fri Oct 27 06:05:21 2023 @@ -21,8 +21,8 @@ import java.io.InputStream; import java.util.Map; import java.util.WeakHashMap; -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.TrueTypeFont; import org.apache.fontbox.util.BoundingBox; @@ -77,7 +77,7 @@ import org.apache.pdfbox.pdmodel.font.PD */ class LegacyPDFStreamEngine extends PDFStreamEngine { - private static final Log LOG = LogFactory.getLog(LegacyPDFStreamEngine.class); + private static final Logger LOG = LogManager.getLogger(LegacyPDFStreamEngine.class); private int pageRotation; private PDRectangle pageSize; Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripper.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripper.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripper.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/PDFTextStripper.java Fri Oct 27 06:05:21 2023 @@ -38,8 +38,8 @@ import java.util.TreeMap; import java.util.TreeSet; import java.util.regex.Pattern; -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.PDDocument; import org.apache.pdfbox.pdmodel.PDPage; import org.apache.pdfbox.pdmodel.PDPageTree; @@ -63,7 +63,7 @@ public class PDFTextStripper extends Leg private static float defaultIndentThreshold = 2.0f; private static float defaultDropThreshold = 2.5f; - private static final Log LOG = LogFactory.getLog(PDFTextStripper.class); + private static final Logger LOG = LogManager.getLogger(PDFTextStripper.class); // enable the ability to set the default indent/drop thresholds // with -D system properties: @@ -1819,8 +1819,8 @@ public class PDFTextStripper extends Leg } catch (IOException e) { - LOG.warn("Could not parse BidiMirroring.txt, mirroring char map will be empty: " - + e.getMessage(), e); + LOG.warn("Could not parse BidiMirroring.txt, mirroring char map will be empty: {}", + e.getMessage(), e); } } Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/TextPosition.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/TextPosition.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/TextPosition.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/text/TextPosition.java Fri Oct 27 06:05:21 2023 @@ -20,8 +20,8 @@ import java.text.Normalizer; import java.util.Arrays; 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.pdmodel.font.PDFont; import org.apache.pdfbox.util.Matrix; @@ -32,7 +32,7 @@ import org.apache.pdfbox.util.Matrix; */ public final class TextPosition { - private static final Log LOG = LogFactory.getLog(TextPosition.class); + private static final Logger LOG = LogManager.getLogger(TextPosition.class); private static final Map<Integer, String> DIACRITICS = createDiacritics(); @@ -628,8 +628,9 @@ public final class TextPosition { if (i >= widths.length) { - LOG.info("diacritic " + diacritic.getUnicode() + " on ligature " + unicode + - " is not supported yet and is ignored (PDFBOX-2831)"); + LOG.info( + "diacritic {} on ligature {} is not supported yet and is ignored (PDFBOX-2831)", + diacritic.getUnicode(), unicode); break; } float currCharXEnd = currCharXStart + widths[i]; Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/DateConverter.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/DateConverter.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/DateConverter.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/DateConverter.java Fri Oct 27 06:05:21 2023 @@ -25,8 +25,8 @@ import java.util.Locale; import java.util.SimpleTimeZone; import java.util.TimeZone; -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.COSString; @@ -64,7 +64,7 @@ import org.apache.pdfbox.cos.COSString; */ public final class DateConverter { - private static final Log LOG = LogFactory.getLog(DateConverter.class); + private static final Logger LOG = LogManager.getLogger(DateConverter.class); private DateConverter() { @@ -558,7 +558,7 @@ public final class DateConverter } catch (IllegalArgumentException ill) { - LOG.debug("Couldn't parse arguments text:" + text + " initialWhere:" + initialWhere, ill); + LOG.debug("Couldn't parse arguments text:{} initialWhere:{}", text, initialWhere, ill); return null; } initialWhere.setIndex(where.getIndex()); Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/Hex.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/Hex.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/Hex.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/Hex.java Fri Oct 27 06:05:21 2023 @@ -21,8 +21,8 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.OutputStream; import java.util.Base64; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** * Utility functions for hex encoding. @@ -31,7 +31,7 @@ import org.apache.commons.logging.LogFac */ public final class Hex { - private static final Log LOG = LogFactory.getLog(Hex.class); + private static final Logger LOG = LogManager.getLogger(Hex.class); /** * for hex conversion. @@ -234,7 +234,7 @@ public final class Hex } catch (NumberFormatException ex) { - LOG.error("Can't parse " + hexByte + ", aborting decode", ex); + LOG.error("Can't parse {}, aborting decode", hexByte, ex); break; } i += 2; Modified: pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/Version.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/Version.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/Version.java (original) +++ pdfbox/trunk/pdfbox/src/main/java/org/apache/pdfbox/util/Version.java Fri Oct 27 06:05:21 2023 @@ -22,15 +22,15 @@ import java.io.IOException; import java.io.InputStream; import java.util.Properties; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.logging.log4j.Logger; +import org.apache.logging.log4j.LogManager; /** * Exposes PDFBox version. */ public final class Version { - private static final Log LOG = LogFactory.getLog(Version.class); + private static final Logger LOG = LogManager.getLogger(Version.class); private static final String PDFBOX_VERSION_PROPERTIES = "/org/apache/pdfbox/resources/version.properties"; Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestSymmetricKeyEncryption.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestSymmetricKeyEncryption.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestSymmetricKeyEncryption.java (original) +++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/encryption/TestSymmetricKeyEncryption.java Fri Oct 27 06:05:21 2023 @@ -36,8 +36,8 @@ import java.util.List; import java.util.Map; import javax.crypto.Cipher; -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.Loader; import org.apache.pdfbox.cos.COSDictionary; import org.apache.pdfbox.cos.COSName; @@ -78,7 +78,7 @@ class TestSymmetricKeyEncryption /** * Logger instance. */ - private static final Log LOG = LogFactory.getLog(TestSymmetricKeyEncryption.class); + private static final Logger LOG = LogManager.getLogger(TestSymmetricKeyEncryption.class); private static final File testResultsDir = new File("target/test-output/crypto"); Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestPDFToImage.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestPDFToImage.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestPDFToImage.java (original) +++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/rendering/TestPDFToImage.java Fri Oct 27 06:05:21 2023 @@ -25,8 +25,8 @@ import java.io.FileOutputStream; import java.io.FilenameFilter; import java.io.IOException; 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.Loader; import org.apache.pdfbox.pdmodel.PDDocument; @@ -60,7 +60,7 @@ public class TestPDFToImage /** * Logger instance. */ - private static final Log LOG = LogFactory.getLog(TestPDFToImage.class); + private static final Logger LOG = LogManager.getLogger(TestPDFToImage.class); /** * Constructor. Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/text/BidiTest.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/text/BidiTest.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/text/BidiTest.java (original) +++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/text/BidiTest.java Fri Oct 27 06:05:21 2023 @@ -30,8 +30,8 @@ import java.io.OutputStreamWriter; import java.io.Writer; import java.nio.file.Files; -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.Loader; import org.apache.pdfbox.pdmodel.PDDocument; import org.junit.jupiter.api.AfterEach; @@ -47,7 +47,7 @@ class BidiTest /** * Logger instance. */ - private static final Log LOG = LogFactory.getLog(BidiTest.class); + private static final Logger LOG = LogManager.getLogger(BidiTest.class); private static final File IN_DIR = new File("src/test/resources/org/apache/pdfbox/text/"); private static final File OUT_DIR = new File("target/test-output"); Modified: pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/text/TestTextStripper.java URL: http://svn.apache.org/viewvc/pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/text/TestTextStripper.java?rev=1913377&r1=1913376&r2=1913377&view=diff ============================================================================== --- pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/text/TestTextStripper.java (original) +++ pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/text/TestTextStripper.java Fri Oct 27 06:05:21 2023 @@ -49,8 +49,8 @@ import java.util.Iterator; import java.util.LinkedList; 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.fontbox.util.BoundingBox; import org.apache.pdfbox.Loader; import org.apache.pdfbox.pdmodel.PDDocument; @@ -116,7 +116,7 @@ class TestTextStripper /** * Logger instance. */ - private static final Log log = LogFactory.getLog(TestTextStripper.class); + private static final Logger LOG = LogManager.getLogger(TestTextStripper.class); private boolean bFail = false; private static PDFTextStripper stripper; @@ -166,7 +166,7 @@ class TestTextStripper if( expectedArray[expectedIndex] != actualArray[actualIndex] ) { equals = false; - log.warn("Lines differ at index" + LOG.warn("Lines differ at index" + " expected:" + expectedIndex + "-" + (int)expectedArray[expectedIndex] + " actual:" + actualIndex + "-" + (int)actualArray[actualIndex] ); break; @@ -181,17 +181,17 @@ class TestTextStripper if( expectedIndex != expectedArray.length ) { equals = false; - log.warn("Expected line is longer at:" + expectedIndex ); + LOG.warn("Expected line is longer at:" + expectedIndex ); } if( actualIndex != actualArray.length ) { equals = false; - log.warn("Actual line is longer at:" + actualIndex ); + LOG.warn("Actual line is longer at:" + actualIndex ); } if (expectedArray.length != actualArray.length) { equals = false; - log.warn("Expected lines: " + expectedArray.length + ", actual lines: " + actualArray.length); + LOG.warn("Expected lines: " + expectedArray.length + ", actual lines: " + actualArray.length); } } } @@ -236,11 +236,11 @@ class TestTextStripper { if(bSort) { - log.info("Preparing to parse " + inFile.getName() + " for sorted test"); + LOG.info("Preparing to parse " + inFile.getName() + " for sorted test"); } else { - log.info("Preparing to parse " + inFile.getName() + " for standard test"); + LOG.info("Preparing to parse " + inFile.getName() + " for standard test"); } Files.createDirectories(outDir.toPath()); @@ -284,14 +284,14 @@ class TestTextStripper if (bLogResult) { - log.info("Text for " + inFile.getName() + ":"); - log.info(stripper.getText(document)); + LOG.info("Text for " + inFile.getName() + ":"); + LOG.info(stripper.getText(document)); } if (!expectedFile.exists()) { this.bFail = true; - log.error("FAILURE: Input verification file: " + expectedFile.getAbsolutePath() + + LOG.error("FAILURE: Input verification file: " + expectedFile.getAbsolutePath() + " did not exist"); return; } @@ -326,7 +326,7 @@ class TestTextStripper { this.bFail = true; localFail = true; - log.error("FAILURE: Line mismatch for file " + inFile.getName() + + LOG.error("FAILURE: Line mismatch for file " + inFile.getName() + " (sort = "+bSort+")" + " at expected line: " + expectedReader.getLineNumber() + " at actual line: " + actualReader.getLineNumber() +
