From ec6fcea7eb3b1013db8b26ff65327d3ab24077c9 Mon Sep 17 00:00:00 2001
From: Nicolas Capponi <nicolas.capponi@forgerock.com>
Date: Fri, 09 Sep 2016 09:45:26 +0000
Subject: [PATCH] OPENDJ-3089 Several minor fixes from the PR
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/SchemaLoader.java | 30 +++---------------------------
1 files changed, 3 insertions(+), 27 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/SchemaLoader.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/SchemaLoader.java
index 0cfe573..6b17709 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/SchemaLoader.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/util/SchemaLoader.java
@@ -17,12 +17,10 @@
package org.opends.guitools.controlpanel.util;
import static org.opends.messages.SchemaMessages.ERR_SCHEMA_HAS_WARNINGS;
-import static org.opends.messages.ConfigMessages.*;
import java.io.File;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Collections;
import java.util.List;
import org.forgerock.i18n.LocalizableMessage;
@@ -43,6 +41,8 @@
import org.opends.server.schema.SchemaHandler;
import org.opends.server.types.DirectoryException;
import org.opends.server.types.InitializationException;
+import org.opends.server.util.SchemaUtils;
+import org.opends.server.util.StaticUtils;
/** Class used to retrieve the schema from the schema files. */
public class SchemaLoader
@@ -106,7 +106,7 @@
{
SchemaHandler schemaHandler = serverContext.getSchemaHandler();
final File schemaDir = schemaHandler.getSchemaDirectoryPath();
- final List<String> fileNames = getSchemaFileNames(schemaDir);
+ final List<String> fileNames = StaticUtils.getFileNames(SchemaUtils.getSchemaFiles(schemaDir));
// build the schema from schema files
Schema baseSchema = getBaseSchema();
@@ -130,30 +130,6 @@
return schema;
}
- private List<String> getSchemaFileNames(final File schemaDir)
- throws InitializationException
- {
- final List<String> fileNames;
- try
- {
- File[] schemaFiles = schemaDir.listFiles(new SchemaHandler.SchemaFileFilter());
- fileNames = new ArrayList<>(schemaFiles.length);
- for (File f : schemaFiles)
- {
- if (f.isFile())
- {
- fileNames.add(f.getName());
- }
- }
- Collections.sort(fileNames);
- return fileNames;
- }
- catch (Exception e)
- {
- throw new InitializationException(ERR_CONFIG_SCHEMA_CANNOT_LIST_FILES.get(schemaDir, e.getMessage()), e);
- }
- }
-
/**
* Returns a basic version of the schema. The schema is created and contains
* enough definitions for the schema to be loaded.
--
Gitblit v1.10.0