Skip to content

Commit c0e8b82

Browse files
authored
Convert JX Browser files to use Flutter log file (flutter#8523)
Part of flutter#8369
1 parent c32860a commit c0e8b82

File tree

2 files changed

+20
-6
lines changed

2 files changed

+20
-6
lines changed

src/io/flutter/jxbrowser/EmbeddedBrowserEngine.java

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
import com.teamdev.jxbrowser.engine.Engine;
1313
import com.teamdev.jxbrowser.engine.EngineOptions;
1414
import com.teamdev.jxbrowser.engine.PasswordStore;
15+
import io.flutter.logging.PluginLogger;
16+
import io.flutter.settings.FlutterSettings;
1517
import org.jetbrains.annotations.NotNull;
1618

1719
import java.io.File;
@@ -21,7 +23,7 @@
2123
import static com.teamdev.jxbrowser.engine.RenderingMode.OFF_SCREEN;
2224

2325
public class EmbeddedBrowserEngine {
24-
private static final @NotNull Logger LOG = Logger.getInstance(EmbeddedBrowserEngine.class);
26+
private static final @NotNull Logger LOG = PluginLogger.createLogger(EmbeddedBrowserEngine.class);
2527
private final Engine engine;
2628

2729
public static EmbeddedBrowserEngine getInstance() {
@@ -30,7 +32,7 @@ public static EmbeddedBrowserEngine getInstance() {
3032

3133
public EmbeddedBrowserEngine() {
3234
final String dataPath = JxBrowserManager.DOWNLOAD_PATH + File.separatorChar + "user-data";
33-
LOG.info("JxBrowser user data path: " + dataPath);
35+
if (FlutterSettings.getInstance().isFilePathLoggingEnabled()) LOG.info("JxBrowser user data path: " + dataPath);
3436

3537
final EngineOptions.Builder optionsBuilder =
3638
EngineOptions.newBuilder(SystemInfo.isMac ? HARDWARE_ACCELERATED : OFF_SCREEN)
@@ -50,7 +52,11 @@ public EmbeddedBrowserEngine() {
5052
}
5153
catch (Exception ex) {
5254
temp = null;
53-
LOG.info(ex);
55+
if (FlutterSettings.getInstance().isFilePathLoggingEnabled()) {
56+
LOG.info(ex);
57+
} else {
58+
LOG.info("Exception when creating a new instance of JX Browser engine: " + ex.getMessage());
59+
}
5460
}
5561
engine = temp;
5662

@@ -63,7 +69,11 @@ public boolean canExitApplication() {
6369
}
6470
}
6571
catch (Exception ex) {
66-
LOG.info(ex);
72+
if (FlutterSettings.getInstance().isFilePathLoggingEnabled()) {
73+
LOG.info(ex);
74+
} else {
75+
LOG.info("Exception when closing JX Browser engine: " + ex.getMessage());
76+
}
6777
}
6878
return true;
6979
}

src/io/flutter/jxbrowser/EmbeddedJxBrowser.java

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class EmbeddedJxBrowserTab implements EmbeddedTab {
5050
private Browser browser;
5151
private Zoom zoom;
5252
private final ZoomLevelSelector zoomSelector = new ZoomLevelSelector();
53-
private static final @NotNull Logger LOG = Logger.getInstance(EmbeddedJxBrowserTab.class);
53+
private static final @NotNull Logger LOG = PluginLogger.createLogger(EmbeddedJxBrowserTab.class);
5454

5555
public EmbeddedJxBrowserTab(Engine engine) {
5656
this.engine = engine;
@@ -68,7 +68,11 @@ public EmbeddedJxBrowserTab(Engine engine) {
6868
// Skip using a transparent background if an exception is thrown.
6969
}
7070
catch (Exception | Error ex) {
71-
LOG.info(ex);
71+
if (FlutterSettings.getInstance().isFilePathLoggingEnabled()) {
72+
LOG.info(ex);
73+
} else {
74+
LOG.info("Exception when creating a new browser instance: " + ex.getMessage());
75+
}
7276
}
7377
}
7478

0 commit comments

Comments
 (0)