svn commit: r1908464 - in /pdfbox/trunk: fontbox/src/main/java/org/apache/fontbox/ttf/GlyphRenderer.java pdfbox/src/test/java/org/apache/pdfbox/text/BidiTest.java preflight/src/test/java/org/apache/pdfbox/preflight/integration/InvalidFileTester.java

[ti...@apache.org]

Author: tilman
Date: Sat Mar 18 04:07:07 2023
New Revision: 1908464

URL: http://svn.apache.org/viewvc?rev=1908464&view=rev
Log:
PDFBOX-5572: fix some logging inconsistencies, by Axel Howind

Modified:
    pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyphRenderer.java
    pdfbox/trunk/pdfbox/src/test/java/org/apache/pdfbox/text/BidiTest.java
    pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/integration/InvalidFileTester.java

Modified: pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyphRenderer.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyphRenderer.java?rev=1908464&r1=1908463&r2=1908464&view=diff
==============================================================================
--- pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyphRenderer.java (original)
+++ pdfbox/trunk/fontbox/src/main/java/org/apache/fontbox/ttf/GlyphRenderer.java Sat Mar 18 04:07:07 2023
@@ -151,7 +151,7 @@ class GlyphRenderer
     private void moveTo(GeneralPath path, Point point)
     {
         path.moveTo(point.x, point.y);
-        if (LOG.isDebugEnabled())
+        if (LOG.isTraceEnabled())
         {
             LOG.trace("moveTo: " + String.format(Locale.US, "%d,%d", point.x, point.y));
         }
@@ -160,7 +160,7 @@ class GlyphRenderer
     private void lineTo(GeneralPath path, Point point)
     {
         path.lineTo(point.x, point.y);
-        if (LOG.isDebugEnabled())
+        if (LOG.isTraceEnabled())
         {
             LOG.trace("lineTo: " + String.format(Locale.US, "%d,%d", point.x, point.y));
         }
@@ -169,7 +169,7 @@ class GlyphRenderer
     private void quadTo(GeneralPath path, Point ctrlPoint, Point point)
     {
         path.quadTo(ctrlPoint.x, ctrlPoint.y, point.x, point.y);
-        if (LOG.isDebugEnabled())
+        if (LOG.isTraceEnabled())
         {
             LOG.trace("quadTo: " + String.format(Locale.US, "%d,%d %d,%d", ctrlPoint.x, ctrlPoint.y,
                     point.x, point.y));

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=1908464&r1=1908463&r2=1908464&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 Sat Mar 18 04:07:07 2023
@@ -46,7 +46,7 @@ class BidiTest
     /**
      * Logger instance.
      */
-    private static final Log log = LogFactory.getLog(TestTextStripper.class);
+    private static final Log log = LogFactory.getLog(BidiTest.class);
     
     private static final File IN_DIR = new File("src/test/resources/org/apache/pdfbox/text/");
     private static final File outDir = new File("target/test-output");

Modified: pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/integration/InvalidFileTester.java
URL: http://svn.apache.org/viewvc/pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/integration/InvalidFileTester.java?rev=1908464&r1=1908463&r2=1908464&view=diff
==============================================================================
--- pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/integration/InvalidFileTester.java (original)
+++ pdfbox/trunk/preflight/src/test/java/org/apache/pdfbox/preflight/integration/InvalidFileTester.java Sat Mar 18 04:07:07 2023
@@ -39,9 +39,10 @@ import org.apache.pdfbox.preflight.parse
 
 public class InvalidFileTester
 {
+    private static final Log LOG = LogFactory.getLog(InvalidFileTester.class);
 
     /**
-     * where result information are pushed
+     * where result information is pushed
      */
     protected OutputStream outputResult = null;
 
@@ -50,10 +51,6 @@ public class InvalidFileTester
      */
     protected File path;
 
-    protected static Log staticLogger = LogFactory.getLog("Test");
-
-    protected Log logger = null;
-
     /**
      * Prepare the test for one file
      * 
@@ -62,7 +59,6 @@ public class InvalidFileTester
      */
     public InvalidFileTester(String resultKeyFile) throws Exception
     {
-        this.logger = LogFactory.getLog(this.getClass());
         before(resultKeyFile);
     }
 
@@ -70,7 +66,7 @@ public class InvalidFileTester
     {
         if (path == null)
         {
-            logger.warn("This is an empty test");
+            LOG.warn("This is an empty test");
             return;
         }
         ValidationResult result = PreflightParser.validate(path);
@@ -103,7 +99,7 @@ public class InvalidFileTester
         {
             if (expectedError == null)
             {
-                logger.info("File invalid as expected (no expected code) :"
+                LOG.info("File invalid as expected (no expected code) :"
                         + this.path.getAbsolutePath());
             }
             else if (!found)