From bf58a21e71230bff9b456627fd31789cc98507bd Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Mon, 27 Apr 2015 10:03:47 +0000
Subject: [PATCH] OPENDJ-1963 Use backend type printable name in UI
---
opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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 adc5739..789f6a2 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
@@ -71,6 +71,9 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.i18n.slf4j.LocalizedLogger;
+import org.forgerock.opendj.config.ManagedObjectDefinition;
+import org.forgerock.opendj.server.config.client.BackendCfgClient;
+import org.forgerock.opendj.server.config.server.BackendCfg;
import org.opends.admin.ads.ADSContext;
import org.opends.admin.ads.ADSContextException;
import org.opends.admin.ads.ReplicaDescriptor;
@@ -122,6 +125,7 @@
import org.opends.quicksetup.util.FileManager;
import org.opends.quicksetup.util.IncompatibleVersionException;
import org.opends.quicksetup.util.Utils;
+import org.opends.server.tools.BackendTypeHelper;
import org.opends.server.util.CertificateManager;
import org.opends.server.util.DynamicConstants;
import org.opends.server.util.SetupUtils;
@@ -873,7 +877,7 @@
argList.add(getUserData().getDirectoryManagerPwd());
argList.add("--" + OPTION_LONG_BACKEND_TYPE);
- argList.add(getUserData().getBackendType());
+ argList.add(BackendTypeHelper.filterSchemaBackendName(getUserData().getBackendType().getName()));
if (createNotReplicatedSuffix())
{
@@ -3730,6 +3734,7 @@
* @throws UserDataException
* if the data provided by the user is not valid.
*/
+ @SuppressWarnings("unchecked")
private void updateUserDataForNewSuffixOptionsPanel(final QuickSetup ui) throws UserDataException
{
final List<LocalizableMessage> errorMsgs = new ArrayList<LocalizableMessage>();
@@ -3740,7 +3745,8 @@
if (dataOptions != null)
{
- getUserData().setBackendType(ui.getFieldStringValue(FieldName.BACKEND_TYPE));
+ getUserData().setBackendType((ManagedObjectDefinition<? extends BackendCfgClient, ? extends BackendCfg>)
+ ui.getFieldValue(FieldName.BACKEND_TYPE));
getUserData().setNewSuffixOptions(dataOptions);
}
--
Gitblit v1.10.0