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/StandardAttributePanel.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardAttributePanel.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardAttributePanel.java
index abd3194..57eb288 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardAttributePanel.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ui/StandardAttributePanel.java
@@ -39,12 +39,12 @@
import org.forgerock.i18n.LocalizableMessageBuilder;
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.forgerock.opendj.ldap.schema.MatchingRule;
+import org.forgerock.opendj.ldap.schema.ObjectClass;
import org.opends.guitools.controlpanel.event.ConfigurationChangeEvent;
import org.opends.guitools.controlpanel.ui.components.TitlePanel;
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;
/** The panel that displays a standard attribute definition. */
@@ -278,7 +278,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))
{
@@ -294,7 +294,7 @@
}
SortedSet<String> optionalByOcs = new TreeSet<>(lowerCaseComparator);
- for (ObjectClass oc : schema.getObjectClasses().values())
+ for (ObjectClass oc : schema.getObjectClasses())
{
if (oc.getOptionalAttributes().contains(attr))
{
--
Gitblit v1.10.0