From 6f5e10b0dc596c8e7625de7ddf523b6d5bc220c7 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Thu, 27 Feb 2014 08:17:06 +0000
Subject: [PATCH] Checkpoint for OPENDJ-1303 "opendj-cli" / Checkpoint OPENDJ-1343 Migrate dsconfig - Added CONFLICTING_ARGS to ReturnCode. - Added canWrite() to Utils + unit tests. - Replaced calls to org.opends.quicksetup.util.Utils.canWrite by com.forgerock.opendj.cli.Utils.canWrite. - Removed the TablePrinter classes from org.opends.server.util.table as they are now in the opendj-cli. - Minor code cleanup on DSConfig package. (reorganize imports).
---
opendj3-server-dev/src/server/org/opends/server/tools/InstallDS.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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 f5a1a4f..9b2c091 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,12 +27,13 @@
*/
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.*;
import static org.opends.messages.UtilityMessages.*;
import static com.forgerock.opendj.cli.Utils.CONFIRMATION_MAX_TRIES;
+import static com.forgerock.opendj.cli.Utils.canWrite;
+import static org.forgerock.util.Utils.joinAsString;
import java.io.BufferedReader;
import java.io.File;
@@ -793,7 +794,7 @@
String rejectedFile = argParser.rejectedImportFileArg.getValue();
if (rejectedFile != null)
{
- if (!Utils.canWrite(rejectedFile))
+ if (!canWrite(rejectedFile))
{
errorMessages.add(
ERR_INSTALLDS_CANNOT_WRITE_REJECTED.get(rejectedFile));
@@ -802,7 +803,7 @@
String skippedFile = argParser.skippedImportFileArg.getValue();
if (skippedFile != null)
{
- if (!Utils.canWrite(skippedFile))
+ if (!canWrite(skippedFile))
{
errorMessages.add(ERR_INSTALLDS_CANNOT_WRITE_SKIPPED.get(
skippedFile));
@@ -1323,7 +1324,7 @@
String rejectedFile = argParser.rejectedImportFileArg.getValue();
if (rejectedFile != null)
{
- while (!Utils.canWrite(rejectedFile))
+ while (!canWrite(rejectedFile))
{
println();
println(ERR_INSTALLDS_CANNOT_WRITE_REJECTED.get(rejectedFile));
@@ -1343,7 +1344,7 @@
String skippedFile = argParser.skippedImportFileArg.getValue();
if (skippedFile != null)
{
- while (!Utils.canWrite(skippedFile))
+ while (!canWrite(skippedFile))
{
println();
println(ERR_INSTALLDS_CANNOT_WRITE_SKIPPED.get(skippedFile));
@@ -1491,7 +1492,7 @@
String rejectedFile = argParser.rejectedImportFileArg.getValue();
if (rejectedFile != null)
{
- while (!Utils.canWrite(rejectedFile))
+ while (!canWrite(rejectedFile))
{
println();
println(
@@ -1511,7 +1512,7 @@
String skippedFile = argParser.skippedImportFileArg.getValue();
if (skippedFile != null)
{
- while (!Utils.canWrite(skippedFile))
+ while (!canWrite(skippedFile))
{
println();
println(ERR_INSTALLDS_CANNOT_WRITE_SKIPPED.get(skippedFile));
--
Gitblit v1.10.0