From 4978cbcfce206fb43659395556b59c33127505bd Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Mon, 07 Apr 2008 11:56:09 +0000
Subject: [PATCH] Fix for issue 3121 (Bad management of upgrade -r on a already reverted installation)
---
opends/src/quicksetup/org/opends/quicksetup/upgrader/ReversionIssueNotifier.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/upgrader/ReversionIssueNotifier.java b/opends/src/quicksetup/org/opends/quicksetup/upgrader/ReversionIssueNotifier.java
index 3b2f5e4..1f90df5 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/upgrader/ReversionIssueNotifier.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/upgrader/ReversionIssueNotifier.java
@@ -98,13 +98,15 @@
Message details;
Message defaultAction;
UserInteraction.MessageType msgType;
+ String lineBreak = ui.isCLI() ?
+ Constants.LINE_SEPARATOR : Constants.HTML_LINE_BREAK;
switch (directive.getType()) {
case ACTION:
title = INFO_GENERAL_ACTION_REQUIRED.get();
summary = INFO_REVERSION_ORACLE_ACTION.get();
details = new MessageBuilder(directive.getMessage())
- .append(Constants.HTML_LINE_BREAK)
- .append(Constants.HTML_LINE_BREAK)
+ .append(lineBreak)
+ .append(lineBreak)
.append(INFO_ORACLE_ACTION_PROMPT.get())
.toMessage();
msgType = UserInteraction.MessageType.WARNING;
@@ -114,8 +116,8 @@
title = INFO_GENERAL_INFO.get();
summary = INFO_REVERSION_ORACLE_INFO.get();
details = new MessageBuilder(directive.getMessage())
- .append(Constants.HTML_LINE_BREAK)
- .append(Constants.HTML_LINE_BREAK)
+ .append(lineBreak)
+ .append(lineBreak)
.append(INFO_ORACLE_INFO_PROMPT.get())
.toMessage();
msgType = UserInteraction.MessageType.INFORMATION;
@@ -125,8 +127,8 @@
title = INFO_GENERAL_WARNING.get();
summary = INFO_REVERSION_ORACLE_WARNING.get();
details = new MessageBuilder(directive.getMessage())
- .append(Constants.HTML_LINE_BREAK)
- .append(Constants.HTML_LINE_BREAK)
+ .append(lineBreak)
+ .append(lineBreak)
.append(INFO_ORACLE_INFO_PROMPT.get())
.toMessage();
msgType = UserInteraction.MessageType.WARNING;
@@ -176,8 +178,10 @@
// If the import/export effect is present, append the detailed
// instructions.
if (effects.contains(Effect.REVERSION_DATA_EXPORT_AND_REIMPORT_REQUIRED)) {
+ String lineBreak = ui.isCLI() ?
+ Constants.LINE_SEPARATOR : Constants.HTML_LINE_BREAK;
msg = new MessageBuilder(msg)
- .append(Constants.HTML_LINE_BREAK)
+ .append(lineBreak)
.append(ui.createUnorderedList(getExportImportInstructions()))
.toMessage();
}
--
Gitblit v1.10.0