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/backends/SchemaBackend.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java b/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java
index cef2067..bb526d9 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/backends/SchemaBackend.java
@@ -66,6 +66,7 @@
import org.forgerock.opendj.ldap.schema.MatchingRule;
import org.forgerock.opendj.ldap.schema.MatchingRuleUse;
import org.forgerock.opendj.ldap.schema.ObjectClassType;
+import org.forgerock.opendj.ldap.schema.SchemaElement;
import org.forgerock.opendj.server.config.server.SchemaBackendCfg;
import org.opends.server.api.AlertGenerator;
import org.opends.server.api.Backend;
@@ -110,7 +111,6 @@
import org.opends.server.types.Privilege;
import org.opends.server.types.RestoreConfig;
import org.opends.server.types.Schema;
-import org.opends.server.types.SchemaFileElement;
import org.opends.server.types.SearchFilter;
import org.opends.server.util.BackupManager;
import org.opends.server.util.BuildVersion;
@@ -1213,7 +1213,7 @@
}
}
- private void addNewSchemaElement(Set<String> modifiedSchemaFiles, SchemaFileElement elem)
+ private void addNewSchemaElement(Set<String> modifiedSchemaFiles, SchemaElement elem)
{
String schemaFile = getSchemaFile(elem);
if (schemaFile == null || schemaFile.length() == 0)
@@ -1245,7 +1245,7 @@
return schemaFile == null ? finalFile : null;
}
- private <T extends SchemaFileElement> void replaceExistingSchemaElement(
+ private <T extends SchemaElement> void replaceExistingSchemaElement(
Set<String> modifiedSchemaFiles, T newElem, T existingElem)
{
String newSchemaFile = getSchemaFile(newElem);
--
Gitblit v1.10.0