From 47b4c6ff8d8b7d909adc6b8319832f37f058497c Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Wed, 19 Nov 2008 02:19:09 +0000
Subject: [PATCH] Complete fix for issue 3622. Make all the elements in the schema panels sorted without taking into account the case.
---
opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/StandardObjectClassPanel.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/StandardObjectClassPanel.java b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/StandardObjectClassPanel.java
index 91eb782..203b6a8 100644
--- a/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/StandardObjectClassPanel.java
+++ b/opendj-sdk/opends/src/guitools/org/opends/guitools/controlpanel/ui/StandardObjectClassPanel.java
@@ -35,6 +35,7 @@
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.util.ArrayList;
+import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -49,6 +50,7 @@
import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
import org.opends.guitools.controlpanel.ui.components.TitlePanel;
+import org.opends.guitools.controlpanel.util.LowerCaseComparator;
import org.opends.guitools.controlpanel.util.Utilities;
import org.opends.messages.Message;
import org.opends.messages.MessageBuilder;
@@ -357,7 +359,8 @@
type.setText(getTypeValue(oc).toString());
- SortedSet<String> requiredAttrs = new TreeSet<String>();
+ Comparator<String> lowerCaseComparator = new LowerCaseComparator();
+ SortedSet<String> requiredAttrs = new TreeSet<String>(lowerCaseComparator);
Set<String> inheritedAttrs = new HashSet<String>();
for (AttributeType attr : oc.getRequiredAttributeChain())
{
@@ -389,7 +392,7 @@
hmAttrs.put(v, schema.getAttributeType(attr.toLowerCase()));
}
- SortedSet<String> optionalAttrs = new TreeSet<String>();
+ SortedSet<String> optionalAttrs = new TreeSet<String>(lowerCaseComparator);
inheritedAttrs = new HashSet<String>();
for (AttributeType attr : oc.getOptionalAttributeChain())
{
--
Gitblit v1.10.0