From 6ea56ecde3d05b84f42a7338d7c2c159817d00d0 Mon Sep 17 00:00:00 2001
From: Gaetan Boismal <gaetan.boismal@forgerock.com>
Date: Tue, 01 Mar 2016 09:44:57 +0000
Subject: [PATCH] Code cleanup
---
opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java | 15 ++++-----------
1 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java
index 084f433..0a17248 100644
--- a/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java
+++ b/opendj-config/src/main/java/org/forgerock/opendj/config/dsconfig/DSConfig.java
@@ -1136,15 +1136,15 @@
}
private void checkForConflictingArguments() throws ArgumentException {
- throwIfConflictingArgsSet(quietArgument, verboseArgument);
- throwIfConflictingArgsSet(batchArgument, batchFileArgument);
+ throwIfArgumentsConflict(quietArgument, verboseArgument);
+ throwIfArgumentsConflict(batchArgument, batchFileArgument);
throwIfSetInInteractiveMode(batchFileArgument);
throwIfSetInInteractiveMode(batchArgument);
throwIfSetInInteractiveMode(quietArgument);
- throwIfConflictingArgsSet(scriptFriendlyArgument, verboseArgument);
- throwIfConflictingArgsSet(noPropertiesFileArgument, propertiesFileArgument);
+ throwIfArgumentsConflict(scriptFriendlyArgument, verboseArgument);
+ throwIfArgumentsConflict(noPropertiesFileArgument, propertiesFileArgument);
}
private void throwIfSetInInteractiveMode(Argument arg) throws ArgumentException {
@@ -1154,13 +1154,6 @@
}
}
- private void throwIfConflictingArgsSet(Argument arg1, Argument arg2) throws ArgumentException {
- if (arg1.isPresent() && arg2.isPresent()) {
- throw new ArgumentException(ERR_TOOL_CONFLICTING_ARGS.get(
- arg1.getLongIdentifier(), arg2.getLongIdentifier()));
- }
- }
-
/** Run the top-level interactive console. */
private int runInteractiveMode() {
ConsoleApplication app = this;
--
Gitblit v1.10.0