remove dependency on log4j in JavaFX debugger

vsch · Dec 18, 2019 · 2aa52c8 · 2aa52c8
1 parent ff8d678
commit 2aa52c8
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 2 deletions.
diff --git a/VERSION.md b/VERSION.md
@@ -3,6 +3,7 @@
 [TOC levels=3,6]: # "Version History"
 
 ### Version History
+- [0.8](#08)
 - [0.7.8](#078)
 - [0.7.6](#076)
 - [0.7.4](#074)
@@ -18,6 +19,10 @@
 - [0.5.6](#056)
 
 
+### 0.8
+
+* Update to 0.8 JavaFx-WebView-Debugger
+
 ### 0.7.8
 
 * Update to 0.7.8 JavaFx-WebView-Debugger

diff --git a/pom.xml b/pom.xml
@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.vladsch.javafx-webview-debugger</groupId>
     <artifactId>webview-debug-sample</artifactId>
-    <version>0.7.8</version>
+    <version>0.8.0</version>
     <name>WebViewDebugSample</name>
     <description>
         Sample Application with full function debugging implementation for JavaFX WebView using Chrome Dev Tools via web-socket server
@@ -14,7 +14,13 @@
         <dependency>
             <groupId>com.vladsch.javafx-webview-debugger</groupId>
             <artifactId>javafx-webview-debugger</artifactId>
-            <version>0.7.8</version>
+            <version>0.8.0</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/log4j/log4j -->
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+            <version>1.2.17</version>
         </dependency>
     </dependencies>
 

diff --git a/src/main/java/com/vladsch/javafx/webview/debugger/WebViewDebugSample.java b/src/main/java/com/vladsch/javafx/webview/debugger/WebViewDebugSample.java
@@ -6,6 +6,7 @@
 import javafx.scene.Scene;
 import javafx.scene.paint.Color;
 import javafx.stage.Stage;
+import org.apache.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.*;
@@ -82,10 +83,65 @@ public void init() throws Exception {
         }
     }
 
+    static final Logger LOG = Logger.getLogger("com.vladsch.javafx.webview.debugger");
+
     public static void main(String[] args) {
         //Platform.setImplicitExit(false);
         File publicDir = new File("public");
 
+        LogHandler.LOG_HANDLER = new LogHandler() {
+            @Override
+            public void trace(@NotNull String message) { LOG.trace(message); }
+
+            @Override
+            public void trace(@NotNull String message, @NotNull Throwable t) { LOG.trace(message, t); }
+
+            @Override
+            public void trace(@NotNull Throwable t) { LOG.trace(t); }
+
+            @Override
+            public boolean isTraceEnabled() {return LOG.isTraceEnabled(); }
+
+            @Override
+            public void debug(@NotNull String message) { LOG.debug(message); }
+
+            @Override
+            public void debug(@NotNull String message, @NotNull Throwable t) { LOG.debug(message, t); }
+
+            @Override
+            public void debug(@NotNull Throwable t) { LOG.debug(t); }
+
+            @Override
+            public void error(@NotNull String message) { LOG.error(message); }
+
+            @Override
+            public void error(@NotNull String message, @NotNull Throwable t) { LOG.error(message, t); }
+
+            @Override
+            public void error(@NotNull Throwable t) { LOG.error(t); }
+
+            @Override
+            public void info(@NotNull String message) { LOG.info(message); }
+
+            @Override
+            public void info(@NotNull String message, @NotNull Throwable t) { LOG.info(message, t); }
+
+            @Override
+            public void info(@NotNull Throwable t) { LOG.info(t); }
+
+            @Override
+            public boolean isDebugEnabled() {return LOG.isDebugEnabled(); }
+
+            @Override
+            public void warn(@NotNull String message) { LOG.warn(message); }
+
+            @Override
+            public void warn(@NotNull String message, @NotNull Throwable t) { LOG.warn(message, t); }
+
+            @Override
+            public void warn(@NotNull Throwable t) { LOG.warn(t); }
+        };
+
         if (!publicDir.exists()) {
             publicDir.mkdir();
         }