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/ui/DataOptionsPanel.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/DataOptionsPanel.java b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/DataOptionsPanel.java
index 4615583..5275055 100644
--- a/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/DataOptionsPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/quicksetup/installer/ui/DataOptionsPanel.java
@@ -40,7 +40,6 @@
import javax.swing.Box;
import javax.swing.ButtonGroup;
-import javax.swing.DefaultComboBoxModel;
import javax.swing.JButton;
import javax.swing.JComboBox;
import javax.swing.JLabel;
@@ -61,6 +60,7 @@
import org.opends.quicksetup.ui.UIFactory;
import org.opends.quicksetup.ui.Utilities;
import org.opends.server.tools.BackendTypeHelper;
+import org.opends.server.tools.BackendTypeHelper.BackendTypeUIAdapter;
/**
* This is the panel that contains the Data Options: the suffix dn, whether to
@@ -83,7 +83,7 @@
private JButton ldifBrowseButton;
- private JComboBox backendTypeComboBox;
+ private JComboBox<BackendTypeUIAdapter> backendTypeComboBox;
/**
* Constructor of the panel.
@@ -117,7 +117,7 @@
}
else if (FieldName.BACKEND_TYPE == fieldName)
{
- return backendTypeComboBox.getSelectedItem().toString();
+ return ((BackendTypeUIAdapter) backendTypeComboBox.getSelectedItem()).getBackend();
}
else
{
@@ -444,7 +444,7 @@
private void createBackendTypeComboBox()
{
final BackendTypeHelper backendTypeHelper = new BackendTypeHelper();
- backendTypeComboBox = new JComboBox(new DefaultComboBoxModel(backendTypeHelper.getBackendTypeNames().toArray()));
+ backendTypeComboBox = new JComboBox<>(backendTypeHelper.getBackendTypeUIAdaptors());
}
private void createDirectoryDataChoiceRadioButton(final JLabel dataLabel)
--
Gitblit v1.10.0