From 9062c6b2f810433fa2fd65aa4d8ba2f57a290d8c Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Tue, 09 Jun 2015 07:11:00 +0000
Subject: [PATCH] Further code cleanup after Gaetan's
---
opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewSchemaElementsTask.java | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewSchemaElementsTask.java b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewSchemaElementsTask.java
index e50be8f..264fb20 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewSchemaElementsTask.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/task/NewSchemaElementsTask.java
@@ -76,8 +76,8 @@
*/
public class NewSchemaElementsTask extends Task
{
- final Set<ObjectClass> ocsToAdd = new LinkedHashSet<>();
- final Set<AttributeType> attrsToAdd = new LinkedHashSet<>();
+ private final Set<ObjectClass> ocsToAdd = new LinkedHashSet<>();
+ private final Set<AttributeType> attrsToAdd = new LinkedHashSet<>();
/**
* Constructor of the task.
@@ -174,7 +174,7 @@
}
}
- private <T extends CommonSchemaElements> List<String> getElementsNameOrOID(final Set<T> schemaElements)
+ private <T extends CommonSchemaElements> List<String> getElementsNameOrOID(final Collection<T> schemaElements)
{
final List<String> nameOrOIDs = new ArrayList<>();
for (CommonSchemaElements schemaElement : schemaElements)
@@ -464,11 +464,7 @@
private String equivalentCommandToAddOffline(
String schemaFile, boolean isSchemaFileDefined, List<CommonSchemaElements> schemaElements)
{
- List<String> names = new ArrayList<>();
- for (CommonSchemaElements schemaElement : schemaElements)
- {
- names.add(schemaElement.getNameOrOID());
- }
+ List<String> names = getElementsNameOrOID(schemaElements);
final String namesString = joinAsString(", ", names);
final StringBuilder sb = new StringBuilder();
--
Gitblit v1.10.0