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/JavaPropertiesToolArgumentParser.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/JavaPropertiesToolArgumentParser.java b/opendj3-server-dev/src/server/org/opends/server/tools/JavaPropertiesToolArgumentParser.java
index 4145db5..910b575 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/JavaPropertiesToolArgumentParser.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/JavaPropertiesToolArgumentParser.java
@@ -27,6 +27,7 @@
package org.opends.server.tools;
import static org.opends.messages.ToolMessages.*;
+import static com.forgerock.opendj.cli.Utils.canWrite;
import java.io.File;
import java.util.LinkedHashSet;
@@ -132,7 +133,7 @@
if (value != null)
{
File f = new File(value);
- if (f.isDirectory() || !Utils.canWrite(value))
+ if (f.isDirectory() || !canWrite(value))
{
errorMessages.add(
ERR_JAVAPROPERTIES_WITH_DESTINATION_FILE.get(value));
--
Gitblit v1.10.0