Author: lehmi
Date: Fri Oct 27 06:09:01 2023
New Revision: 1913378
URL: http://svn.apache.org/viewvc?rev=1913378&view=rev
Log:
PDFBOX-5695: switch to log4j as suggested by Axel Howind
Added:
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/DebugLogAppender.java
(with props)
Removed:
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/DebugLog.java
Modified:
pdfbox/trunk/debugger-app/pom.xml
pdfbox/trunk/debugger/pom.xml
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/PDFDebugger.java
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/fontencodingpane/FontEncodingPaneController.java
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/fontencodingpane/SimpleFont.java
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/pagepane/DebugTextOverlay.java
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/pagepane/PagePane.java
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/Stream.java
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/StreamPane.java
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/tooltip/FontToolTip.java
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/tooltip/KToolTip.java
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/tooltip/SCNToolTip.java
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/tooltip/ToolTipController.java
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/textsearcher/SearchEngine.java
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/textsearcher/Searcher.java
Modified: pdfbox/trunk/debugger-app/pom.xml
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/debugger-app/pom.xml?rev=1913378&r1=1913377&r2=1913378&view=diff
==============================================================================
--- pdfbox/trunk/debugger-app/pom.xml (original)
+++ pdfbox/trunk/debugger-app/pom.xml Fri Oct 27 06:09:01 2023
@@ -40,6 +40,12 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j2.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
<groupId>org.bouncycastle</groupId>
<artifactId>bcpkix-jdk18on</artifactId>
<scope>provided</scope>
Modified: pdfbox/trunk/debugger/pom.xml
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/debugger/pom.xml?rev=1913378&r1=1913377&r2=1913378&view=diff
==============================================================================
--- pdfbox/trunk/debugger/pom.xml (original)
+++ pdfbox/trunk/debugger/pom.xml Fri Oct 27 06:09:01 2023
@@ -48,6 +48,12 @@
<artifactId>picocli</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.logging.log4j</groupId>
+ <artifactId>log4j-core</artifactId>
+ <version>${log4j2.version}</version>
+ <scope>compile</scope>
+ </dependency>
+ <dependency>
<groupId>org.apache.pdfbox</groupId>
<artifactId>jbig2-imageio</artifactId>
<scope>test</scope>
Modified:
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/PDFDebugger.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/PDFDebugger.java?rev=1913378&r1=1913377&r2=1913378&view=diff
==============================================================================
---
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/PDFDebugger.java
(original)
+++
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/PDFDebugger.java
Fri Oct 27 06:09:01 2023
@@ -84,8 +84,8 @@ import javax.swing.filechooser.FileFilte
import javax.swing.filechooser.FileNameExtensionFilter;
import javax.swing.tree.TreePath;
-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.COSArray;
@@ -111,6 +111,7 @@ import org.apache.pdfbox.debugger.string
import org.apache.pdfbox.debugger.treestatus.TreeStatus;
import org.apache.pdfbox.debugger.treestatus.TreeStatusPane;
import org.apache.pdfbox.debugger.ui.ArrayEntry;
+import org.apache.pdfbox.debugger.ui.DebugLogAppender;
import org.apache.pdfbox.debugger.ui.DocumentEntry;
import org.apache.pdfbox.debugger.ui.ErrorDialog;
import org.apache.pdfbox.debugger.ui.FileOpenSaveDialog;
@@ -164,7 +165,7 @@ import picocli.CommandLine.Model.Command
@Command(name = "pdfdebugger", description = "Analyzes and inspects the
internal structure of a PDF document")
public class PDFDebugger extends JFrame implements Callable<Integer>,
HyperlinkListener
{
- private static Log LOG; // needs late initialization
+ private static Logger LOG; // needs late initialization
private static final Set<COSName> SPECIALCOLORSPACES = new HashSet<>(
Arrays.asList(COSName.INDEXED, COSName.SEPARATION,
COSName.DEVICEN));
@@ -299,8 +300,8 @@ public class PDFDebugger extends JFrame
// and if there are no methods that call logging, even invisible
// use reduced file from PDFBOX-3653 to see logging
LogDialog.init(this,statusBar.getLogLabel());
- System.setProperty("org.apache.commons.logging.Log",
"org.apache.pdfbox.debugger.ui.DebugLog");
- LOG = LogFactory.getLog(PDFDebugger.class);
+ DebugLogAppender.setupCustomLogger();
+ LOG = LogManager.getLogger(PDFDebugger.class);
TextDialog.init(this);
@@ -1343,7 +1344,7 @@ public class PDFDebugger extends JFrame
job.print(pras);
long t1 = System.nanoTime();
long ms = TimeUnit.MILLISECONDS.convert(t1 - t0,
TimeUnit.NANOSECONDS);
- LOG.info("Printed in " + ms + " ms");
+ LOG.info("Printed in {} ms", ms);
}
finally
{
@@ -1387,7 +1388,7 @@ public class PDFDebugger extends JFrame
PDDocument doc = Loader.loadPDF(file, password);
long t1 = System.nanoTime();
long ms = TimeUnit.MILLISECONDS.convert(t1 - t0,
TimeUnit.NANOSECONDS);
- LOG.info("Parsed in " + ms + " ms");
+ LOG.info("Parsed in {} ms", ms);
return doc;
}
};
@@ -1436,7 +1437,7 @@ public class PDFDebugger extends JFrame
.createBufferFromStream(new
URI(urlString).toURL().openStream()), password);
long t1 = System.nanoTime();
long ms = TimeUnit.MILLISECONDS.convert(t1 - t0,
TimeUnit.NANOSECONDS);
- LOG.info("Parsed in " + ms + " ms");
+ LOG.info("Parsed in {} ms", ms);
return doc;
}
};
Modified:
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/fontencodingpane/FontEncodingPaneController.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/fontencodingpane/FontEncodingPaneController.java?rev=1913378&r1=1913377&r2=1913378&view=diff
==============================================================================
---
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/fontencodingpane/FontEncodingPaneController.java
(original)
+++
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/fontencodingpane/FontEncodingPaneController.java
Fri Oct 27 06:09:01 2023
@@ -20,8 +20,8 @@ import java.awt.geom.GeneralPath;
import java.awt.geom.Rectangle2D;
import java.io.IOException;
import javax.swing.JPanel;
-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.PDResources;
@@ -69,7 +69,7 @@ abstract class FontPane
*/
public class FontEncodingPaneController
{
- private static final Log LOG =
LogFactory.getLog(FontEncodingPaneController.class);
+ private static final Logger LOG =
LogManager.getLogger(FontEncodingPaneController.class);
private FontPane fontPane;
Modified:
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/fontencodingpane/SimpleFont.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/fontencodingpane/SimpleFont.java?rev=1913378&r1=1913377&r2=1913378&view=diff
==============================================================================
---
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/fontencodingpane/SimpleFont.java
(original)
+++
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/fontencodingpane/SimpleFont.java
Fri Oct 27 06:09:01 2023
@@ -22,8 +22,8 @@ import java.util.LinkedHashMap;
import java.util.Map;
import javax.swing.JPanel;
-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.PDSimpleFont;
import org.apache.pdfbox.pdmodel.font.PDVectorFont;
@@ -33,7 +33,7 @@ import org.apache.pdfbox.pdmodel.font.PD
*/
class SimpleFont extends FontPane
{
- private static final Log LOG = LogFactory.getLog(SimpleFont.class);
+ private static final Logger LOG = LogManager.getLogger(SimpleFont.class);
public static final String NO_GLYPH = "None";
private final FontEncodingView view;
@@ -80,7 +80,7 @@ class SimpleFont extends FontPane
}
catch (IOException ex)
{
- LOG.error("Couldn't render code " + index + " ('" +
glyphName + "') of font " +
+ LOG.error("Couldn't render code {} ('{}') of font {}",
index, glyphName,
font.getName(), ex);
glyphs[index][3] = new GeneralPath();
}
Modified:
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/pagepane/DebugTextOverlay.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/pagepane/DebugTextOverlay.java?rev=1913378&r1=1913377&r2=1913378&view=diff
==============================================================================
---
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/pagepane/DebugTextOverlay.java
(original)
+++
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/pagepane/DebugTextOverlay.java
Fri Oct 27 06:09:01 2023
@@ -29,8 +29,8 @@ import java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.Writer;
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.pdmodel.PDDocument;
import org.apache.pdfbox.pdmodel.PDPage;
@@ -54,7 +54,7 @@ import org.apache.pdfbox.util.Vector;
*/
final class DebugTextOverlay
{
- private static final Log LOG = LogFactory.getLog(DebugTextOverlay.class);
+ private static final Logger LOG =
LogManager.getLogger(DebugTextOverlay.class);
private final PDDocument document;
private final int pageIndex;
@@ -221,8 +221,8 @@ final class DebugTextOverlay
}
catch (IOException ex)
{
- LOG.error("Couldn't get bounds for code " + code + " at
position (" +
- at.getTranslateX() + "," + at.getTranslateY() + ")",
ex);
+ LOG.error("Couldn't get bounds for code {} at position
({},{})", code,
+ at.getTranslateX(), at.getTranslateY(), ex);
}
if (bbox == null)
{
Modified:
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/pagepane/PagePane.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/pagepane/PagePane.java?rev=1913378&r1=1913377&r2=1913378&view=diff
==============================================================================
---
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/pagepane/PagePane.java
(original)
+++
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/pagepane/PagePane.java
Fri Oct 27 06:09:01 2023
@@ -17,6 +17,9 @@
package org.apache.pdfbox.debugger.pagepane;
import java.awt.Graphics2D;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.apache.pdfbox.cos.COSDictionary;
import org.apache.pdfbox.debugger.PDFDebugger;
import org.apache.pdfbox.debugger.ui.ImageUtil;
@@ -61,8 +64,8 @@ import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
-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.debugger.ui.ErrorDialog;
import org.apache.pdfbox.debugger.ui.HighResolutionImageIcon;
import org.apache.pdfbox.debugger.ui.ImageTypeMenu;
@@ -92,7 +95,7 @@ import org.apache.pdfbox.text.PDFTextStr
*/
public class PagePane implements ActionListener, AncestorListener,
MouseMotionListener, MouseListener
{
- private static final Log LOG = LogFactory.getLog(PagePane.class);
+ private static final Logger LOG = LogManager.getLogger(PagePane.class);
private final PDDocument document;
private final JLabel statuslabel;
private final PDPage page;
Modified:
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/Stream.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/Stream.java?rev=1913378&r1=1913377&r2=1913378&view=diff
==============================================================================
---
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/Stream.java
(original)
+++
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/Stream.java
Fri Oct 27 06:09:01 2023
@@ -24,8 +24,8 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.StringJoiner;
-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;
@@ -42,7 +42,7 @@ import org.apache.pdfbox.pdmodel.graphic
*/
public class Stream
{
- private static final Log LOG = LogFactory.getLog(Stream.class);
+ private static final Logger LOG = LogManager.getLogger(Stream.class);
public static final String DECODED = "Decoded (Plain Text)";
public static final String IMAGE = "Image";
Modified:
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/StreamPane.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/StreamPane.java?rev=1913378&r1=1913377&r2=1913378&view=diff
==============================================================================
---
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/StreamPane.java
(original)
+++
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/StreamPane.java
Fri Oct 27 06:09:01 2023
@@ -52,8 +52,8 @@ import javax.xml.transform.TransformerFa
import javax.xml.transform.TransformerFactoryConfigurationError;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
-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;
@@ -80,7 +80,7 @@ import org.w3c.dom.Document;
*/
public class StreamPane implements ActionListener
{
- private static final Log LOG = LogFactory.getLog(StreamPane.class);
+ private static final Logger LOG = LogManager.getLogger(StreamPane.class);
private static final StyleContext CONTEXT =
StyleContext.getDefaultStyleContext();
private static final Style OPERATOR_STYLE = CONTEXT.addStyle("operator",
null);
Modified:
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/tooltip/FontToolTip.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/tooltip/FontToolTip.java?rev=1913378&r1=1913377&r2=1913378&view=diff
==============================================================================
---
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/tooltip/FontToolTip.java
(original)
+++
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/tooltip/FontToolTip.java
Fri Oct 27 06:09:01 2023
@@ -18,8 +18,8 @@
package org.apache.pdfbox.debugger.streampane.tooltip;
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.PDResources;
import org.apache.pdfbox.pdmodel.font.PDFont;
@@ -30,7 +30,7 @@ import org.apache.pdfbox.pdmodel.font.PD
*/
final class FontToolTip implements ToolTip
{
- private static final Log LOG = LogFactory.getLog(FontToolTip.class);
+ private static final Logger LOG = LogManager.getLogger(FontToolTip.class);
private String markup;
/**
Modified:
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/tooltip/KToolTip.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/tooltip/KToolTip.java?rev=1913378&r1=1913377&r2=1913378&view=diff
==============================================================================
---
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/tooltip/KToolTip.java
(original)
+++
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/tooltip/KToolTip.java
Fri Oct 27 06:09:01 2023
@@ -23,8 +23,8 @@ import java.awt.color.ICC_Profile;
import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
-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.PDDeviceCMYK;
/**
@@ -33,7 +33,7 @@ import org.apache.pdfbox.pdmodel.graphic
*/
final class KToolTip extends ColorToolTip
{
- private static final Log LOG = LogFactory.getLog(KToolTip.class);
+ private static final Logger LOG = LogManager.getLogger(KToolTip.class);
/**
* Constructor.
Modified:
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/tooltip/SCNToolTip.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/tooltip/SCNToolTip.java?rev=1913378&r1=1913377&r2=1913378&view=diff
==============================================================================
---
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/tooltip/SCNToolTip.java
(original)
+++
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/tooltip/SCNToolTip.java
Fri Oct 27 06:09:01 2023
@@ -19,8 +19,8 @@ package org.apache.pdfbox.debugger.strea
import java.awt.Color;
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.PDResources;
import org.apache.pdfbox.pdmodel.graphics.color.PDColorSpace;
@@ -32,7 +32,7 @@ import org.apache.pdfbox.pdmodel.graphic
*/
final class SCNToolTip extends ColorToolTip
{
- private static final Log LOG = LogFactory.getLog(SCNToolTip.class);
+ private static final Logger LOG = LogManager.getLogger(SCNToolTip.class);
/**
* Constructor.
Modified:
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/tooltip/ToolTipController.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/tooltip/ToolTipController.java?rev=1913378&r1=1913377&r2=1913378&view=diff
==============================================================================
---
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/tooltip/ToolTipController.java
(original)
+++
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/streampane/tooltip/ToolTipController.java
Fri Oct 27 06:09:01 2023
@@ -22,8 +22,8 @@ import java.util.List;
import javax.swing.text.BadLocationException;
import javax.swing.text.JTextComponent;
import javax.swing.text.Utilities;
-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.OperatorName;
import org.apache.pdfbox.pdmodel.PDResources;
@@ -38,7 +38,7 @@ interface ToolTip
*/
public class ToolTipController
{
- private static final Log LOG = LogFactory.getLog(ToolTipController.class);
+ private static final Logger LOG =
LogManager.getLogger(ToolTipController.class);
private final PDResources resources;
private JTextComponent textComponent;
Added:
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/DebugLogAppender.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/DebugLogAppender.java?rev=1913378&view=auto
==============================================================================
---
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/DebugLogAppender.java
(added)
+++
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/DebugLogAppender.java
Fri Oct 27 06:09:01 2023
@@ -0,0 +1,42 @@
+package org.apache.pdfbox.debugger.ui;
+
+import org.apache.logging.log4j.*;
+import org.apache.logging.log4j.core.*;
+import org.apache.logging.log4j.core.appender.AbstractAppender;
+import org.apache.logging.log4j.core.appender.ConsoleAppender;
+import org.apache.logging.log4j.core.config.Configurator;
+import org.apache.logging.log4j.core.config.builder.api.*;
+import org.apache.logging.log4j.core.config.builder.impl.BuiltConfiguration;
+
+import java.io.Serializable;
+
+public class DebugLogAppender extends AbstractAppender
+{
+ protected DebugLogAppender(String name, Filter filter, Layout<? extends
Serializable> layout, final boolean ignoreExceptions) {
+ super(name, filter, layout, ignoreExceptions);
+ }
+
+ @Override
+ public void append(LogEvent event) {
+ // forward to your logging dialog box here.
+ LogDialog.instance().log(event.getLoggerName(),
event.getLevel().name(), event.getMessage().getFormattedMessage(),
event.getThrown());
+ }
+
+ public static void setupCustomLogger() {
+ ConfigurationBuilder<BuiltConfiguration> builder =
ConfigurationBuilderFactory.newConfigurationBuilder();
+
+ AppenderComponentBuilder appenderBuilder =
builder.newAppender("Stdout", "CONSOLE")
+ .addAttribute("target", ConsoleAppender.Target.SYSTEM_OUT);
+ appenderBuilder.add(builder.newLayout("PatternLayout")
+ .addAttribute("pattern", "%d [%t] %-5level:
%msg%n%throwable"));
+ builder.add(appenderBuilder);
+
+ appenderBuilder = builder.newAppender("Custom",
"org.package.CustomAppender");
+ appenderBuilder.add(builder.newLayout("PatternLayout")
+ .addAttribute("pattern", "%d [%t] %-5level:
%msg%n%throwable"));
+ builder.add(appenderBuilder);
+
+
builder.add(builder.newRootLogger(Level.ERROR).add(builder.newAppenderRef("Stdout")).add(builder.newAppenderRef("Custom")));
+ Configurator.initialize(builder.build());
+ }
+}
\ No newline at end of file
Propchange:
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/DebugLogAppender.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified:
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/textsearcher/SearchEngine.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/textsearcher/SearchEngine.java?rev=1913378&r1=1913377&r2=1913378&view=diff
==============================================================================
---
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/textsearcher/SearchEngine.java
(original)
+++
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/textsearcher/SearchEngine.java
Fri Oct 27 06:09:01 2023
@@ -23,8 +23,8 @@ import javax.swing.text.BadLocationExcep
import javax.swing.text.Document;
import javax.swing.text.Highlighter;
import javax.swing.text.JTextComponent;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
/**
* @author Khyrul Bashar
@@ -32,7 +32,7 @@ import org.apache.commons.logging.LogFac
*/
class SearchEngine
{
- private static final Log LOG = LogFactory.getLog(SearchEngine.class);
+ private static final Logger LOG = LogManager.getLogger(SearchEngine.class);
private final Document document;
private final Highlighter highlighter;
Modified:
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/textsearcher/Searcher.java
URL:
http://svn.apache.org/viewvc/pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/textsearcher/Searcher.java?rev=1913378&r1=1913377&r2=1913378&view=diff
==============================================================================
---
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/textsearcher/Searcher.java
(original)
+++
pdfbox/trunk/debugger/src/main/java/org/apache/pdfbox/debugger/ui/textsearcher/Searcher.java
Fri Oct 27 06:09:01 2023
@@ -35,8 +35,8 @@ import javax.swing.text.BadLocationExcep
import javax.swing.text.DefaultHighlighter;
import javax.swing.text.Highlighter;
import javax.swing.text.JTextComponent;
-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.debugger.PDFDebugger;
@@ -45,7 +45,7 @@ import org.apache.pdfbox.debugger.PDFDeb
*/
public class Searcher implements DocumentListener, ChangeListener,
ComponentListener
{
- private static final Log LOG = LogFactory.getLog(Searcher.class);
+ private static final Logger LOG = LogManager.getLogger(Searcher.class);
private static final Highlighter.HighlightPainter PAINTER =
new DefaultHighlighter.DefaultHighlightPainter(Color.yellow);
