From f43af85a2ed0b16e57c384e82802d2015c84d370 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Fri, 21 Jun 2013 13:18:00 +0000
Subject: [PATCH] OPENDJ-1006 Upgrade: insert new line before displaying license text - inserted new line before license display - fixed the star display(first space was removed by wrapText())
---
opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/Upgrade.java | 2 +-
opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeCli.java | 2 +-
opendj-sdk/opends/src/server/org/opends/server/util/cli/ConsoleApplication.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/Upgrade.java b/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/Upgrade.java
index 02ef657..86eca24 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/Upgrade.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/Upgrade.java
@@ -630,7 +630,7 @@
{
if (LicenseFile.exists())
{
- context.notify(Message.raw(LicenseFile.getText()));
+ context.notify(Message.raw("\n" + LicenseFile.getText()));
// If the user asks for no-prompt. We just display the license text.
// User doesn't asks for no-prompt. We just display the license text
diff --git a/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeCli.java b/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeCli.java
index 5082c58..bf0cbb3 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeCli.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/tools/upgrade/UpgradeCli.java
@@ -425,7 +425,7 @@
4);
break;
case NOTICE_CALLBACK:
- println(Style.NOTICE, Message.raw(fnc.getMessage()), 0);
+ println(Style.NOTICE, Message.raw(fnc.getMessage()), 1);
break;
default:
LOG.log(SEVERE, "Unsupported message type: "
diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/cli/ConsoleApplication.java b/opendj-sdk/opends/src/server/org/opends/server/util/cli/ConsoleApplication.java
index 4288cfd..bc72e64 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/cli/ConsoleApplication.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/cli/ConsoleApplication.java
@@ -469,7 +469,7 @@
out.println();
break;
case NOTICE:
- out.println(wrapText(" * " + msg, MAX_LINE_WIDTH, indent));
+ out.println(wrapText("* " + msg, MAX_LINE_WIDTH, indent));
break;
case ERROR:
out.println();
--
Gitblit v1.10.0