From dc1a95c709158ba2ae660cd940baf81709857a9f 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 Update server Schema class to rely on SDK schema for object classes
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java
index 90e0ebf..6523126 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/BrowseSchemaPanel.java
@@ -665,7 +665,7 @@
Map<String, ConfigurationObjectClassTreeNode> hmConfigurationOcs = new HashMap<>();
Set<String> customOcNames = new TreeSet<>(lowerCaseComparator);
Map<String, CustomObjectClassTreeNode> hmCustomOcs = new HashMap<>();
- for (ObjectClass oc : lastSchema.getObjectClasses().values())
+ for (ObjectClass oc : lastSchema.getObjectClasses())
{
if (mustAdd(oc))
{
@@ -1279,7 +1279,7 @@
private boolean mustAddAnyObjectClassName(ObjectClass oc, String f)
{
- for (ObjectClass o : lastSchema.getObjectClasses().values())
+ for (ObjectClass o : lastSchema.getObjectClasses())
{
if (isDescendant(oc, o) && mustAddObjectClassName(o, f))
{
@@ -1584,7 +1584,7 @@
// Analyze objectClasses
for (ObjectClass objectClass : ocsToDelete)
{
- for (ObjectClass o : schema.getObjectClasses().values())
+ for (ObjectClass o : schema.getObjectClasses())
{
if (o.getSuperiorClasses().contains(objectClass))
{
@@ -1608,7 +1608,7 @@
}
childAttributes.removeAll(attrsToDelete);
- for (ObjectClass o : schema.getObjectClasses().values())
+ for (ObjectClass o : schema.getObjectClasses())
{
if (o.getRequiredAttributes().contains(attribute))
{
--
Gitblit v1.10.0