modules/javafx.web/src/main/java/javafx/scene/web/WebEngine.java

*** 23,32 ****
--- 23,33 ----
   * questions.
   */
  
  package javafx.scene.web;
  
+ import com.sun.javafx.logging.PlatformLogger;
  import com.sun.javafx.scene.web.Debugger;
  import com.sun.javafx.scene.web.Printable;
  import com.sun.javafx.tk.TKPulseListener;
  import com.sun.javafx.tk.Toolkit;
  import com.sun.javafx.webkit.*;
*** 67,78 ****
  import java.security.PrivilegedAction;
  import java.util.ArrayList;
  import java.util.Base64;
  import java.util.List;
  import java.util.Objects;
- import java.util.logging.Level;
- import java.util.logging.Logger;
  
  import static com.sun.webkit.LoadListenerClient.*;
  
  /**
   * {@code WebEngine} is a non-visual object capable of managing one Web page
--- 68,77 ----
*** 344,355 ****
          com.sun.webkit.EventLoop.setEventLoop(new EventLoopImpl());
          ThemeClient.setDefaultRenderTheme(new RenderThemeImpl());
          Utilities.setUtilities(new UtilitiesImpl());
      }
  
!     private static final Logger logger =
!             Logger.getLogger(WebEngine.class.getName());
  
      /**
       * The number of instances of this class.
       * Used to start and stop the pulse timer.
       */
--- 343,354 ----
          com.sun.webkit.EventLoop.setEventLoop(new EventLoopImpl());
          ThemeClient.setDefaultRenderTheme(new RenderThemeImpl());
          Utilities.setUtilities(new UtilitiesImpl());
      }
  
!     private static final PlatformLogger logger =
!             PlatformLogger.getLogger(WebEngine.class.getName());
  
      /**
       * The number of instances of this class.
       * Used to start and stop the pulse timer.
       */
*** 1004,1015 ****
                  displayString = format("null (%s)", userDataDir);
              } else {
                  userDataDir = nominalUserDataDir;
                  displayString = userDataDir.toString();
              }
!             logger.log(Level.FINE, "Trying to apply user data "
!                     + "directory [{0}]", displayString);
              String errorMessage;
              EventType<WebErrorEvent> errorType;
              Throwable error;
              try {
                  userDataDir = DirectoryLock.canonicalize(userDataDir);
--- 1003,1013 ----
                  displayString = format("null (%s)", userDataDir);
              } else {
                  userDataDir = nominalUserDataDir;
                  displayString = userDataDir.toString();
              }
!             logger.fine("Trying to apply user data directory [{0}]", displayString);
              String errorMessage;
              EventType<WebErrorEvent> errorType;
              Throwable error;
              try {
                  userDataDir = DirectoryLock.canonicalize(userDataDir);
*** 1030,1040 ****
                  disposer.userDataDirectoryLock = new DirectoryLock(userDataDir);
  
                  page.setLocalStorageDatabasePath(localStorageDir.getPath());
                  page.setLocalStorageEnabled(true);
  
!                 logger.log(Level.FINE, "User data directory [{0}] has "
                          + "been applied successfully", displayString);
                  return;
  
              } catch (DirectoryLock.DirectoryAlreadyInUseException ex) {
                  errorMessage = "User data directory [%s] is already in use";
--- 1028,1038 ----
                  disposer.userDataDirectoryLock = new DirectoryLock(userDataDir);
  
                  page.setLocalStorageDatabasePath(localStorageDir.getPath());
                  page.setLocalStorageEnabled(true);
  
!                 logger.fine("User data directory [{0}] has "
                          + "been applied successfully", displayString);
                  return;
  
              } catch (DirectoryLock.DirectoryAlreadyInUseException ex) {
                  errorMessage = "User data directory [%s] is already in use";
*** 1051,1072 ****
                  errorType = WebErrorEvent.USER_DATA_DIRECTORY_SECURITY_ERROR;
                  error = ex;
              }
  
              errorMessage = format(errorMessage, displayString);
!             logger.log(Level.FINE, "{0}, calling error handler", errorMessage);
              File oldNominalUserDataDir = nominalUserDataDir;
              fireError(errorType, errorMessage, error);
              nominalUserDataDir = getUserDataDirectory();
              if (Objects.equals(nominalUserDataDir, oldNominalUserDataDir)) {
!                 logger.log(Level.FINE, "Error handler did not "
!                         + "modify user data directory, continuing "
!                         + "without user data directory");
                  return;
              } else {
!                 logger.log(Level.FINE, "Error handler has set "
!                         + "user data directory to [{0}], "
                          + "retrying", nominalUserDataDir);
                  continue;
              }
          }
      }
--- 1049,1068 ----
                  errorType = WebErrorEvent.USER_DATA_DIRECTORY_SECURITY_ERROR;
                  error = ex;
              }
  
              errorMessage = format(errorMessage, displayString);
!             logger.fine("{0}, calling error handler", errorMessage);
              File oldNominalUserDataDir = nominalUserDataDir;
              fireError(errorType, errorMessage, error);
              nominalUserDataDir = getUserDataDirectory();
              if (Objects.equals(nominalUserDataDir, oldNominalUserDataDir)) {
!                 logger.fine("Error handler did not modify user data directory, "
!                         + "continuing without user data directory");
                  return;
              } else {
!                 logger.fine("Error handler has set user data directory to [{0}], "
                          + "retrying", nominalUserDataDir);
                  continue;
              }
          }
      }