From a36a3ad7a7cae7dffd8460aa4826ecdf50cd5751 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Mon, 30 May 2016 10:43:10 +0000
Subject: [PATCH] OPENDJ-2987 Fix retrieval of object classes names
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SchemaElementPanel.java | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 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 a45e0e5..34215f5 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
@@ -27,9 +27,9 @@
import javax.swing.border.EmptyBorder;
import org.forgerock.opendj.ldap.schema.AttributeType;
+import org.forgerock.opendj.ldap.schema.ObjectClass;
import org.opends.guitools.controlpanel.event.SchemaElementSelectionEvent;
import org.opends.guitools.controlpanel.event.SchemaElementSelectionListener;
-import org.forgerock.opendj.ldap.schema.ObjectClass;
import org.opends.server.types.Schema;
/**
@@ -107,7 +107,7 @@
* Method called when there is an object class selected in a list.
* @param list the list.
*/
- protected void objectClassSelected(JList list)
+ protected void objectClassSelected(JList<?> list)
{
String o = (String)list.getSelectedValue();
if (o != null)
@@ -131,7 +131,7 @@
*/
protected Set<String> getAliases(AttributeType attr)
{
- return getAliases(attr.getNames(), toLowerCase(attr.getNameOrOID()));
+ return getAliases(attr.getNames(), attr.getNameOrOID());
}
/**
@@ -141,19 +141,17 @@
*/
protected Set<String> getAliases(ObjectClass oc)
{
- return getAliases(oc.getNormalizedNames(), oc.getNameOrOID());
+ return getAliases(oc.getNames(), oc.getNameOrOID());
}
- private Set<String> getAliases(Iterable<String> names, String primaryName)
+ private Set<String> getAliases(Iterable<String> names, String nameOrOid)
{
- Set<String> aliases = new LinkedHashSet<>();
- if (primaryName == null)
- {
- primaryName = "";
- }
+ nameOrOid = nameOrOid != null ? nameOrOid : "";
+
+ final Set<String> aliases = new LinkedHashSet<>();
for (String name : names)
{
- if (!name.equalsIgnoreCase(primaryName))
+ if (!name.equalsIgnoreCase(nameOrOid))
{
aliases.add(toLowerCase(name));
}
--
Gitblit v1.10.0