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-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallerArgumentParser.java | 32 +++++++-------------------------
1 files changed, 7 insertions(+), 25 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallerArgumentParser.java b/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallerArgumentParser.java
index 6ec2d46..7b0261f 100644
--- a/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallerArgumentParser.java
+++ b/opendj-server-legacy/src/main/java/org/opends/guitools/uninstaller/UninstallerArgumentParser.java
@@ -365,31 +365,13 @@
}
buf.append(message);
}
- if (removeAllArg.isPresent())
- {
- BooleanArgument[] removeArgs = {
- removeServerLibrariesArg,
- removeDatabasesArg,
- removeLogFilesArg,
- removeConfigurationFilesArg,
- removeBackupFilesArg,
- removeLDIFFilesArg
- };
- for (BooleanArgument removeArg : removeArgs)
- {
- if (removeArg.isPresent())
- {
- LocalizableMessage message = ERR_TOOL_CONFLICTING_ARGS.get(
- removeAllArg.getLongIdentifier(),
- removeArg.getLongIdentifier());
- if (buf.length() > 0)
- {
- buf.append(LINE_SEPARATOR);
- }
- buf.append(message);
- }
- }
- }
+
+ appendErrorMessageIfArgumentsConflict(buf, removeAllArg, removeServerLibrariesArg);
+ appendErrorMessageIfArgumentsConflict(buf, removeAllArg, removeDatabasesArg);
+ appendErrorMessageIfArgumentsConflict(buf, removeAllArg, removeLogFilesArg);
+ appendErrorMessageIfArgumentsConflict(buf, removeAllArg, removeConfigurationFilesArg);
+ appendErrorMessageIfArgumentsConflict(buf, removeAllArg, removeBackupFilesArg);
+ appendErrorMessageIfArgumentsConflict(buf, removeAllArg, removeLDIFFilesArg);
super.validateGlobalOptions(buf);
if (buf.length() > 0)
{
--
Gitblit v1.10.0