From 1d5d1a6a4a0a58d6bb4803527dacb6641c027816 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Tue, 28 Jan 2014 13:34:12 +0000
Subject: [PATCH] Checkpoint commit for OPENDJ-1288 :    Migrate I18n and logging support to i18n framework and SLF4J

---
 opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LocalOrRemotePanel.java |   41 ++++++++++++++++++++---------------------
 1 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LocalOrRemotePanel.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LocalOrRemotePanel.java
index 2acf548..e07cf5f 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LocalOrRemotePanel.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ui/LocalOrRemotePanel.java
@@ -41,8 +41,9 @@
 import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
 
 import javax.naming.NamingEnumeration;
 import javax.naming.NamingException;
@@ -68,7 +69,6 @@
 import org.opends.guitools.controlpanel.task.OnlineUpdateException;
 import org.opends.guitools.controlpanel.util.BackgroundTask;
 import org.opends.guitools.controlpanel.util.Utilities;
-import org.forgerock.i18n.LocalizableMessage;
 import org.opends.quicksetup.Installation;
 import org.opends.quicksetup.UserData;
 import org.opends.quicksetup.UserDataCertificateException;
@@ -107,8 +107,7 @@
 
   private boolean callOKWhenVisible;
 
-  private static final Logger LOG =
-    Logger.getLogger(LocalOrRemotePanel.class.getName());
+  private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
 
   /**
    * Default constructor.
@@ -657,7 +656,7 @@
 
           if (throwable != null)
           {
-            LOG.log(Level.INFO, "Error connecting: " + throwable, throwable);
+            logger.debug(LocalizableMessage.raw("Error connecting: " + throwable, throwable));
 
             if (isVersionException(throwable))
             {
@@ -668,7 +667,7 @@
               ApplicationTrustManager.Cause cause =
                 getInfo().getTrustManager().getLastRefusedCause();
 
-              LOG.log(Level.INFO, "Certificate exception cause: "+cause);
+              logger.debug(LocalizableMessage.raw("Certificate exception cause: "+cause));
               UserDataCertificateException.Type excType = null;
               if (cause == ApplicationTrustManager.Cause.NOT_TRUSTED)
               {
@@ -698,8 +697,8 @@
                 }
                 catch (Throwable t)
                 {
-                  LOG.log(Level.WARNING,
-                      "Error parsing ldap url of ldap url.", t);
+                  logger.warn(LocalizableMessage.raw(
+                      "Error parsing ldap url of ldap url.", t));
                   h = INFO_NOT_AVAILABLE_LABEL.get().toString();
                   p = -1;
                 }
@@ -752,15 +751,15 @@
             }
             else if (throwable instanceof ConfigReadException)
             {
-              LOG.log(Level.WARNING,
-                  "Error reading configuration: "+throwable, throwable);
+              logger.warn(LocalizableMessage.raw(
+                  "Error reading configuration: "+throwable, throwable));
               errors.add(((ConfigReadException)throwable).getMessageObject());
             }
             else
             {
               // This is a bug
-              LOG.log(Level.SEVERE,
-                  "Unexpected error: "+throwable, throwable);
+              logger.error(LocalizableMessage.raw(
+                  "Unexpected error: "+throwable, throwable));
               errors.add(Utils.getThrowableMsg(INFO_BUG_MSG.get(), throwable));
             }
           }
@@ -859,7 +858,7 @@
 
       if ((chain != null) && (authType != null) && (host != null))
       {
-        LOG.log(Level.INFO, "Accepting certificate presented by host "+host);
+        logger.debug(LocalizableMessage.raw("Accepting certificate presented by host "+host));
         getInfo().getTrustManager().acceptCertificate(chain, authType, host);
         /* Simulate a click on the OK by calling in the okClicked method. */
         SwingUtilities.invokeLater(new Runnable()
@@ -874,18 +873,18 @@
       {
         if (chain == null)
         {
-          LOG.log(Level.WARNING,
-              "The chain is null for the UserDataCertificateException");
+          logger.warn(LocalizableMessage.raw(
+              "The chain is null for the UserDataCertificateException"));
         }
         if (authType == null)
         {
-          LOG.log(Level.WARNING,
-              "The auth type is null for the UserDataCertificateException");
+          logger.warn(LocalizableMessage.raw(
+              "The auth type is null for the UserDataCertificateException"));
         }
         if (host == null)
         {
-          LOG.log(Level.WARNING,
-              "The host is null for the UserDataCertificateException");
+          logger.warn(LocalizableMessage.raw(
+              "The host is null for the UserDataCertificateException"));
         }
       }
     }
@@ -901,7 +900,7 @@
         }
         catch (Throwable t)
         {
-          LOG.log(Level.WARNING, "Error accepting certificate: "+t, t);
+          logger.warn(LocalizableMessage.raw("Error accepting certificate: "+t, t));
         }
       }
     }

--
Gitblit v1.10.0