From 087cf569ae8c80453d6f0926bda8c0aad8a93598 Mon Sep 17 00:00:00 2001
From: Violette Roche-Montane <violette.roche-montane@forgerock.com>
Date: Mon, 24 Feb 2014 10:11:29 +0000
Subject: [PATCH] Checkpoint for OPENDJ-1303 "opendj-cli" - Replaced some argument names by their long identifier.toLowerCase() (in CommonArguments ). - Replaced "trustAll" -> CommonArguments.getTrustAll() - Replaced "showUsage"/"help" -> CommonArguments.getShowUsage() - Renamed sslBlindTrust by trustAll in LDAPPasswordModify.java - Added OPTION_LONG_RESTART to ArgumentConstants. - Replaced "restart" string in StopDS.java by OPTION_LONG_RESTART. - Replaced argument declaration by CommonArguments.getRestart().
---
opendj3-server-dev/src/server/org/opends/server/tools/LDAPPasswordModify.java | 17 +--
opendj3-server-dev/src/server/org/opends/server/tools/LDAPCompare.java | 8 -
opendj3-server-dev/src/server/org/opends/server/tools/StopDS.java | 21 +--
opendj3-server-dev/src/server/org/opends/server/tools/LDAPSearch.java | 8 -
opendj3-server-dev/src/server/org/opends/server/tools/BackUpDB.java | 7 -
opendj3-server-dev/src/server/org/opends/server/tools/EncodePassword.java | 5
opendj3-server-dev/src/server/org/opends/server/tools/RebuildIndex.java | 4
opendj3-server-dev/src/server/org/opends/server/tools/LDIFModify.java | 5
opendj3-server-dev/src/server/org/opends/server/tools/RestoreDB.java | 5
opendj3-server-dev/src/server/org/opends/server/tools/LDIFDiff.java | 5
opendj3-server-dev/src/server/org/opends/server/tools/ManageTasks.java | 12 -
opendj3-server-dev/src/server/org/opends/server/plugins/profiler/ProfileViewer.java | 7
opendj3-server-dev/src/server/org/opends/server/tools/DBTest.java | 5
opendj3-server-dev/src/server/org/opends/server/tools/ManageAccount.java | 8 -
opendj3-server-dev/src/server/org/opends/server/tools/LDAPModify.java | 8 -
opendj3-server-dev/src/server/org/opends/server/tools/ConfigureDS.java | 5
opendj3-server-dev/src/server/org/opends/server/tools/WaitForFileDelete.java | 7 -
opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/DSConfig.java | 37 +------
opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentConstants.java | 6 +
opendj3-server-dev/src/server/org/opends/server/tools/LDIFSearch.java | 5
opendj3-server-dev/src/server/org/opends/server/tools/ConfigureWindowsService.java | 5
opendj3-server-dev/src/server/org/opends/server/tools/ListBackends.java | 7
opendj3-server-dev/src/server/org/opends/server/tools/CreateRCScript.java | 4
opendj3-server-dev/src/server/org/opends/server/tools/ImportLDIF.java | 5
opendj3-server-dev/src/server/org/opends/server/tools/LDAPDelete.java | 8 -
opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java | 4
opendj3-server-dev/src/server/org/opends/server/tools/VerifyIndex.java | 5
opendj-cli/src/main/java/com/forgerock/opendj/cli/CommonArguments.java | 38 ++++---
opendj3-server-dev/src/server/org/opends/server/tools/ExportLDIF.java | 6
29 files changed, 101 insertions(+), 166 deletions(-)
diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentConstants.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentConstants.java
index d1a0834..3400149 100644
--- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentConstants.java
+++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/ArgumentConstants.java
@@ -705,6 +705,12 @@
* The value for the long option ignore errors.
*/
public static final String OPTION_LONG_IGNORE_ERRORS = "ignoreErrors";
+
+ /**
+ * Value for the restart option long form.
+ */
+ public static final String OPTION_LONG_RESTART = "restart";
+
// Prevent instantiation.
private ArgumentConstants() {
diff --git a/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommonArguments.java b/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommonArguments.java
index dd03b6d..7efc1fc 100644
--- a/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommonArguments.java
+++ b/opendj-cli/src/main/java/com/forgerock/opendj/cli/CommonArguments.java
@@ -41,14 +41,15 @@
}
/**
- * Returns the "show usage" boolean argument.
+ * Returns the "show usage / help" boolean argument.
*
* @return The "show usage" argument.
* @throws ArgumentException
* If there is a problem with any of the parameters used to create this argument.
*/
public static BooleanArgument getShowUsage() throws ArgumentException {
- return new BooleanArgument("showUsage", OPTION_SHORT_HELP, OPTION_LONG_HELP, INFO_DESCRIPTION_SHOWUSAGE.get());
+ return new BooleanArgument(OPTION_LONG_HELP.toLowerCase(), OPTION_SHORT_HELP, OPTION_LONG_HELP,
+ INFO_DESCRIPTION_SHOWUSAGE.get());
}
/**
@@ -59,8 +60,8 @@
* If there is a problem with any of the parameters used to create this argument.
*/
public static BooleanArgument getVerbose() throws ArgumentException {
- final BooleanArgument verbose = new BooleanArgument("verbose", OPTION_SHORT_VERBOSE, "verbose",
- INFO_DESCRIPTION_VERBOSE.get());
+ final BooleanArgument verbose = new BooleanArgument(OPTION_LONG_VERBOSE.toLowerCase(), OPTION_SHORT_VERBOSE,
+ OPTION_LONG_VERBOSE, INFO_DESCRIPTION_VERBOSE.get());
verbose.setPropertyName("verbose");
return verbose;
}
@@ -79,7 +80,9 @@
}
/**
- * Returns the "port" integer argument.
+ * Returns the "port" integer argument. <br>
+ * <i> N.B : the 'p' short option is also used by skipdecode(DBTest),
+ * propertiesFile(JavaPropertiesToolArguments).</i>
*
* @param defaultPort
* The default port number.
@@ -91,8 +94,8 @@
*/
public static IntegerArgument getPort(final int defaultPort, final LocalizableMessage description)
throws ArgumentException {
- return new IntegerArgument("port", OPTION_SHORT_PORT, OPTION_LONG_PORT, false, false, true,
- INFO_PORT_PLACEHOLDER.get(), defaultPort, OPTION_LONG_PORT, true, 1, true, 65535,
+ return new IntegerArgument(OPTION_LONG_PORT.toLowerCase(), OPTION_SHORT_PORT, OPTION_LONG_PORT, false, false,
+ true, INFO_PORT_PLACEHOLDER.get(), defaultPort, OPTION_LONG_PORT, true, 1, true, 65535,
description != null ? description : INFO_DESCRIPTION_ADMIN_PORT.get());
}
@@ -122,15 +125,15 @@
}
/**
- * Returns the "get properties file" string argument.
+ * Returns the "propertiesFilePath" string argument.
*
- * @return The "get properties file" argument.
+ * @return The "propertiesFilePath" argument.
* @throws ArgumentException
* If there is a problem with any of the parameters used to create this argument.
*/
public static StringArgument getPropertiesFile() throws ArgumentException {
- return new StringArgument("propertiesFilePath", null, OPTION_LONG_PROP_FILE_PATH, false, false, true,
- INFO_PROP_FILE_PATH_PLACEHOLDER.get(), null, null, INFO_DESCRIPTION_PROP_FILE_PATH.get());
+ return new StringArgument(OPTION_LONG_PROP_FILE_PATH.toLowerCase(), null, OPTION_LONG_PROP_FILE_PATH, false,
+ false, true, INFO_PROP_FILE_PATH_PLACEHOLDER.get(), null, null, INFO_DESCRIPTION_PROP_FILE_PATH.get());
}
/**
@@ -154,7 +157,7 @@
* If there is a problem with any of the parameters used to create this argument.
*/
public static BooleanArgument getNoPropertiesFile() throws ArgumentException {
- return new BooleanArgument("noPropertiesFile", null, OPTION_LONG_NO_PROP_FILE,
+ return new BooleanArgument(OPTION_LONG_NO_PROP_FILE.toLowerCase(), null, OPTION_LONG_NO_PROP_FILE,
INFO_DESCRIPTION_NO_PROP_FILE.get());
}
@@ -228,7 +231,8 @@
}
/**
- * Returns the "no-op" boolean argument.
+ * Returns the "no-op" boolean argument. <br>
+ * <i> N.B : the 'n' short option is also used by backendid, newGroupName, newPassword, no-prompt.</i>
*
* @return The "no-op" argument.
* @throws ArgumentException
@@ -239,7 +243,8 @@
}
/**
- * Returns the "no-prompt" boolean argument.
+ * Returns the "no-prompt" boolean argument. <br>
+ * <i> N.B : the 'n' short option is also used by backendid, newGroupName, newPassword, no-prompt.</i>
*
* @return The "no-prompt" argument.
* @throws ArgumentException
@@ -666,8 +671,9 @@
* If there is a problem with any of the parameters used to create this argument.
*/
public static BooleanArgument getRestart() throws ArgumentException {
- final BooleanArgument restart = new BooleanArgument("restart", 'R', "restart", INFO_DESCRIPTION_RESTART.get());
- restart.setPropertyName("restart");
+ final BooleanArgument restart = new BooleanArgument(OPTION_LONG_RESTART.toLowerCase(), 'R',
+ OPTION_LONG_RESTART, INFO_DESCRIPTION_RESTART.get());
+ restart.setPropertyName(OPTION_LONG_RESTART);
return restart;
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java b/opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java
index f154530..4358b19 100644
--- a/opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/core/DirectoryServer.java
@@ -85,6 +85,7 @@
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.ArgumentParser;
import com.forgerock.opendj.cli.BooleanArgument;
+import com.forgerock.opendj.cli.CommonArguments;
import com.forgerock.opendj.cli.IntegerArgument;
import com.forgerock.opendj.cli.StringArgument;
@@ -8892,8 +8893,7 @@
0, INFO_DSCORE_DESCRIPTION_TIMEOUT.get());
argParser.addArgument(timeout);
- displayUsage = new BooleanArgument("help", 'H', "help",
- INFO_DSCORE_DESCRIPTION_USAGE.get());
+ displayUsage = CommonArguments.getShowUsage();
argParser.addArgument(displayUsage);
argParser.setUsageArgument(displayUsage);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/plugins/profiler/ProfileViewer.java b/opendj3-server-dev/src/server/org/opends/server/plugins/profiler/ProfileViewer.java
index 6ca78ee..e334a81 100644
--- a/opendj3-server-dev/src/server/org/opends/server/plugins/profiler/ProfileViewer.java
+++ b/opendj3-server-dev/src/server/org/opends/server/plugins/profiler/ProfileViewer.java
@@ -33,6 +33,7 @@
import java.io.IOException;
import java.util.Arrays;
import java.util.HashMap;
+
import javax.swing.JEditorPane;
import javax.swing.JFrame;
import javax.swing.JScrollPane;
@@ -49,9 +50,11 @@
import org.forgerock.i18n.LocalizableMessage;
import org.forgerock.opendj.io.ASN1;
import org.forgerock.opendj.io.ASN1Reader;
+
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.ArgumentParser;
import com.forgerock.opendj.cli.BooleanArgument;
+import com.forgerock.opendj.cli.CommonArguments;
import com.forgerock.opendj.cli.StringArgument;
import static org.opends.messages.PluginMessages.*;
@@ -126,9 +129,7 @@
INFO_PROFILEVIEWER_DESCRIPTION_USE_GUI.get());
argParser.addArgument(useGUI);
- displayUsage = new BooleanArgument(
- "help", 'H', "help",
- INFO_PROFILEVIEWER_DESCRIPTION_USAGE.get());
+ displayUsage = CommonArguments.getShowUsage();
argParser.addArgument(displayUsage);
argParser.setUsageArgument(displayUsage);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/BackUpDB.java b/opendj3-server-dev/src/server/org/opends/server/tools/BackUpDB.java
index 1ea9626..00b8c21 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/BackUpDB.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/BackUpDB.java
@@ -71,6 +71,7 @@
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.BooleanArgument;
import com.forgerock.opendj.cli.ClientException;
+import com.forgerock.opendj.cli.CommonArguments;
import com.forgerock.opendj.cli.StringArgument;
import static org.opends.messages.ToolMessages.*;
@@ -262,11 +263,7 @@
argParser.addArgument(signHash);
- displayUsage =
- new BooleanArgument(
- "help", OPTION_SHORT_HELP,
- OPTION_LONG_HELP,
- INFO_DESCRIPTION_USAGE.get());
+ displayUsage = CommonArguments.getShowUsage();
argParser.addArgument(displayUsage);
argParser.setUsageArgument(displayUsage);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/ConfigureDS.java b/opendj3-server-dev/src/server/org/opends/server/tools/ConfigureDS.java
index 7180fcf..f97a52a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/ConfigureDS.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/ConfigureDS.java
@@ -69,6 +69,7 @@
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.ArgumentParser;
import com.forgerock.opendj.cli.BooleanArgument;
+import com.forgerock.opendj.cli.CommonArguments;
import com.forgerock.opendj.cli.FileBasedArgument;
import com.forgerock.opendj.cli.IntegerArgument;
import com.forgerock.opendj.cli.StringArgument;
@@ -357,9 +358,7 @@
INFO_CONFIGDS_DESCRIPTION_ROOT_PW_FILE.get());
argParser.addArgument(rootPasswordFile);
- showUsage = new BooleanArgument("showusage", OPTION_SHORT_HELP,
- OPTION_LONG_HELP,
- INFO_DESCRIPTION_USAGE.get());
+ showUsage = CommonArguments.getShowUsage();
argParser.addArgument(showUsage);
argParser.setUsageArgument(showUsage);
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/ConfigureWindowsService.java b/opendj3-server-dev/src/server/org/opends/server/tools/ConfigureWindowsService.java
index 5d1dc44..4108796 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/ConfigureWindowsService.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/ConfigureWindowsService.java
@@ -46,6 +46,7 @@
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.ArgumentParser;
import com.forgerock.opendj.cli.BooleanArgument;
+import com.forgerock.opendj.cli.CommonArguments;
import com.forgerock.opendj.cli.StringArgument;
import static org.opends.messages.ToolMessages.*;
@@ -234,9 +235,7 @@
INFO_CONFIGURE_WINDOWS_SERVICE_DESCRIPTION_CLEANUP.get());
argParser.addArgument(cleanupService);
- showUsage = new BooleanArgument("showusage", OPTION_SHORT_HELP,
- OPTION_LONG_HELP,
- INFO_CONFIGURE_WINDOWS_SERVICE_DESCRIPTION_SHOWUSAGE.get());
+ showUsage = CommonArguments.getShowUsage();
argParser.addArgument(showUsage);
argParser.setUsageArgument(showUsage, out);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/CreateRCScript.java b/opendj3-server-dev/src/server/org/opends/server/tools/CreateRCScript.java
index 679d5d2..1f4e50e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/CreateRCScript.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/CreateRCScript.java
@@ -45,6 +45,7 @@
import com.forgerock.opendj.cli.ArgumentParser;
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.BooleanArgument;
+import com.forgerock.opendj.cli.CommonArguments;
import com.forgerock.opendj.cli.StringArgument;
import static org.opends.messages.ToolMessages.*;
@@ -159,8 +160,7 @@
argParser.addArgument(javaArgs);
- showUsage = new BooleanArgument("help", 'H', "help",
- INFO_DESCRIPTION_SHOWUSAGE.get());
+ showUsage = CommonArguments.getShowUsage();
argParser.addArgument(showUsage);
argParser.setUsageArgument(showUsage);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/DBTest.java b/opendj3-server-dev/src/server/org/opends/server/tools/DBTest.java
index 7e4a148..67c987f 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/DBTest.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/DBTest.java
@@ -51,6 +51,7 @@
import com.forgerock.opendj.cli.Argument;
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.BooleanArgument;
+import com.forgerock.opendj.cli.CommonArguments;
import com.forgerock.opendj.cli.IntegerArgument;
import com.forgerock.opendj.cli.StringArgument;
import com.forgerock.opendj.cli.SubCommand;
@@ -200,9 +201,7 @@
configFile.setHidden(true);
- showUsageArgument =
- new BooleanArgument("help", OPTION_SHORT_HELP, OPTION_LONG_HELP,
- INFO_DESCRIPTION_USAGE.get());
+ showUsageArgument = CommonArguments.getShowUsage();
// Register the global arguments.
parser.addGlobalArgument(showUsageArgument);
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/EncodePassword.java b/opendj3-server-dev/src/server/org/opends/server/tools/EncodePassword.java
index 6030137..9c4c371 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/EncodePassword.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/EncodePassword.java
@@ -62,6 +62,7 @@
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.ArgumentParser;
import com.forgerock.opendj.cli.BooleanArgument;
+import com.forgerock.opendj.cli.CommonArguments;
import com.forgerock.opendj.cli.FileBasedArgument;
import com.forgerock.opendj.cli.StringArgument;
@@ -243,9 +244,7 @@
argParser.addArgument(useCompareResultCode);
- showUsage = new BooleanArgument("usage", OPTION_SHORT_HELP,
- OPTION_LONG_HELP,
- INFO_DESCRIPTION_USAGE.get());
+ showUsage = CommonArguments.getShowUsage();
argParser.addArgument(showUsage);
argParser.setUsageArgument(showUsage, out);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/ExportLDIF.java b/opendj3-server-dev/src/server/org/opends/server/tools/ExportLDIF.java
index 5b00874..bb1bec9 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/ExportLDIF.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/ExportLDIF.java
@@ -58,6 +58,7 @@
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.BooleanArgument;
+import com.forgerock.opendj.cli.CommonArguments;
import com.forgerock.opendj.cli.IntegerArgument;
import com.forgerock.opendj.cli.StringArgument;
import com.forgerock.opendj.cli.ClientException;
@@ -295,10 +296,7 @@
argParser.addArgument(signHash);
- displayUsage =
- new BooleanArgument("help", OPTION_SHORT_HELP,
- OPTION_LONG_HELP,
- INFO_DESCRIPTION_USAGE.get());
+ displayUsage = CommonArguments.getShowUsage();
argParser.addArgument(displayUsage);
argParser.setUsageArgument(displayUsage);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/ImportLDIF.java b/opendj3-server-dev/src/server/org/opends/server/tools/ImportLDIF.java
index 32625a1..e0b07a7 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/ImportLDIF.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/ImportLDIF.java
@@ -81,6 +81,7 @@
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.BooleanArgument;
+import com.forgerock.opendj.cli.CommonArguments;
import com.forgerock.opendj.cli.IntegerArgument;
import com.forgerock.opendj.cli.StringArgument;
import com.forgerock.opendj.cli.ClientException;
@@ -393,9 +394,7 @@
argParser.addArgument(quietMode);
- displayUsage =
- new BooleanArgument("help", OPTION_SHORT_HELP, OPTION_LONG_HELP,
- INFO_DESCRIPTION_USAGE.get());
+ displayUsage = CommonArguments.getShowUsage();
argParser.addArgument(displayUsage);
argParser.setUsageArgument(displayUsage);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPCompare.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPCompare.java
index bb167ef..1407982 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPCompare.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPCompare.java
@@ -510,9 +510,7 @@
saslOptions.setPropertyName(OPTION_LONG_SASLOPTION);
argParser.addArgument(saslOptions);
- trustAll = new BooleanArgument("trustAll", 'X', "trustAll",
- INFO_DESCRIPTION_TRUSTALL.get());
- trustAll.setPropertyName("trustAll");
+ trustAll = CommonArguments.getTrustAll();
argParser.addArgument(trustAll);
keyStorePath = new StringArgument("keyStorePath",
@@ -640,9 +638,7 @@
verbose = CommonArguments.getVerbose();
argParser.addArgument(verbose);
- showUsage = new BooleanArgument("showUsage", OPTION_SHORT_HELP,
- OPTION_LONG_HELP,
- INFO_DESCRIPTION_SHOWUSAGE.get());
+ showUsage = CommonArguments.getShowUsage();
argParser.addArgument(showUsage);
useCompareResultCode =
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPDelete.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPDelete.java
index fada46d..6934d12 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPDelete.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPDelete.java
@@ -420,9 +420,7 @@
saslOptions.setPropertyName(OPTION_LONG_SASLOPTION);
argParser.addArgument(saslOptions);
- trustAll = new BooleanArgument("trustAll", 'X', "trustAll",
- INFO_DESCRIPTION_TRUSTALL.get());
- trustAll.setPropertyName("trustAll");
+ trustAll = CommonArguments.getTrustAll();
argParser.addArgument(trustAll);
keyStorePath = new StringArgument("keyStorePath",
@@ -548,9 +546,7 @@
verbose = CommonArguments.getVerbose();
argParser.addArgument(verbose);
- showUsage = new BooleanArgument("showUsage", OPTION_SHORT_HELP,
- OPTION_LONG_HELP,
- INFO_DESCRIPTION_SHOWUSAGE.get());
+ showUsage = CommonArguments.getShowUsage();
argParser.addArgument(showUsage);
argParser.setUsageArgument(showUsage, out);
} catch (ArgumentException ae)
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPModify.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPModify.java
index 217db6f..184f80e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPModify.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPModify.java
@@ -707,9 +707,7 @@
saslOptions.setPropertyName(OPTION_LONG_SASLOPTION);
argParser.addArgument(saslOptions);
- trustAll = new BooleanArgument("trustAll", 'X', "trustAll",
- INFO_DESCRIPTION_TRUSTALL.get());
- trustAll.setPropertyName("trustAll");
+ trustAll = CommonArguments.getTrustAll();
argParser.addArgument(trustAll);
keyStorePath = new StringArgument("keyStorePath",
@@ -875,9 +873,7 @@
verbose = CommonArguments.getVerbose();
argParser.addArgument(verbose);
- showUsage = new BooleanArgument("showUsage", OPTION_SHORT_HELP,
- OPTION_LONG_HELP,
- INFO_DESCRIPTION_SHOWUSAGE.get());
+ showUsage = CommonArguments.getShowUsage();
argParser.addArgument(showUsage);
argParser.setUsageArgument(showUsage, out);
} catch (ArgumentException ae)
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPPasswordModify.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPPasswordModify.java
index 8914617..b518c26 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPPasswordModify.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPPasswordModify.java
@@ -49,9 +49,11 @@
import org.forgerock.opendj.ldap.ByteStringBuilder;
import org.opends.server.util.EmbeddedUtils;
import org.opends.server.util.PasswordReader;
+
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.ArgumentParser;
import com.forgerock.opendj.cli.BooleanArgument;
+import com.forgerock.opendj.cli.CommonArguments;
import com.forgerock.opendj.cli.FileBasedArgument;
import com.forgerock.opendj.cli.IntegerArgument;
import com.forgerock.opendj.cli.StringArgument;
@@ -148,7 +150,7 @@
// Create the arguments that will be used by this program.
BooleanArgument provideDNForAuthzID;
BooleanArgument showUsage;
- BooleanArgument sslBlindTrust;
+ BooleanArgument trustAll;
BooleanArgument useSSL;
BooleanArgument useStartTLS;
FileBasedArgument bindPWFile;
@@ -303,11 +305,8 @@
argParser.addArgument(currentPWFile);
- sslBlindTrust =
- new BooleanArgument("blindtrust", 'X', "trustAll",
- INFO_LDAPPWMOD_DESCRIPTION_BLIND_TRUST.get());
- sslBlindTrust.setPropertyName("trustAll");
- argParser.addArgument(sslBlindTrust);
+ trustAll = CommonArguments.getTrustAll();
+ argParser.addArgument(trustAll);
sslKeyStore =
@@ -400,9 +399,7 @@
argParser.addArgument(connectTimeout);
- showUsage = new BooleanArgument("help", OPTION_SHORT_HELP,
- OPTION_LONG_HELP,
- INFO_DESCRIPTION_USAGE.get());
+ showUsage = CommonArguments.getShowUsage();
argParser.addArgument(showUsage);
argParser.setUsageArgument(showUsage, out);
}
@@ -623,7 +620,7 @@
clientAlias = null;
}
SSLConnectionFactory sslConnectionFactory = new SSLConnectionFactory();
- sslConnectionFactory.init(sslBlindTrust.isPresent(),
+ sslConnectionFactory.init(trustAll.isPresent(),
sslKeyStore.getValue(), keyPIN, clientAlias,
sslTrustStore.getValue(), trustPIN);
connectionOptions.setSSLConnectionFactory(sslConnectionFactory);
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPSearch.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPSearch.java
index 488e492..bb2df06 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDAPSearch.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDAPSearch.java
@@ -804,9 +804,7 @@
saslOptions.setPropertyName(OPTION_LONG_SASLOPTION);
argParser.addArgument(saslOptions);
- trustAll = new BooleanArgument("trustAll", 'X', "trustAll",
- INFO_DESCRIPTION_TRUSTALL.get());
- trustAll.setPropertyName("trustAll");
+ trustAll = CommonArguments.getTrustAll();
argParser.addArgument(trustAll);
keyStorePath = new StringArgument("keyStorePath",
@@ -1061,9 +1059,7 @@
verbose = CommonArguments.getVerbose();
argParser.addArgument(verbose);
- showUsage = new BooleanArgument("showUsage", OPTION_SHORT_HELP,
- OPTION_LONG_HELP,
- INFO_DESCRIPTION_SHOWUSAGE.get());
+ showUsage = CommonArguments.getShowUsage();
argParser.addArgument(showUsage);
argParser.setUsageArgument(showUsage, out);
} catch (ArgumentException ae)
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDIFDiff.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDIFDiff.java
index 17094e7..c10c04a 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDIFDiff.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDIFDiff.java
@@ -65,6 +65,7 @@
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.ArgumentParser;
import com.forgerock.opendj.cli.BooleanArgument;
+import com.forgerock.opendj.cli.CommonArguments;
import com.forgerock.opendj.cli.StringArgument;
import static org.opends.messages.ToolMessages.*;
@@ -235,9 +236,7 @@
configClass.setHidden(true);
argParser.addArgument(configClass);
- showUsage = new BooleanArgument("showusage", OPTION_SHORT_HELP,
- OPTION_LONG_HELP,
- INFO_DESCRIPTION_USAGE.get());
+ showUsage = CommonArguments.getShowUsage();
argParser.addArgument(showUsage);
useCompareResultCode =
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDIFModify.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDIFModify.java
index ff4b806..c048943 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDIFModify.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDIFModify.java
@@ -69,6 +69,7 @@
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.ArgumentParser;
import com.forgerock.opendj.cli.BooleanArgument;
+import com.forgerock.opendj.cli.CommonArguments;
import com.forgerock.opendj.cli.StringArgument;
import static org.opends.messages.ToolMessages.*;
@@ -479,9 +480,7 @@
argParser.addArgument(targetFile);
- showUsage = new BooleanArgument("help", OPTION_SHORT_HELP,
- OPTION_LONG_HELP,
- INFO_LDIFMODIFY_DESCRIPTION_HELP.get());
+ showUsage = CommonArguments.getShowUsage();
argParser.addArgument(showUsage);
argParser.setUsageArgument(showUsage);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/LDIFSearch.java b/opendj3-server-dev/src/server/org/opends/server/tools/LDIFSearch.java
index 4e10e0b..54a3df6 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/LDIFSearch.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/LDIFSearch.java
@@ -239,10 +239,7 @@
argParser.addArgument(timeLimit);
- showUsage = new BooleanArgument(
- "help", OPTION_SHORT_HELP,
- OPTION_LONG_HELP,
- INFO_DESCRIPTION_USAGE.get());
+ showUsage = CommonArguments.getShowUsage();
argParser.addArgument(showUsage);
argParser.setUsageArgument(showUsage);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/ListBackends.java b/opendj3-server-dev/src/server/org/opends/server/tools/ListBackends.java
index 0b0a6ac..cf9353e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/ListBackends.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/ListBackends.java
@@ -30,6 +30,7 @@
+
import java.io.OutputStream;
import java.io.PrintStream;
import java.util.Iterator;
@@ -53,6 +54,7 @@
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.ArgumentParser;
import com.forgerock.opendj.cli.BooleanArgument;
+import com.forgerock.opendj.cli.CommonArguments;
import com.forgerock.opendj.cli.StringArgument;
import org.opends.server.util.table.TableBuilder;
@@ -183,10 +185,7 @@
argParser.addArgument(baseDN);
- displayUsage = new BooleanArgument(
- "help", OPTION_SHORT_HELP,
- OPTION_LONG_HELP,
- INFO_LISTBACKENDS_DESCRIPTION_HELP.get());
+ displayUsage = CommonArguments.getShowUsage();
argParser.addArgument(displayUsage);
argParser.setUsageArgument(displayUsage, out);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/ManageAccount.java b/opendj3-server-dev/src/server/org/opends/server/tools/ManageAccount.java
index 73b1f38..e46342d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/ManageAccount.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/ManageAccount.java
@@ -903,8 +903,7 @@
INFO_PWPSTATE_DESCRIPTION_SASLOPTIONS.get());
argParser.addGlobalArgument(saslOption);
- trustAll = new BooleanArgument("trustall", 'X', "trustAll",
- INFO_PWPSTATE_DESCRIPTION_TRUST_ALL.get());
+ trustAll = CommonArguments.getTrustAll();
argParser.addGlobalArgument(trustAll);
keyStoreFile = new StringArgument("keystorefile",
@@ -968,10 +967,7 @@
verbose = CommonArguments.getVerbose();
argParser.addGlobalArgument(verbose);
- showUsage = new BooleanArgument(
- "showusage", OPTION_SHORT_HELP,
- OPTION_LONG_HELP,
- INFO_PWPSTATE_DESCRIPTION_SHOWUSAGE.get());
+ showUsage = CommonArguments.getShowUsage();
argParser.addGlobalArgument(showUsage);
argParser.setUsageArgument(showUsage, out);
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/ManageTasks.java b/opendj3-server-dev/src/server/org/opends/server/tools/ManageTasks.java
index f622691..e7fe764 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/ManageTasks.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/ManageTasks.java
@@ -49,6 +49,7 @@
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.BooleanArgument;
import com.forgerock.opendj.cli.ClientException;
+import com.forgerock.opendj.cli.CommonArguments;
import com.forgerock.opendj.cli.StringArgument;
import org.opends.server.util.args.LDAPConnectionArgumentParser;
@@ -257,17 +258,10 @@
INFO_TASKINFO_SUMMARY_ARG_DESCRIPTION.get());
argParser.addArgument(summary);
- noPrompt = new BooleanArgument(
- OPTION_LONG_NO_PROMPT,
- OPTION_SHORT_NO_PROMPT,
- OPTION_LONG_NO_PROMPT,
- INFO_DESCRIPTION_NO_PROMPT.get());
+ noPrompt = CommonArguments.getNoPrompt();
argParser.addArgument(noPrompt);
- BooleanArgument displayUsage = new BooleanArgument(
- "help", OPTION_SHORT_HELP,
- OPTION_LONG_HELP,
- INFO_DESCRIPTION_USAGE.get());
+ BooleanArgument displayUsage = CommonArguments.getShowUsage();
argParser.addArgument(displayUsage);
argParser.setUsageArgument(displayUsage);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/RebuildIndex.java b/opendj3-server-dev/src/server/org/opends/server/tools/RebuildIndex.java
index 56bbb53..dfc7e8d 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/RebuildIndex.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/RebuildIndex.java
@@ -39,6 +39,7 @@
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.BooleanArgument;
+import com.forgerock.opendj.cli.CommonArguments;
import com.forgerock.opendj.cli.StringArgument;
import org.opends.server.util.args.LDAPConnectionArgumentParser;
@@ -315,8 +316,7 @@
null, INFO_REBUILDINDEX_DESCRIPTION_TEMP_DIRECTORY.get());
argParser.addArgument(tmpDirectory);
- BooleanArgument displayUsage =
- new BooleanArgument("help", 'H', "help", INFO_DESCRIPTION_USAGE.get());
+ final BooleanArgument displayUsage = CommonArguments.getShowUsage();
argParser.addArgument(displayUsage);
argParser.setUsageArgument(displayUsage);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/RestoreDB.java b/opendj3-server-dev/src/server/org/opends/server/tools/RestoreDB.java
index 36bf2e3..4b1e225 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/RestoreDB.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/RestoreDB.java
@@ -60,6 +60,7 @@
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.BooleanArgument;
import com.forgerock.opendj.cli.ClientException;
+import com.forgerock.opendj.cli.CommonArguments;
import com.forgerock.opendj.cli.StringArgument;
import org.opends.server.util.args.LDAPConnectionArgumentParser;
@@ -208,9 +209,7 @@
argParser.addArgument(verifyOnly);
- displayUsage =
- new BooleanArgument("help", OPTION_SHORT_HELP, OPTION_LONG_HELP,
- INFO_DESCRIPTION_USAGE.get());
+ displayUsage = CommonArguments.getShowUsage();
argParser.addArgument(displayUsage);
argParser.setUsageArgument(displayUsage);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/StopDS.java b/opendj3-server-dev/src/server/org/opends/server/tools/StopDS.java
index f13ab31..526134e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/StopDS.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/StopDS.java
@@ -63,6 +63,7 @@
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.ArgumentParser;
import com.forgerock.opendj.cli.BooleanArgument;
+import com.forgerock.opendj.cli.CommonArguments;
import com.forgerock.opendj.cli.FileBasedArgument;
import com.forgerock.opendj.cli.IntegerArgument;
import com.forgerock.opendj.cli.StringArgument;
@@ -310,9 +311,7 @@
windowsNetStop.setHidden(true);
argParser.addArgument(windowsNetStop);
- restart = new BooleanArgument("restart", 'R', "restart",
- INFO_STOPDS_DESCRIPTION_RESTART.get());
- restart.setPropertyName("restart");
+ restart = CommonArguments.getRestart();
argParser.addArgument(restart);
stopTimeStr = new StringArgument("stoptime", 't', "stopTime", false,
@@ -323,9 +322,7 @@
stopTimeStr.setPropertyName("stopTime");
argParser.addArgument(stopTimeStr);
- trustAll = new BooleanArgument("trustall", 'X', "trustAll",
- INFO_STOPDS_DESCRIPTION_TRUST_ALL.get());
- trustAll.setPropertyName("trustAll");
+ trustAll = CommonArguments.getTrustAll();
argParser.addArgument(trustAll);
keyStoreFile = new StringArgument("keystorefile",
@@ -400,9 +397,7 @@
quietMode.setPropertyName(OPTION_LONG_QUIET);
argParser.addArgument(quietMode);
- showUsage = new BooleanArgument("showusage", OPTION_SHORT_HELP,
- OPTION_LONG_HELP,
- INFO_STOPDS_DESCRIPTION_SHOWUSAGE.get());
+ showUsage = CommonArguments.getShowUsage();
argParser.addArgument(showUsage);
argParser.setUsageArgument(showUsage, out);
}
@@ -795,7 +790,7 @@
}
BooleanArgument restart =
- (BooleanArgument)argParser.getArgumentForLongID("restart");
+ (BooleanArgument)argParser.getArgumentForLongID(OPTION_LONG_RESTART);
boolean restartPresent = restart.isPresent();
BooleanArgument windowsNetStop =
(BooleanArgument)argParser.getArgumentForLongID("windowsnetstop");
@@ -806,9 +801,9 @@
boolean stopThroughProtocol = false;
for (Argument arg: list)
{
- if (!"restart".equals(arg.getName()) &&
- !"quiet".equals(arg.getName()) &&
- !"showusage".equals(arg.getName()) &&
+ if (!OPTION_LONG_RESTART.toLowerCase().equals(arg.getName()) &&
+ !OPTION_LONG_QUIET.equals(arg.getName()) &&
+ !OPTION_LONG_HELP.toLowerCase().equals(arg.getName()) &&
!"checkstoppability".equals(arg.getName()) &&
!"windowsnetstop".equals(arg.getName()) &&
! OPTION_LONG_NO_PROP_FILE.equals(arg.getLongIdentifier()))
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/VerifyIndex.java b/opendj3-server-dev/src/server/org/opends/server/tools/VerifyIndex.java
index 48940d1..4565e2e 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/VerifyIndex.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/VerifyIndex.java
@@ -58,6 +58,7 @@
import com.forgerock.opendj.cli.ArgumentException;
import com.forgerock.opendj.cli.ArgumentParser;
import com.forgerock.opendj.cli.BooleanArgument;
+import com.forgerock.opendj.cli.CommonArguments;
import com.forgerock.opendj.cli.StringArgument;
@@ -171,9 +172,7 @@
INFO_VERIFYINDEX_DESCRIPTION_COUNT_ERRORS.get());
argParser.addArgument(countErrors);
- displayUsage =
- new BooleanArgument("help", OPTION_SHORT_HELP, OPTION_LONG_HELP,
- INFO_DESCRIPTION_USAGE.get());
+ displayUsage = CommonArguments.getShowUsage();
argParser.addArgument(displayUsage);
argParser.setUsageArgument(displayUsage);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/WaitForFileDelete.java b/opendj3-server-dev/src/server/org/opends/server/tools/WaitForFileDelete.java
index d2603db..a461755 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/WaitForFileDelete.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/WaitForFileDelete.java
@@ -32,7 +32,6 @@
import org.opends.server.core.DirectoryServer;
import org.opends.server.loggers.JDKLogging;
import org.opends.server.types.NullOutputStream;
-import com.forgerock.opendj.cli.ConsoleApplication;
import com.forgerock.opendj.cli.*;
@@ -220,12 +219,10 @@
// Not used in this class, but required by the start-ds script
// (see issue #3814)
- quietMode = new BooleanArgument("quiet", 'Q', "quiet",
- INFO_DESCRIPTION_QUIET.get());
+ quietMode = CommonArguments.getQuiet();
argParser.addArgument(quietMode);
- showUsage = new BooleanArgument("help", 'H', "help",
- INFO_WAIT4DEL_DESCRIPTION_HELP.get());
+ showUsage = CommonArguments.getShowUsage();
argParser.addArgument(showUsage);
argParser.setUsageArgument(showUsage);
}
diff --git a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/DSConfig.java b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/DSConfig.java
index 2da99d2..0d16ad7 100644
--- a/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/DSConfig.java
+++ b/opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/DSConfig.java
@@ -549,34 +549,13 @@
private void initializeGlobalArguments(String[] args)
throws ArgumentException {
if (globalArgumentsInitialized == false) {
+
verboseArgument = CommonArguments.getVerbose();
-
- quietArgument = new BooleanArgument(
- OPTION_LONG_QUIET,
- OPTION_SHORT_QUIET,
- OPTION_LONG_QUIET,
- INFO_DESCRIPTION_QUIET.get());
- quietArgument.setPropertyName(OPTION_LONG_QUIET);
-
- scriptFriendlyArgument = new BooleanArgument("script-friendly",
- OPTION_SHORT_SCRIPT_FRIENDLY, OPTION_LONG_SCRIPT_FRIENDLY,
- INFO_DESCRIPTION_SCRIPT_FRIENDLY.get());
- scriptFriendlyArgument.setPropertyName(OPTION_LONG_SCRIPT_FRIENDLY);
-
- noPromptArgument = new BooleanArgument(
- OPTION_LONG_NO_PROMPT,
- OPTION_SHORT_NO_PROMPT,
- OPTION_LONG_NO_PROMPT,
- INFO_DESCRIPTION_NO_PROMPT.get());
-
- advancedModeArgument = new BooleanArgument(OPTION_LONG_ADVANCED,
- null, OPTION_LONG_ADVANCED,
- INFO_DSCFG_DESCRIPTION_ADVANCED.get());
- advancedModeArgument.setPropertyName(OPTION_LONG_ADVANCED);
-
- showUsageArgument = new BooleanArgument("showUsage", OPTION_SHORT_HELP,
- OPTION_LONG_HELP, INFO_DSCFG_DESCRIPTION_SHOW_GROUP_USAGE_SUMMARY
- .get());
+ quietArgument = CommonArguments.getQuiet();
+ scriptFriendlyArgument = CommonArguments.getScriptFriendly();
+ noPromptArgument = CommonArguments.getNoPrompt();
+ advancedModeArgument = CommonArguments.getAdvancedMode();
+ showUsageArgument = CommonArguments.getShowUsage();
batchFileArgument = new StringArgument(OPTION_LONG_BATCH_FILE_PATH,
OPTION_SHORT_BATCH_FILE_PATH, OPTION_LONG_BATCH_FILE_PATH,
@@ -588,8 +567,6 @@
OPTION_LONG_DISPLAY_EQUIVALENT,
null, OPTION_LONG_DISPLAY_EQUIVALENT,
INFO_DSCFG_DESCRIPTION_DISPLAY_EQUIVALENT.get());
- advancedModeArgument.setPropertyName(
- OPTION_LONG_DISPLAY_EQUIVALENT);
equivalentCommandFileArgument = new StringArgument(
OPTION_LONG_EQUIVALENT_COMMAND_FILE_PATH, null,
@@ -649,7 +626,7 @@
if (handlerFactory == null) {
handlerFactory = new SubCommandHandlerFactory(parser);
- Comparator<SubCommand> c = new Comparator<SubCommand>() {
+ final Comparator<SubCommand> c = new Comparator<SubCommand>() {
@Override
public int compare(SubCommand o1, SubCommand o2) {
--
Gitblit v1.10.0