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/task/ModifyObjectClassTask.java | 16 ++++------------
1 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyObjectClassTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyObjectClassTask.java
index e1357a3..06acac1 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyObjectClassTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/ModifyObjectClassTask.java
@@ -52,7 +52,6 @@
/**
* The task that is in charge of modifying an object class definition (and all
* the references to this object class).
- *
*/
public class ModifyObjectClassTask extends Task
{
@@ -147,22 +146,16 @@
}
}
-
private ObjectClass getObjectClassToAdd(ObjectClass ocToDelete)
{
- ObjectClass ocToAdd;
Set<ObjectClass> currentSups = ocToDelete.getSuperiorClasses();
if (ocToDelete.equals(oldObjectClass))
{
- ocToAdd = newObjectClass;
+ return newObjectClass;
}
else if (currentSups.contains(oldObjectClass))
{
- ArrayList<String> allNames = new ArrayList<>();
- for (String str : ocToDelete.getNormalizedNames())
- {
- allNames.add(str);
- }
+ ArrayList<String> allNames = new ArrayList<>(ocToDelete.getNormalizedNames());
Map<String, List<String>> extraProperties =
DeleteSchemaElementsTask.cloneExtraProperties(ocToDelete);
Set<ObjectClass> newSups = new LinkedHashSet<>();
@@ -177,7 +170,7 @@
newSups.add(oc);
}
}
- ocToAdd = new ObjectClass("",
+ return new ObjectClass("",
ocToDelete.getPrimaryName(),
allNames,
ocToDelete.getOID(),
@@ -192,9 +185,8 @@
else
{
// Nothing to be changed in the definition of the object class itself.
- ocToAdd = ocToDelete;
+ return ocToDelete;
}
- return ocToAdd;
}
/**
--
Gitblit v1.10.0