From 43a01cb8d6c368843baa014eb80be265bfe092e7 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Fri, 01 Jul 2016 13:46:08 +0000
Subject: [PATCH] OPENDJ-3038 Merge ServerSchemaElement class into SchemaUtils class
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java
index 1c10f6c..3275dce 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/Utilities.java
@@ -16,6 +16,8 @@
*/
package org.opends.guitools.controlpanel.util;
+import static org.opends.server.util.SchemaUtils.getElementSchemaFile;
+
import static com.forgerock.opendj.cli.Utils.*;
import static com.forgerock.opendj.util.OperatingSystem.*;
import static org.forgerock.opendj.ldap.DereferenceAliasesPolicy.*;
@@ -25,7 +27,7 @@
import static org.opends.admin.ads.util.PreferredConnection.Type.*;
import static org.opends.messages.AdminToolMessages.*;
import static org.opends.quicksetup.Installation.*;
-import static org.opends.server.schema.ServerSchemaElement.*;
+import static org.opends.server.util.SchemaUtils.*;
import java.awt.Color;
import java.awt.Component;
@@ -1997,12 +1999,12 @@
*/
public static boolean isStandard(SchemaElement fileElement)
{
- final String fileName = getSchemaFile(fileElement);
+ final String fileName = getElementSchemaFile(fileElement);
if (fileName != null)
{
return standardSchemaFileNames.contains(fileName) || fileName.toLowerCase().contains("-rfc");
}
- String xOrigin = getOrigin(fileElement);
+ String xOrigin = getElementOrigin(fileElement);
if (xOrigin != null)
{
return standardSchemaOrigins.contains(xOrigin) || xOrigin.startsWith("RFC ") || xOrigin.startsWith("draft-");
@@ -2019,12 +2021,12 @@
*/
public static boolean isConfiguration(SchemaElement fileElement)
{
- String fileName = getSchemaFile(fileElement);
+ String fileName = getElementSchemaFile(fileElement);
if (fileName != null)
{
return configurationSchemaFileNames.contains(fileName);
}
- String xOrigin = getOrigin(fileElement);
+ String xOrigin = getElementOrigin(fileElement);
if (xOrigin != null)
{
return configurationSchemaOrigins.contains(xOrigin);
--
Gitblit v1.10.0