From 246edb7e54f91142fd9cfef9d68cf4d4acf823c5 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Wed, 12 Mar 2008 08:49:50 +0000
Subject: [PATCH] Fix for issue 3048 (Missing "Are you sure ?" confirmation question in setup --cli)
---
opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallReviewPanel.java | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallReviewPanel.java b/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallReviewPanel.java
index f6d258e..3d5a27a 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallReviewPanel.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallReviewPanel.java
@@ -33,6 +33,7 @@
import org.opends.admin.ads.ServerDescriptor;
import org.opends.admin.ads.SuffixDescriptor;
+import org.opends.quicksetup.Constants;
import org.opends.quicksetup.UserData;
import org.opends.quicksetup.installer.AuthenticationData;
import org.opends.quicksetup.installer.DataReplicationOptions;
@@ -266,13 +267,12 @@
getField(fieldName).setText(value);
}
-
/**
* Returns the localized string describing the DataOptions chosen by the user.
* @param userInstallData the DataOptions of the user.
* @return the localized string describing the DataOptions chosen by the user.
*/
- private String getDataDisplayString(UserData userInstallData)
+ public static String getDataDisplayString(UserData userInstallData)
{
Message msg;
@@ -320,8 +320,17 @@
throw new IllegalArgumentException("Unknown type: "+options.getType());
}
- msg = INFO_REVIEW_CREATE_SUFFIX.get(options.getBaseDns().getFirst(),
+ if (options.getBaseDns().size() > 1)
+ {
+ msg = INFO_REVIEW_CREATE_SUFFIX.get(
+ Utils.listToString(options.getBaseDns(), Constants.LINE_SEPARATOR),
+ arg2);
+ }
+ else
+ {
+ msg = INFO_REVIEW_CREATE_SUFFIX.get(options.getBaseDns().getFirst(),
arg2);
+ }
}
else
{
--
Gitblit v1.10.0