From 8b3cd28204e15e0a98ce038b355f100cd7c44e3c Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <capponi.nicolas@gmail.com>
Date: Thu, 28 Jan 2016 08:28:20 +0000
Subject: [PATCH] OPENDJ-1632 (PR-201) Migrate AttributeType in one shot
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SchemaElementPanel.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SchemaElementPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SchemaElementPanel.java
index 24fe1c9..af912d1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SchemaElementPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SchemaElementPanel.java
@@ -22,10 +22,12 @@
*
*
* Copyright 2008-2010 Sun Microsystems, Inc.
- * Portions Copyright 2015 ForgeRock AS.
+ * Portions Copyright 2015-2016 ForgeRock AS.
*/
package org.opends.guitools.controlpanel.ui;
+import static org.opends.server.util.StaticUtils.*;
+
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set;
@@ -34,9 +36,9 @@
import javax.swing.border.Border;
import javax.swing.border.EmptyBorder;
+import org.forgerock.opendj.ldap.schema.AttributeType;
import org.opends.guitools.controlpanel.event.SchemaElementSelectionEvent;
import org.opends.guitools.controlpanel.event.SchemaElementSelectionListener;
-import org.opends.server.types.AttributeType;
import org.opends.server.types.ObjectClass;
import org.opends.server.types.Schema;
@@ -139,7 +141,7 @@
*/
protected Set<String> getAliases(AttributeType attr)
{
- return getAliases(attr.getNormalizedNames(), attr.getPrimaryName());
+ return getAliases(attr.getNames(), toLowerCase(attr.getNameOrOID()));
}
/**
@@ -152,7 +154,7 @@
return getAliases(oc.getNormalizedNames(), oc.getPrimaryName());
}
- private Set<String> getAliases(Set<String> names, String primaryName)
+ private Set<String> getAliases(Iterable<String> names, String primaryName)
{
Set<String> aliases = new LinkedHashSet<>();
if (primaryName == null)
@@ -163,7 +165,7 @@
{
if (!name.equalsIgnoreCase(primaryName))
{
- aliases.add(name);
+ aliases.add(toLowerCase(name));
}
}
return aliases;
--
Gitblit v1.10.0