From 310df200f78f7d98cc52e4ab97d8a5feb744fa52 Mon Sep 17 00:00:00 2001
From: Jean-Noël Rouvignac <jean-noel.rouvignac@forgerock.com>
Date: Thu, 28 Apr 2016 09:04:35 +0000
Subject: [PATCH] UCDetector and AutoRefactor code cleanup
---
opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDSArgumentParser.java | 36 ++++++++++++++++--------------------
1 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDSArgumentParser.java b/opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDSArgumentParser.java
index a969cbb..6a08ca8 100644
--- a/opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDSArgumentParser.java
+++ b/opendj-server-legacy/src/main/java/org/opends/server/tools/InstallDSArgumentParser.java
@@ -16,16 +16,17 @@
*/
package org.opends.server.tools;
+import static com.forgerock.opendj.cli.ArgumentConstants.*;
import static com.forgerock.opendj.cli.CliMessages.INFO_JMXPORT_PLACEHOLDER;
import static com.forgerock.opendj.cli.CliMessages.INFO_KEYSTORE_PWD_FILE_PLACEHOLDER;
import static com.forgerock.opendj.cli.CliMessages.INFO_NUM_ENTRIES_PLACEHOLDER;
import static com.forgerock.opendj.cli.CliMessages.INFO_PORT_PLACEHOLDER;
import static com.forgerock.opendj.cli.CliMessages.INFO_ROOT_USER_PWD_FILE_PLACEHOLDER;
-import static com.forgerock.opendj.cli.Utils.addErrorMessageIfArgumentsConflict;
-import static org.opends.messages.ToolMessages.*;
-import static com.forgerock.opendj.cli.ArgumentConstants.*;
-import static com.forgerock.opendj.util.OperatingSystem.*;
import static com.forgerock.opendj.cli.CommonArguments.*;
+import static com.forgerock.opendj.cli.Utils.addErrorMessageIfArgumentsConflict;
+import static com.forgerock.opendj.util.OperatingSystem.*;
+
+import static org.opends.messages.ToolMessages.*;
import java.util.Collection;
import java.util.HashSet;
@@ -63,14 +64,14 @@
{
private static final LocalizedLogger logger = LocalizedLogger.getLoggerForThisClass();
- BooleanArgument cliArg;
+ private BooleanArgument cliArg;
BooleanArgument addBaseEntryArg;
- BooleanArgument showUsageArg;
+ private BooleanArgument showUsageArg;
BooleanArgument quietArg;
BooleanArgument noPromptArg;
BooleanArgument verboseArg;
- StringArgument propertiesFileArgument;
- BooleanArgument noPropertiesFileArgument;
+ private StringArgument propertiesFileArgument;
+ private BooleanArgument noPropertiesFileArgument;
BooleanArgument skipPortCheckArg;
BooleanArgument enableWindowsServiceArg;
BooleanArgument doNotStartArg;
@@ -78,8 +79,8 @@
BooleanArgument generateSelfSignedCertificateArg;
StringArgument hostNameArg;
BooleanArgument usePkcs11Arg;
- FileBasedArgument directoryManagerPwdFileArg;
- FileBasedArgument keyStorePasswordFileArg;
+ private FileBasedArgument directoryManagerPwdFileArg;
+ private FileBasedArgument keyStorePasswordFileArg;
IntegerArgument ldapPortArg;
IntegerArgument adminConnectorPortArg;
IntegerArgument ldapsPortArg;
@@ -90,14 +91,14 @@
StringArgument rejectedImportFileArg;
StringArgument skippedImportFileArg;
StringArgument directoryManagerDNArg;
- StringArgument directoryManagerPwdStringArg;
+ private StringArgument directoryManagerPwdStringArg;
StringArgument useJavaKeyStoreArg;
StringArgument useJCEKSArg;
StringArgument usePkcs12Arg;
- StringArgument keyStorePasswordArg;
+ private StringArgument keyStorePasswordArg;
StringArgument certNicknameArg;
- StringArgument progNameArg;
- IntegerArgument connectTimeoutArg;
+ private StringArgument progNameArg;
+ private IntegerArgument connectTimeoutArg;
BooleanArgument acceptLicense;
StringArgument backendTypeArg;
@@ -418,7 +419,6 @@
return cliArg.isPresent();
}
- /** {@inheritDoc} */
@Override
public void parseArguments(String[] args) throws ArgumentException
{
@@ -539,14 +539,10 @@
private void checkPortAlreadyUsed(Set<Integer> ports, int port, Collection<LocalizableMessage> errorMessages,
Arg1<Object> errorMsg)
{
- if (ports.contains(port))
+ if (!ports.add(port))
{
errorMessages.add(errorMsg.get(port));
}
- else
- {
- ports.add(port);
- }
}
/**
--
Gitblit v1.10.0