From 2e96ddb75c5501d2a52b81e8a9a73ca4538eb57c Mon Sep 17 00:00:00 2001 From: Helin Shiah Date: Wed, 23 Jul 2025 14:57:05 -0700 Subject: [PATCH] Use plugin logger for embedded browser --- src/io/flutter/jxbrowser/EmbeddedJxBrowser.java | 5 +++-- src/io/flutter/view/EmbeddedBrowser.java | 2 +- src/io/flutter/view/EmbeddedJcefBrowser.java | 5 +++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/io/flutter/jxbrowser/EmbeddedJxBrowser.java b/src/io/flutter/jxbrowser/EmbeddedJxBrowser.java index 77fc6e628..1470ef74f 100644 --- a/src/io/flutter/jxbrowser/EmbeddedJxBrowser.java +++ b/src/io/flutter/jxbrowser/EmbeddedJxBrowser.java @@ -22,6 +22,7 @@ import com.teamdev.jxbrowser.view.swing.BrowserView; import com.teamdev.jxbrowser.view.swing.callback.DefaultAlertCallback; import com.teamdev.jxbrowser.view.swing.callback.DefaultConfirmCallback; +import io.flutter.logging.PluginLogger; import io.flutter.settings.FlutterSettings; import io.flutter.utils.AsyncUtils; import io.flutter.utils.JxBrowserUtils; @@ -122,7 +123,7 @@ public JComponent getTabComponent(ContentManager contentManager) { } public class EmbeddedJxBrowser extends EmbeddedBrowser { - private static final @NotNull Logger LOG = Logger.getInstance(JxBrowserManager.class); + private static final @NotNull Logger LOG = PluginLogger.createLogger(JxBrowserManager.class); private static final String INSTALLATION_IN_PROGRESS_LABEL = "Installing JxBrowser..."; private static final String INSTALLATION_TIMED_OUT_LABEL = "Waiting for JxBrowser installation timed out. Restart your IDE to try again."; @@ -167,7 +168,7 @@ private EmbeddedJxBrowser(@NotNull Project project) { } @Override - public Logger logger() { + public @NotNull Logger logger() { return LOG; } diff --git a/src/io/flutter/view/EmbeddedBrowser.java b/src/io/flutter/view/EmbeddedBrowser.java index 71c1fe67b..b7dbf7832 100644 --- a/src/io/flutter/view/EmbeddedBrowser.java +++ b/src/io/flutter/view/EmbeddedBrowser.java @@ -50,7 +50,7 @@ static public class BrowserTab { protected final Map<@NotNull String, Map<@NotNull String, @NotNull BrowserTab>> windows = new HashMap<>(); - public abstract Logger logger(); + public abstract @NotNull Logger logger(); private DevToolsUrl url; diff --git a/src/io/flutter/view/EmbeddedJcefBrowser.java b/src/io/flutter/view/EmbeddedJcefBrowser.java index 479674267..9f66acce1 100644 --- a/src/io/flutter/view/EmbeddedJcefBrowser.java +++ b/src/io/flutter/view/EmbeddedJcefBrowser.java @@ -10,6 +10,7 @@ import com.intellij.ui.content.ContentManager; import com.intellij.ui.jcef.JBCefBrowser; import io.flutter.jxbrowser.JxBrowserManager; +import io.flutter.logging.PluginLogger; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -47,7 +48,7 @@ public JComponent getTabComponent(ContentManager contentManager) { } public class EmbeddedJcefBrowser extends EmbeddedBrowser { - private static final @NotNull Logger LOG = Logger.getInstance(JxBrowserManager.class); + private static final @NotNull Logger LOG = PluginLogger.createLogger(JxBrowserManager.class); public EmbeddedJcefBrowser(Project project) { super(project); @@ -58,7 +59,7 @@ public static EmbeddedJcefBrowser getInstance(@NotNull Project project) { return Objects.requireNonNull(project.getService(EmbeddedJcefBrowser.class)); } - public Logger logger() { + public @NotNull Logger logger() { return LOG; }