From 4fab9c68f1e4755b7381ecf9bd86c8b30417bd8f Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Wed, 05 Sep 2007 06:40:30 +0000
Subject: [PATCH] The following changes are targetted to fix a certain number of issues related to the setup command line:
---
opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallReviewPanel.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallReviewPanel.java b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallReviewPanel.java
index d4cfe80..7df31a8 100644
--- a/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallReviewPanel.java
+++ b/opendj-sdk/opends/src/quicksetup/org/opends/quicksetup/installer/ui/InstallReviewPanel.java
@@ -294,10 +294,12 @@
Message arg2;
NewSuffixOptions options = userInstallData.getNewSuffixOptions();
+
switch (options.getType())
{
case CREATE_BASE_ENTRY:
- arg2 = INFO_REVIEW_CREATE_BASE_ENTRY_LABEL.get(options.getBaseDn());
+ arg2 = INFO_REVIEW_CREATE_BASE_ENTRY_LABEL.get(
+ options.getBaseDns().getFirst());
break;
@@ -306,7 +308,7 @@
break;
case IMPORT_FROM_LDIF_FILE:
- arg2 = INFO_REVIEW_IMPORT_LDIF.get(options.getLDIFPath());
+ arg2 = INFO_REVIEW_IMPORT_LDIF.get(options.getLDIFPaths().getFirst());
break;
case IMPORT_AUTOMATICALLY_GENERATED_DATA:
@@ -315,10 +317,11 @@
break;
default:
- throw new IllegalArgumentException("Unknow type: " + options.getType());
+ throw new IllegalArgumentException("Unknown type: "+options.getType());
}
- msg = INFO_REVIEW_CREATE_SUFFIX.get(options.getBaseDn(), arg2);
+ msg = INFO_REVIEW_CREATE_SUFFIX.get(options.getBaseDns().getFirst(),
+ arg2);
}
else
{
@@ -334,9 +337,9 @@
}
msg = INFO_REVIEW_REPLICATE_SUFFIX.get(buf.toString());
}
-
return msg.toString();
}
+
/**
* Returns the String representing the replication port configuration.
* @param userInstallData the DataOptions of the user.
--
Gitblit v1.10.0