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

@@ -23,28 +23,29 @@
  * questions.
  */
 
 package com.sun.webkit.network;
 
+import com.sun.javafx.logging.PlatformLogger;
+import com.sun.javafx.logging.PlatformLogger.Level;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.net.IDN;
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
 
 /**
  * A collection of static utility methods dealing with "public suffixes".
  */
 final class PublicSuffixes {
 
-    private static final Logger logger =
-            Logger.getLogger(PublicSuffixes.class.getName());
+    private static final PlatformLogger logger =
+            PlatformLogger.getLogger(PublicSuffixes.class.getName());
 
 
     /**
      * Public suffix list rule types.
      */

@@ -94,40 +95,40 @@
 
     /**
      * Loads the public suffix list from a given resource.
      */
     private static Map<String,Rule> loadRules(String resourceName) {
-        logger.log(Level.FINEST, "resourceName: [{0}]", resourceName);
+        logger.finest("resourceName: [{0}]", resourceName);
         Map<String,Rule> result = null;
 
         InputStream is = PublicSuffixes.class.getResourceAsStream(resourceName);
         if (is != null) {
             BufferedReader reader = null;
             try {
                 reader = new BufferedReader(new InputStreamReader(is, "UTF-8"));
                 result = loadRules(reader);
             } catch (IOException ex) {
-                logger.log(Level.WARNING, "Unexpected error", ex);
+                logger.warning("Unexpected error", ex);
             } finally {
                 try {
                     if (reader != null) {
                         reader.close();
                     }
                 } catch (IOException ex) {
-                    logger.log(Level.WARNING, "Unexpected error", ex);
+                    logger.warning("Unexpected error", ex);
                 }
             }
         } else {
-            logger.log(Level.WARNING, "Resource not found: [{0}]",
+            logger.warning("Resource not found: [{0}]",
                     resourceName);
         }
 
         result = result != null
                 ? Collections.unmodifiableMap(result)
                 : Collections.<String,Rule>emptyMap();
         if (logger.isLoggable(Level.FINEST)) {
-            logger.log(Level.FINEST, "result: {0}", toLogString(result));
+            logger.finest("result: {0}", toLogString(result));
         }
         return result;
     }
 
     /**

@@ -157,12 +158,11 @@
                 rule = Rule.SIMPLE_RULE;
             }
             try {
                 line = IDN.toASCII(line, IDN.ALLOW_UNASSIGNED);
             } catch (Exception ex) {
-                logger.log(Level.WARNING, String.format(
-                        "Error parsing rule: [%s]", line), ex);
+                logger.warning(String.format("Error parsing rule: [%s]", line), ex);
                 continue;
             }
             result.put(line, rule);
         }
         return result;