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/Uninstaller.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java b/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java
index 9fad5dc..ce8fe9e 100644
--- a/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java
+++ b/opendj3-server-dev/src/guitools/org/opends/guitools/uninstaller/Uninstaller.java
@@ -29,6 +29,7 @@
import org.opends.quicksetup.*;
+import static org.forgerock.util.Utils.*;
import static org.opends.quicksetup.Step.FINISHED;
import static org.opends.quicksetup.Step.PROGRESS;
import static org.opends.quicksetup.Step.REVIEW;
@@ -672,10 +673,9 @@
String arg;
if (isWindows()) {
arg = installation.getUninstallBatFile() + getLineBreak().toString() +
- getTab() + getStringFromCollection(paths,
- getLineBreak().toString());
+ getTab() + joinAsString(getLineBreak().toString(), paths);
} else {
- arg = getStringFromCollection(paths, getLineBreak().toString());
+ arg = joinAsString(getLineBreak().toString(), paths);
}
successMsg =
INFO_SUMMARY_UNINSTALL_FINISHED_SUCCESSFULLY_REMOVE_JARFILES_CLI
@@ -686,8 +686,7 @@
} else {
if (getUninstallUserData().getRemoveLibrariesAndTools()) {
String formattedPath =
- addWordBreaks(
- getStringFromCollection(paths, getLineBreak().toString()), 60, 5);
+ addWordBreaks(joinAsString(getLineBreak().toString(), paths), 60, 5);
successMsg =
INFO_SUMMARY_UNINSTALL_FINISHED_SUCCESSFULLY_REMOVE_JARFILES
.get(formattedPath);
--
Gitblit v1.10.0