From a8f5d8345278d27ddf5325d3977e460b86b6275f Mon Sep 17 00:00:00 2001
From: ludovicp <ludovicp@localhost>
Date: Tue, 27 Apr 2010 20:56:50 +0000
Subject: [PATCH] Fixing several issues with the Control Panel, the QuickSetup, Core server and Replication. Also improves unit, functional tests. More specifically this commit resolves the following open issues: 4385 - NPE when using ExtensibleMatch filter without a matching rule 4521 - dynamic lookup in attribut selection when selecting the sort order attribut while defining VLV index 4531 - Control Panel creates virtual static groups using groupOfURLs as objectclass 4533 - NullPointerException when configuring replication between 2 OpenDS 4539 - DSML Gateway - jaxb.properties Exception
---
opends/src/guitools/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java b/opends/src/guitools/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java
index 4434817..e88b922 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/ui/StatusGenericPanel.java
@@ -93,6 +93,7 @@
import org.opends.guitools.controlpanel.task.Task;
import org.opends.guitools.controlpanel.ui.components.AddRemovePanel;
import org.opends.guitools.controlpanel.util.BackgroundTask;
+import org.opends.guitools.controlpanel.util.LowerCaseComparator;
import org.opends.guitools.controlpanel.util.Utilities;
import org.opends.messages.Message;
import org.opends.messages.MessageBuilder;
@@ -1335,7 +1336,8 @@
protected void updateSimpleBackendComboBoxModel(final JComboBox combo,
final JLabel lNoBackendsFound, ServerDescriptor desc)
{
- final SortedSet<String> newElements = new TreeSet<String>();
+ final SortedSet<String> newElements =
+ new TreeSet<String>(new LowerCaseComparator());
for (BackendDescriptor backend : desc.getBackends())
{
if (!backend.isConfigBackend())
@@ -1377,7 +1379,8 @@
{
LinkedHashSet<CategorizedComboBoxElement> newElements =
new LinkedHashSet<CategorizedComboBoxElement>();
- SortedSet<String> backendIDs = new TreeSet<String>();
+ SortedSet<String> backendIDs =
+ new TreeSet<String>(new LowerCaseComparator());
HashMap<String, SortedSet<String>> hmBaseDNs =
new HashMap<String, SortedSet<String>>();
@@ -1387,7 +1390,8 @@
{
String backendID = backend.getBackendID();
backendIDs.add(backendID);
- SortedSet<String> baseDNs = new TreeSet<String>();
+ SortedSet<String> baseDNs =
+ new TreeSet<String>(new LowerCaseComparator());
for (BaseDNDescriptor baseDN : backend.getBaseDns())
{
try
--
Gitblit v1.10.0