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/CustomObjectClassPanel.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/opends/src/guitools/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java b/opends/src/guitools/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java
index e883cf3..4109591 100644
--- a/opends/src/guitools/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java
+++ b/opends/src/guitools/org/opends/guitools/controlpanel/ui/CustomObjectClassPanel.java
@@ -22,7 +22,7 @@
* CDDL HEADER END
*
*
- * Copyright 2008-2009 Sun Microsystems, Inc.
+ * Copyright 2008-2010 Sun Microsystems, Inc.
*/
package org.opends.guitools.controlpanel.ui;
@@ -83,6 +83,7 @@
import org.opends.guitools.controlpanel.ui.components.TitlePanel;
import org.opends.guitools.controlpanel.ui.renderer.
SchemaElementComboBoxCellRenderer;
+import org.opends.guitools.controlpanel.util.LowerCaseComparator;
import org.opends.guitools.controlpanel.util.Utilities;
import org.opends.messages.Message;
import org.opends.messages.MessageBuilder;
@@ -276,7 +277,8 @@
*/
public int compare(AttributeType attr1, AttributeType attr2)
{
- return attr1.getNameOrOID().compareTo(attr2.getNameOrOID());
+ return attr1.getNameOrOID().toLowerCase().compareTo(
+ attr2.getNameOrOID().toLowerCase());
}
};
attributes.getAvailableListModel().setComparator(comparator);
@@ -587,7 +589,8 @@
ObjectClass oc = schema.getObjectClass(key);
objectClassNameMap.put(oc.getNameOrOID(), oc);
}
- SortedSet<String> orderedKeys = new TreeSet<String>();
+ SortedSet<String> orderedKeys =
+ new TreeSet<String>(new LowerCaseComparator());
orderedKeys.addAll(objectClassNameMap.keySet());
ArrayList<ObjectClass> newParents = new ArrayList<ObjectClass>();
for (String key : orderedKeys)
--
Gitblit v1.10.0