From 5b42ca5a24a7b30dff7ed246ba104c64389607c9 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 14 Jun 2016 08:47:39 +0000
Subject: [PATCH] Schema: code cleanup
---
opendj-server-legacy/src/main/java/org/opends/server/schema/ServerSchemaElement.java | 11 ++---------
1 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/schema/ServerSchemaElement.java b/opendj-server-legacy/src/main/java/org/opends/server/schema/ServerSchemaElement.java
index 326b892..0dcef32 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/schema/ServerSchemaElement.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/schema/ServerSchemaElement.java
@@ -15,7 +15,7 @@
*/
package org.opends.server.schema;
-import static org.opends.server.util.ServerConstants.SCHEMA_PROPERTY_FILENAME;
+import static org.opends.server.types.Schema.*;
import java.util.List;
import java.util.Map;
@@ -56,15 +56,8 @@
*/
public String getDefinitionWithFileName()
{
- final String schemaFile = getSchemaFile();
final String definition = element.toString();
- if (schemaFile != null)
- {
- int pos = definition.lastIndexOf(')');
- return definition.substring(0, pos).trim() + " "
- + SCHEMA_PROPERTY_FILENAME + " '" + schemaFile + "' )";
- }
- return definition;
+ return addSchemaFileToElementDefinitionIfAbsent(definition, getSchemaFile());
}
/**
--
Gitblit v1.10.0