From d366a5db9c1477c823758862268dd493dbbcc936 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 07 Jun 2016 13:49:03 +0000
Subject: [PATCH] OPENDJ-3037 inlined DirectoryServer.getTopObjectClass() and getObjectClassAttributeType()

---
 opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/Branch.java |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/Branch.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/Branch.java
index ed28d1c..fdd739d 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/Branch.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/makeldif/Branch.java
@@ -28,7 +28,7 @@
 import org.forgerock.opendj.ldap.ByteString;
 import org.forgerock.opendj.ldap.DN;
 import org.forgerock.opendj.ldap.schema.AttributeType;
-import org.opends.server.core.DirectoryServer;
+import org.forgerock.opendj.ldap.schema.CoreSchema;
 import org.opends.server.types.Attribute;
 import org.opends.server.types.Entry;
 
@@ -110,13 +110,9 @@
         String[] valueStrings = new String[] { ocName };
         Tag[] tags = new Tag[1];
         tags[0] = new StaticTextTag();
-        tags[0].initializeForBranch(templateFile, this, valueStrings, 0,
-                                    warnings);
+        tags[0].initializeForBranch(templateFile, this, valueStrings, 0, warnings);
 
-        TemplateLine l =
-             new TemplateLine(DirectoryServer.getObjectClassAttributeType(), 0,
-                              tags);
-        lineList.add(l);
+        lineList.add(new TemplateLine(CoreSchema.getObjectClassAttributeType(), 0, tags));
       }
       catch (Exception e)
       {

--
Gitblit v1.10.0