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/ControlPanelLauncher.java | 30 ++++++++++++++----------------
1 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java
index 55a7f04..19e096a 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/ControlPanelLauncher.java
@@ -34,14 +34,14 @@
import java.io.File;
import java.io.PrintStream;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+
+import org.forgerock.i18n.LocalizableMessage;
+import org.forgerock.i18n.slf4j.LocalizedLogger;
import javax.swing.SwingUtilities;
import org.opends.guitools.controlpanel.util.ControlPanelLog;
import org.opends.messages.AdminToolMessages;
-import org.forgerock.i18n.LocalizableMessage;
import org.opends.quicksetup.ui.UIFactory;
import org.opends.quicksetup.util.Utils;
import org.opends.server.types.InitializationException;
@@ -67,8 +67,7 @@
/** Suffix for log files. */
static public final String LOG_FILE_SUFFIX = ".log";
- static private final Logger LOG =
- Logger.getLogger(ControlPanelLauncher.class.getName());
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
/**
* Main method invoked by the control-panel script.
@@ -182,7 +181,7 @@
}
catch (Throwable t)
{
- LOG.log(Level.WARNING, "Error setting look and feel: "+t, t);
+ logger.warn(LocalizableMessage.raw("Error setting look and feel: "+t, t));
}
ControlPanelSplashScreen.main(args);
@@ -192,7 +191,7 @@
{
if (ControlPanelLog.isInitialized())
{
- LOG.log(Level.WARNING, "Error launching GUI: "+t);
+ logger.warn(LocalizableMessage.raw("Error launching GUI: "+t));
StringBuilder buf = new StringBuilder();
while (t != null)
{
@@ -207,7 +206,7 @@
buf.append("Root cause:\n");
}
}
- LOG.log(Level.WARNING, buf.toString());
+ logger.warn(LocalizableMessage.raw(buf.toString()));
}
}
}
@@ -305,8 +304,7 @@
private static ControlPanel controlPanel;
- private static final Logger LOG =
- Logger.getLogger(ControlPanelLauncher.class.getName());
+ private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
/**
* The main method for this class.
@@ -335,7 +333,7 @@
{
if (ControlPanelLog.isInitialized())
{
- LOG.log(Level.SEVERE, "Error launching GUI: "+t, t);
+ logger.error(LocalizableMessage.raw("Error launching GUI: "+t, t));
}
InternalError error =
new InternalError("Failed to invoke initialize method");
@@ -357,12 +355,12 @@
{
try
{
- LOG.log(Level.INFO, "going to call createAndDisplayGUI.");
+ logger.debug(LocalizableMessage.raw("going to call createAndDisplayGUI."));
controlPanel.createAndDisplayGUI();
- LOG.log(Level.INFO, "called createAndDisplayGUI.");
+ logger.debug(LocalizableMessage.raw("called createAndDisplayGUI."));
} catch (Throwable t)
{
- LOG.log(Level.SEVERE, "Error displaying GUI: "+t, t);
+ logger.error(LocalizableMessage.raw("Error displaying GUI: "+t, t));
InternalError error =
new InternalError("Failed to invoke display method");
error.initCause(t);
@@ -382,8 +380,8 @@
}
catch (Throwable t)
{
- LOG.log(Level.SEVERE, "Error calling SwingUtilities.invokeAndWait: "+t,
- t);
+ logger.error(LocalizableMessage.raw("Error calling SwingUtilities.invokeAndWait: "+t,
+ t));
InternalError error =
new InternalError(
"Failed to invoke SwingUtilities.invokeAndWait method");
--
Gitblit v1.10.0