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/quicksetup/org/opends/quicksetup/ui/CertificateDialog.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/ui/CertificateDialog.java b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/ui/CertificateDialog.java
index 79c2173..628a971 100644
--- a/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/ui/CertificateDialog.java
+++ b/opendj3-server-dev/src/quicksetup/org/opends/quicksetup/ui/CertificateDialog.java
@@ -44,8 +44,9 @@
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import javax.naming.ldap.LdapName;
import javax.naming.ldap.Rdn;
@@ -66,7 +67,6 @@
import org.opends.quicksetup.UserDataCertificateException;
import org.opends.quicksetup.event.MinimumSizeComponentListener;
-import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
import static org.opends.messages.QuickSetupMessages.*;
@@ -105,8 +105,7 @@
private String explanationWithHideDetails;
private String explanationWithShowDetails;
- private static final Logger LOG = Logger.getLogger(
- CertificateDialog.class.getName());
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
/**
* Constructor of the certificate dialog.
@@ -630,10 +629,10 @@
msg = LocalizableMessage.raw(sb);
}
catch (NoSuchAlgorithmException nsae) {
- LOG.log(Level.WARNING, "SHA1 algorithm not supported: "+nsae, nsae);
+ logger.warn(LocalizableMessage.raw("SHA1 algorithm not supported: "+nsae, nsae));
}
catch (CertificateEncodingException cee) {
- LOG.log(Level.WARNING, "Certificate encoding exception: "+cee, cee);
+ logger.warn(LocalizableMessage.raw("Certificate encoding exception: "+cee, cee));
}
return msg;
}
@@ -662,10 +661,10 @@
msg = LocalizableMessage.raw(sb);
}
catch (NoSuchAlgorithmException nsae) {
- LOG.log(Level.WARNING, "MD5 algorithm not supported: "+nsae, nsae);
+ logger.warn(LocalizableMessage.raw("MD5 algorithm not supported: "+nsae, nsae));
}
catch (CertificateEncodingException cee) {
- LOG.log(Level.WARNING, "Certificate encoding exception: "+cee, cee);
+ logger.warn(LocalizableMessage.raw("Certificate encoding exception: "+cee, cee));
}
return msg;
}
@@ -703,8 +702,8 @@
}
catch (Throwable t)
{
- LOG.log(Level.WARNING, "Error parsing subject dn: "+
- cert.getSubjectX500Principal(), t);
+ logger.warn(LocalizableMessage.raw("Error parsing subject dn: "+
+ cert.getSubjectX500Principal(), t));
}
return name;
}
--
Gitblit v1.10.0