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/uninstaller/UninstallCliHelper.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java b/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java
index 3be70a5..e63e321 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/UninstallCliHelper.java
@@ -24,7 +24,6 @@
* Copyright 2006-2010 Sun Microsystems, Inc.
* Portions Copyright 2014 ForgeRock AS
*/
-
package org.opends.guitools.uninstaller;
import org.opends.server.admin.client.cli.DsFrameworkCliReturnCode;
@@ -40,6 +39,7 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.i18n.LocalizableMessageBuilder;
+import static org.forgerock.util.Utils.*;
import static org.opends.messages.AdminToolMessages.*;
import static org.opends.messages.QuickSetupMessages.*;
@@ -61,7 +61,6 @@
import org.opends.server.util.cli.MenuBuilder;
import org.opends.server.util.cli.MenuResult;
-
import java.util.HashSet;
import java.util.LinkedHashSet;
import java.util.Set;
@@ -408,11 +407,9 @@
INFO_CLI_UNINSTALL_CONFIRM_BACKUPS.get(),
INFO_CLI_UNINSTALL_CONFIRM_LDIFS.get(),
INFO_CLI_UNINSTALL_CONFIRM_OUTSIDEDBS.get(
- Utils.getStringFromCollection(outsideDbs,
- Constants.LINE_SEPARATOR)),
+ joinAsString(Constants.LINE_SEPARATOR, outsideDbs)),
INFO_CLI_UNINSTALL_CONFIRM_OUTSIDELOGS.get(
- Utils.getStringFromCollection(outsideLogs,
- Constants.LINE_SEPARATOR)
+ joinAsString(Constants.LINE_SEPARATOR, outsideLogs)
)
};
--
Gitblit v1.10.0