From ce983e3c50103f5cca91c8ade7409d9d23d398d0 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 25 Aug 2015 15:59:10 +0000
Subject: [PATCH] CommonSchemaElements.java: Changed getNormalizedNames() to return a Set instead of Iterable.
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/SchemaElementPanel.java | 27 +++++++--------------------
1 files changed, 7 insertions(+), 20 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 e4f7016..24fe1c9 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
@@ -24,7 +24,6 @@
* Copyright 2008-2010 Sun Microsystems, Inc.
* Portions Copyright 2015 ForgeRock AS.
*/
-
package org.opends.guitools.controlpanel.ui;
import java.util.HashSet;
@@ -44,7 +43,6 @@
/**
* Abstract class used to re-factor some code among the panels that display the
* contents of a schema element.
- *
*/
public abstract class SchemaElementPanel extends StatusGenericPanel
{
@@ -141,21 +139,7 @@
*/
protected Set<String> getAliases(AttributeType attr)
{
- Set<String> aliases = new LinkedHashSet<>();
- Iterable<String> ocNames = attr.getNormalizedNames();
- String primaryName = attr.getPrimaryName();
- if (primaryName == null)
- {
- primaryName = "";
- }
- for (String name : ocNames)
- {
- if (!name.equalsIgnoreCase(primaryName))
- {
- aliases.add(name);
- }
- }
- return aliases;
+ return getAliases(attr.getNormalizedNames(), attr.getPrimaryName());
}
/**
@@ -165,14 +149,17 @@
*/
protected Set<String> getAliases(ObjectClass oc)
{
+ return getAliases(oc.getNormalizedNames(), oc.getPrimaryName());
+ }
+
+ private Set<String> getAliases(Set<String> names, String primaryName)
+ {
Set<String> aliases = new LinkedHashSet<>();
- Iterable<String> ocNames = oc.getNormalizedNames();
- String primaryName = oc.getPrimaryName();
if (primaryName == null)
{
primaryName = "";
}
- for (String name : ocNames)
+ for (String name : names)
{
if (!name.equalsIgnoreCase(primaryName))
{
--
Gitblit v1.10.0