From dbd177b18e53f486aeef896dc03911ee5ac72362 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Mon, 11 Apr 2016 17:22:17 +0000
Subject: [PATCH] OPENDJ-2622 Improve UI
---
opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java | 9 +++------
opendj-server-legacy/src/messages/org/opends/messages/quickSetup.properties | 4 ++--
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java
index 5188ce0..defe7f9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java
@@ -248,8 +248,6 @@
checkAbort();
setCurrentProgressStep(InstallProgressStep.CONFIGURING_SERVER);
- notifyListenersOfLog(false);
- notifyListeners(getLineBreak());
configureServer();
checkAbort();
@@ -378,7 +376,7 @@
notifyListeners(getFormattedError(exception, true));
logger.error(LocalizableMessage.raw("Error installing.", exception));
notifyListeners(getLineBreak());
- notifyListenersOfLog(true);
+ notifyListenersOfExistingLogFile();
}
private void stopServerIfNeeded()
@@ -609,13 +607,12 @@
return Utils.getInstancePathFromInstallPath(installPath);
}
- private void notifyListenersOfLog(final boolean isError)
+ private void notifyListenersOfExistingLogFile()
{
if (tempLogFile.isEnabled())
{
final String tempLogFilePath = tempLogFile.getPath();
- notifyListeners(getFormattedProgress(isError ? INFO_GENERAL_PROVIDE_LOG_IN_ERROR.get(tempLogFilePath)
- : INFO_GENERAL_SEE_FOR_DETAILS.get(tempLogFilePath)));
+ notifyListeners(getFormattedProgress(INFO_GENERAL_PROVIDE_LOG_IN_ERROR.get(tempLogFilePath)));
notifyListeners(getLineBreak());
}
}
diff --git a/opendj-server-legacy/src/messages/org/opends/messages/quickSetup.properties b/opendj-server-legacy/src/messages/org/opends/messages/quickSetup.properties
index 7288f65..abd9358 100644
--- a/opendj-server-legacy/src/messages/org/opends/messages/quickSetup.properties
+++ b/opendj-server-legacy/src/messages/org/opends/messages/quickSetup.properties
@@ -344,8 +344,8 @@
INFO_GENERAL_CHECKING_DATA=Checking Data...
INFO_GENERAL_LOADING=Loading...
INFO_GENERAL_SEE_FOR_DETAILS=See %s for a detailed log of this operation.
-INFO_GENERAL_PROVIDE_LOG_IN_ERROR=If you want to report this error, provide \
- the contents of file %s
+INFO_GENERAL_PROVIDE_LOG_IN_ERROR=See %s for a detailed log of the failed operation.\
+ \nPlease report this error and provide the log file mentioned above.
INFO_GENERAL_SERVER_STARTED=started
INFO_GENERAL_SERVER_STOPPED=stopped
INFO_GENERAL_WARNING=Warning
--
Gitblit v1.10.0