From 88cdfff756887b6d8d1cedc3bb6d5db82ecdac48 Mon Sep 17 00:00:00 2001
From: Jean-Noel Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Mon, 03 Feb 2014 15:46:52 +0000
Subject: [PATCH] Factorized a lot of String joining code into Utils.joinAsString().
---
opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/NewSchemaElementsTask.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 deletions(-)
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/NewSchemaElementsTask.java b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/NewSchemaElementsTask.java
index cae261d..53e0991 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/NewSchemaElementsTask.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/controlpanel/task/NewSchemaElementsTask.java
@@ -27,6 +27,7 @@
package org.opends.guitools.controlpanel.task;
+import static org.forgerock.util.Utils.*;
import static org.opends.messages.AdminToolMessages.*;
import java.io.File;
@@ -49,7 +50,6 @@
import org.opends.guitools.controlpanel.ui.ProgressDialog;
import org.opends.guitools.controlpanel.util.Utilities;
import org.forgerock.i18n.LocalizableMessage;
-import org.opends.quicksetup.util.Utils;
import org.opends.server.config.ConfigConstants;
import org.opends.server.core.DirectoryServer;
import org.opends.server.types.AttributeType;
@@ -178,19 +178,17 @@
}
if (ocNames.isEmpty())
{
- return INFO_CTRL_PANEL_NEW_ATTRIBUTES_TASK_DESCRIPTION.get(
- Utils.getStringFromCollection(attrNames, ", "));
+ return INFO_CTRL_PANEL_NEW_ATTRIBUTES_TASK_DESCRIPTION.get(joinAsString(", ", attrNames));
}
else if (attrNames.isEmpty())
{
- return INFO_CTRL_PANEL_NEW_OBJECTCLASSES_TASK_DESCRIPTION.get(
- Utils.getStringFromCollection(ocNames, ", "));
+ return INFO_CTRL_PANEL_NEW_OBJECTCLASSES_TASK_DESCRIPTION.get(joinAsString(", ", ocNames));
}
else
{
return INFO_CTRL_PANEL_NEW_SCHEMA_ELEMENTS_TASK_DESCRIPTION.get(
- Utils.getStringFromCollection(attrNames, ", "),
- Utils.getStringFromCollection(ocNames, ", "));
+ joinAsString(", ", attrNames),
+ joinAsString(", ", ocNames));
}
}
}
@@ -602,7 +600,7 @@
StringBuilder sb = new StringBuilder();
sb.append(
INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_ADD_SCHEMA_ELEMENT_OFFLINE.get(
- Utils.getStringFromCollection(names, ", "),
+ joinAsString(", ", names),
schemaFile))
.append("<br><b>");
for (AttributeType attribute : attributes)
@@ -624,7 +622,7 @@
{
StringBuilder sb = new StringBuilder();
sb.append(INFO_CTRL_PANEL_EQUIVALENT_CMD_TO_ADD_SCHEMA_ENTRY_OFFLINE.get(
- Utils.getStringFromCollection(names, ", "),
+ joinAsString(", ", names),
schemaFile)).append("<br><b>");
for (String line : getSchemaEntryLines())
{
--
Gitblit v1.10.0