Remove global instances

Author: lepsch

src/main/java/com/duckly/jbcef/JBCefApp.java

@@ -80,7 +80,7 @@ public void dispose() {
  //fixme use addCefCustomSchemeHandlerFactory method if possible
  private static final JBCefSourceSchemeHandlerFactory ourSourceSchemeHandlerFactory = new JBCefSourceSchemeHandlerFactory();
 
- JBCefApp(@NotNull JCefAppConfig config) throws IllegalStateException {
+ public JBCefApp(@NotNull JCefAppConfig config) throws IllegalStateException {
  boolean started = false;
  try {
  started = CefApp.startup(ArrayUtil.EMPTY_STRING_ARRAY);
@@ -187,44 +187,44 @@ Disposable getDisposable() {
  return myDisposable;
  }
 
- /**
- * Returns {@code JBCefApp} instance. If the app has not yet been initialized
- * then starts up CEF and initializes the app.
- *
- * @throws IllegalStateException when JCEF initialization is not possible in current env
- */
- @NotNull
- public static JBCefApp getInstance() {
- if (Holder.INSTANCE == null) {
- throw new IllegalStateException("JCEF is not supported in this env or failed to initialize");
- }
- return Holder.INSTANCE;
- }
-
- private static final class Holder {
- @Nullable static final JBCefApp INSTANCE;
-
- static {
- ourInitialized.set(true);
- JCefAppConfig config = null;
- if (isSupported(true)) {
- try {
- config = JCefAppConfig.getInstance();
- }
- catch (Exception e) {
- LOG.error(e);
- }
- }
- JBCefApp app = null;
- if (config != null) {
- try {
- app = new JBCefApp(config);
- } catch (IllegalStateException ignore) {
- }
- }
- INSTANCE = app;
- }
- }
+// /**
+// * Returns {@code JBCefApp} instance. If the app has not yet been initialized
+// * then starts up CEF and initializes the app.
+// *
+// * @throws IllegalStateException when JCEF initialization is not possible in current env
+// */
+// @NotNull
+// public static JBCefApp getInstance() {
+// if (Holder.INSTANCE == null) {
+// throw new IllegalStateException("JCEF is not supported in this env or failed to initialize");
+// }
+// return Holder.INSTANCE;
+// }
+//
+// private static final class Holder {
+// @Nullable static final JBCefApp INSTANCE;
+//
+// static {
+// ourInitialized.set(true);
+// JCefAppConfig config = null;
+// if (isSupported(true)) {
+// try {
+// config = JCefAppConfig.getInstance();
+// }
+// catch (Exception e) {
+// LOG.error(e);
+// }
+// }
+// JBCefApp app = null;
+// if (config != null) {
+// try {
+// app = new JBCefApp(config);
+// } catch (IllegalStateException ignore) {
+// }
+// }
+// INSTANCE = app;
+// }
+// }
 
  /**
  * Returns whether JCEF is supported. For that:
@@ -305,7 +305,7 @@ private static boolean isSupported(boolean logging) {
 
  @NotNull
  public JBCefClient createClient() {
- return new JBCefClient(myCefApp.createClient());
+ return new JBCefClient(myCefApp.createClient(), myDisposable);
  }
 
  /**

src/main/java/com/duckly/jbcef/JBCefBrowser.java

@@ -186,7 +186,7 @@ public JBCefBrowser(@NotNull CefBrowser cefBrowser, @NotNull JBCefClient client)
  this(cefBrowser, client, false, null);
  }
 
- private JBCefBrowser(@NotNull JBCefClient client, boolean isDefaultClient, @Nullable String url) {
+ public JBCefBrowser(@NotNull JBCefClient client, boolean isDefaultClient, @Nullable String url) {
  this(null, client, isDefaultClient, url);
  }
 
@@ -375,22 +375,22 @@ private static void loadString(CefBrowser cefBrowser, String html, String url) {
  cefBrowser.loadURL(url);
  }
 
- /**
- * Creates a browser with default {@link JBCefClient}. The default client is disposed with this browser and may not be used with other browsers.
- */
- @SuppressWarnings("unused")
- public JBCefBrowser() {
- this(JBCefApp.getInstance().createClient(), true, null);
- }
-
- /**
- * @see #JBCefBrowser()
- * @param url initial url
- */
- @SuppressWarnings("unused")
- public JBCefBrowser(@NotNull String url) {
- this(JBCefApp.getInstance().createClient(), true, url);
- }
+// /**
+// * Creates a browser with default {@link JBCefClient}. The default client is disposed with this browser and may not be used with other browsers.
+// */
+// @SuppressWarnings("unused")
+// public JBCefBrowser() {
+// this(JBCefApp.getInstance().createClient(), true, null);
+// }
+//
+// /**
+// * @see #JBCefBrowser()
+// * @param url initial url
+// */
+// @SuppressWarnings("unused")
+// public JBCefBrowser(@NotNull String url) {
+// this(JBCefApp.getInstance().createClient(), true, url);
+// }
 
  @NotNull
  public JComponent getComponent() {

src/main/java/com/duckly/jbcef/JBCefClient.java

@@ -2,6 +2,7 @@
 package com.duckly.jbcef;
 
 //import com.intellij.application.options.RegistryManager;
+import com.intellij.openapi.Disposable;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.Disposer;
 import com.intellij.openapi.util.Ref;
@@ -77,9 +78,9 @@ public class JBCefClient implements JBCefDisposable {
  private final HandlerSupport<CefLoadHandler> myLoadHandler = new HandlerSupport<>();
  private final HandlerSupport<CefRequestHandler> myRequestHandler = new HandlerSupport<>();
 
- JBCefClient(@NotNull CefClient client) {
+ JBCefClient(@NotNull CefClient client, @NotNull Disposable parentDisposable) {
  myCefClient = client;
- Disposer.register(JBCefApp.getInstance().getDisposable(), this);
+ Disposer.register(parentDisposable, this);
 
  Runnable createPool = () -> {
  if (myJSQueryPool != null) {

src/main/java/com/duckly/jbcef/JCefAppConfig.java

@@ -16,38 +16,31 @@
  * @author Anton Tarasov
  */
 public abstract class JCefAppConfig {
- protected final CefSettings cefSettings;
+ protected final CefSettings cefSettings = new CefSettings();
  protected final List<String> appArgs = new ArrayList<>();
 
  private static final AtomicReference<Double> forceDeviceScaleFactor = new AtomicReference<>(Double.valueOf(0));
 
- JCefAppConfig() {
- this.cefSettings = new CefSettings();
- }
-
- JCefAppConfig(JCefAppConfig config) {
- this.cefSettings = config.cefSettings.clone();
- this.appArgs.addAll(config.appArgs);
- }
-
- private static class Holder {
- static JCefAppConfig INSTANCE;
-
- static {
- if (OS.isMacintosh()) {
- INSTANCE = new JCefAppConfigMac();
- }
- else if (OS.isLinux()) {
- INSTANCE = new JCefAppConfigLinux();
- }
- else if (OS.isWindows()) {
- INSTANCE = new JCefAppConfigWindows();
- }
- else {
- INSTANCE = null;
- assert false : "JCEF: unknown platform";
- }
+// private static class Holder {
+// static JCefAppConfig INSTANCE;
+//
+// static {
+// INSTANCE = newInstance();
+// assert INSTANCE != null : "JCEF: unknown platform";
+// }
+// }
+
+ public static JCefAppConfig newInstance() {
+ if (OS.isMacintosh()) {
+ return new JCefAppConfigMac();
+ }
+ if (OS.isLinux()) {
+ return new JCefAppConfigLinux();
  }
+ if (OS.isWindows()) {
+ return new JCefAppConfigWindows();
+ }
+ return null;
  }
 
  public String[] getAppArgs() {
@@ -62,17 +55,17 @@ public CefSettings getCefSettings() {
  return cefSettings;
  }
 
- /**
- * @throws IllegalStateException in case of unsupported platform
- */
- public static JCefAppConfig getInstance() {
- if (Holder.INSTANCE != null) {
- Holder.INSTANCE.init();
- } else {
- throw new IllegalStateException("JCEF is not supported on this platform");
- }
- return Holder.INSTANCE;
- }
+// /**
+// * @throws IllegalStateException in case of unsupported platform
+// */
+// public static JCefAppConfig getInstance() {
+// if (Holder.INSTANCE != null) {
+// Holder.INSTANCE.init();
+// } else {
+// throw new IllegalStateException("JCEF is not supported on this platform");
+// }
+// return Holder.INSTANCE;
+// }
 
  /**
  * Tries to load full JCEF version string from version.info file