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/CustomAttributePanel.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java
index 52b4133..c4faebe 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/CustomAttributePanel.java
@@ -67,6 +67,7 @@
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.forgerock.opendj.ldap.schema.AttributeUsage;
import org.forgerock.opendj.ldap.schema.MatchingRule;
+import org.forgerock.opendj.ldap.schema.ObjectClass;
import org.forgerock.opendj.ldap.schema.SchemaBuilder;
import org.forgerock.opendj.ldap.schema.Syntax;
import org.opends.guitools.controlpanel.datamodel.ServerDescriptor;
@@ -83,7 +84,6 @@
import org.opends.guitools.controlpanel.util.LowerCaseComparator;
import org.opends.guitools.controlpanel.util.Utilities;
import org.opends.server.schema.SomeSchemaElement;
-import org.forgerock.opendj.ldap.schema.ObjectClass;
import org.opends.server.types.Schema;
import org.opends.server.util.ServerConstants;
import org.opends.server.util.StaticUtils;
@@ -560,7 +560,7 @@
Comparator<String> lowerCaseComparator = new LowerCaseComparator();
SortedSet<String> requiredByOcs = new TreeSet<>(lowerCaseComparator);
- for (ObjectClass oc : schema.getObjectClasses().values())
+ for (ObjectClass oc : schema.getObjectClasses())
{
if (oc.getRequiredAttributes().contains(attr))
{
@@ -576,7 +576,7 @@
}
SortedSet<String> optionalByOcs = new TreeSet<>(lowerCaseComparator);
- for (ObjectClass oc : schema.getObjectClasses().values())
+ for (ObjectClass oc : schema.getObjectClasses())
{
if (oc.getOptionalAttributes().contains(attr))
{
@@ -735,7 +735,7 @@
}
}
- for (ObjectClass o : schema.getObjectClasses().values())
+ for (ObjectClass o : schema.getObjectClasses())
{
if (o.getRequiredAttributes().contains(attribute))
{
--
Gitblit v1.10.0