From cd144ffe68d0d75c8f7c7b5e4026ce80dceececa Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Tue, 26 Apr 2016 13:01:17 +0000
Subject: [PATCH] OPENDJ-2797 Remove SchemaFileElement interface in favor of SDK SchemaElement interface
---
opendj-server-legacy/src/main/java/org/opends/server/schema/SomeSchemaElement.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/SomeSchemaElement.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/SomeSchemaElement.java
index 1e948a7..b0f68b8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/SomeSchemaElement.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/SomeSchemaElement.java
@@ -24,11 +24,11 @@
import org.forgerock.opendj.ldap.schema.AttributeType;
import org.forgerock.opendj.ldap.schema.Schema;
import org.forgerock.opendj.ldap.schema.SchemaBuilder;
+import org.forgerock.opendj.ldap.schema.SchemaElement;
import org.opends.server.config.ConfigConstants;
import org.opends.server.core.ServerContext;
import org.opends.server.types.CommonSchemaElements;
import org.opends.server.types.ObjectClass;
-import org.opends.server.types.SchemaFileElement;
import org.opends.server.util.RemoveOnceSDKSchemaIsUsed;
import org.opends.server.util.ServerConstants;
@@ -41,7 +41,7 @@
*/
@RemoveOnceSDKSchemaIsUsed("This class is a temporary mechanism"
+ " to manage in the same way SDK and server schema element classes")
-public class SomeSchemaElement implements SchemaFileElement
+public class SomeSchemaElement implements SchemaElement
{
private final ObjectClass objectClass;
private AttributeType attributeType;
@@ -294,4 +294,10 @@
.toSchema();
return schema.getAttributeType(attributeType.getNameOrOID());
}
+
+ @Override
+ public String getDescription()
+ {
+ return attributeType != null ? attributeType.getDescription() : objectClass.getDescription();
+ }
}
--
Gitblit v1.10.0