From 950f927644139bbc8805c518dff2cd80cc3bcb6e Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Thu, 09 Apr 2015 12:41:47 +0000
Subject: [PATCH] OPENDJ-1714 (CR-6595) UI setup backend type choice

---
 opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/Installer.java |    9 +--------
 1 files changed, 1 insertions(+), 8 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 7cede49..adc5739 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
@@ -122,7 +122,6 @@
 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,13 +872,6 @@
     argList.add("-w");
     argList.add(getUserData().getDirectoryManagerPwd());
 
-    //FIXME Remove once graphical setup will allow backend type choice
-    if (getUserData().getBackendType() == null)
-    {
-      BackendTypeHelper helper = new BackendTypeHelper();
-      getUserData().setBackendType(helper.getBackendTypeNames().get(0));
-    }
-
     argList.add("--" + OPTION_LONG_BACKEND_TYPE);
     argList.add(getUserData().getBackendType());
 
@@ -3748,6 +3740,7 @@
 
     if (dataOptions != null)
     {
+      getUserData().setBackendType(ui.getFieldStringValue(FieldName.BACKEND_TYPE));
       getUserData().setNewSuffixOptions(dataOptions);
     }
 

--
Gitblit v1.10.0