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/server/org/opends/server/tools/InstallDS.java | 10 ++++------
1 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/InstallDS.java b/opendj3-server-dev/src/server/org/opends/server/tools/InstallDS.java
index 92ca864..aa26bd0 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/InstallDS.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/InstallDS.java
@@ -27,6 +27,7 @@
*/
package org.opends.server.tools;
+import static org.forgerock.util.Utils.*;
import static org.opends.messages.AdminToolMessages.*;
import static org.opends.messages.QuickSetupMessages.*;
import static org.opends.messages.ToolMessages.*;
@@ -771,8 +772,7 @@
}
if (nonExistingFiles.size() > 0)
{
- errorMessages.add(ERR_INSTALLDS_NO_SUCH_LDIF_FILE.get(
- Utils.getStringFromCollection(nonExistingFiles, ", ")));
+ errorMessages.add(ERR_INSTALLDS_NO_SUCH_LDIF_FILE.get(joinAsString(", ", nonExistingFiles)));
}
String rejectedFile = argParser.rejectedImportFileArg.getValue();
if (rejectedFile != null)
@@ -1278,8 +1278,7 @@
if (nonExistingFiles.size() > 0)
{
println();
- println(ERR_INSTALLDS_NO_SUCH_LDIF_FILE.get(
- Utils.getStringFromCollection(nonExistingFiles, ", ")));
+ println(ERR_INSTALLDS_NO_SUCH_LDIF_FILE.get(joinAsString(", ", nonExistingFiles)));
}
while (importLDIFFiles.isEmpty())
{
@@ -1942,8 +1941,7 @@
else if (certManager.hasRealAliases())
{
Collections.addAll(nicknameList, aliases);
- String aliasString = Utils.getStringFromCollection(nicknameList,
- ", ");
+ String aliasString = joinAsString(", ", nicknameList);
if (certNickname != null)
{
// Check if the certificate alias is in the list.
--
Gitblit v1.10.0