modules/javafx.web/src/main/java/com/sun/webkit/network/CookieStore.java

@@ -23,30 +23,31 @@
  * questions.
  */
 
 package com.sun.webkit.network;
 
+import com.sun.javafx.logging.PlatformLogger;
+import com.sun.javafx.logging.PlatformLogger.Level;
+
 import java.util.LinkedHashMap;
 import java.util.Comparator;
 import java.util.Collections;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.PriorityQueue;
 import java.util.Queue;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 /**
  * A cookie store.
  */
 final class CookieStore {
 
-    private static final Logger logger =
-        Logger.getLogger(CookieStore.class.getName());
+    private static final PlatformLogger logger =
+            PlatformLogger.getLogger(CookieStore.class.getName());
 
     private static final int MAX_BUCKET_SIZE = 50;
     private static final int TOTAL_COUNT_LOWER_THRESHOLD = 3000;
     private static final int TOTAL_COUNT_UPPER_THRESHOLD = 4000;
 

@@ -102,11 +103,11 @@
      */
     List<Cookie> get(String hostname, String path, boolean secureProtocol,
             boolean httpApi)
     {
         if (logger.isLoggable(Level.FINEST)) {
-            logger.log(Level.FINEST, "hostname: [{0}], path: [{1}], "
+            logger.finest("hostname: [{0}], path: [{1}], "
                     + "secureProtocol: [{2}], httpApi: [{3}]", new Object[] {
                     hostname, path, secureProtocol, httpApi});
         }
 
         ArrayList<Cookie> result = new ArrayList<Cookie>();

@@ -130,11 +131,11 @@
         long currentTime = System.currentTimeMillis();
         for (Cookie cookie : result) {
             cookie.setLastAccessTime(currentTime);
         }
 
-        logger.log(Level.FINEST, "result: {0}", result);
+        logger.finest("result: {0}", result);
         return result;
     }
 
     /**
      * Finds all the cookies that are stored in the given bucket and

@@ -224,11 +225,11 @@
 
     /**
      * Removes excess cookies from a given bucket.
      */
     private void purge(Map<Cookie,Cookie> bucket) {
-        logger.log(Level.FINEST, "Purging bucket: {0}", bucket.values());
+        logger.finest("Purging bucket: {0}", bucket.values());
 
         Cookie earliestCookie = null;
         Iterator<Cookie> it = bucket.values().iterator();
         while (it.hasNext()) {
             Cookie cookie = it.next();

@@ -253,11 +254,11 @@
 
     /**
      * Removes excess cookies globally.
      */
     private void purge() {
-        logger.log(Level.FINEST, "Purging store");
+        logger.finest("Purging store");
 
         Queue<Cookie> removalQueue = new PriorityQueue<Cookie>(totalCount / 2,
                 new RemovalComparator());
 
         for (Map.Entry<String,Map<Cookie,Cookie>> entry : buckets.entrySet()) {

@@ -298,11 +299,10 @@
      */
     private void log(String message, Cookie cookie,
             Map<Cookie,Cookie> bucket)
     {
         if (logger.isLoggable(Level.FINEST)) {
-            logger.log(Level.FINEST, "{0}: {1}, bucket size: {2}, "
-                    + "total count: {3}",
+            logger.finest("{0}: {1}, bucket size: {2}, total count: {3}",
                     new Object[] {message, cookie, bucket.size(), totalCount});
         }
     }
 }