Addresses issue 2143 which is intended to help with the readability of the ...

kenneth_suter

26.56.2007 0c950f58fb55560af9fb5435b89040e0e28e09a6

 opendj-sdk/opends/src/server/org/opends/server/util/args/LDAPConnectionArgumentParser.java

@@ -64,13 +64,17 @@
   *                                     tool, which will be included when
   *                                     displaying usage information.
   * @param  longArgumentsCaseSensitive  Indicates whether long arguments should
   *                                     be treated in a case-sensitive manner.
   * @param  argumentGroup               Group to which LDAP arguments will be
   *                                     added to the parser.  May be null to
   *                                     indicate that arguments should be
   *                                     added to the default group
   */
  public LDAPConnectionArgumentParser(String mainClassName,
                                      Message toolDescription,
                                      boolean longArgumentsCaseSensitive) {
                                      boolean longArgumentsCaseSensitive,
                                      ArgumentGroup argumentGroup) {
    super(mainClassName, toolDescription, longArgumentsCaseSensitive);
    addLdapConnectionArguments();
    addLdapConnectionArguments(argumentGroup);
  }

  /**
@@ -103,6 +107,10 @@
   *                                     as a placeholder for unnamed trailing
   *                                     arguments in the generated usage
   *                                     information.
   * @param  argumentGroup               Group to which LDAP arguments will be
   *                                     added to the parser.  May be null to
   *                                     indicate that arguments should be
   *                                     added to the default group
   */
  public LDAPConnectionArgumentParser(String mainClassName,
                                      Message toolDescription,
@@ -110,11 +118,12 @@
                                      boolean allowsTrailingArguments,
                                      int minTrailingArguments,
                                      int maxTrailingArguments,
                                      String trailingArgsDisplayName) {
                                      String trailingArgsDisplayName,
                                      ArgumentGroup argumentGroup) {
    super(mainClassName, toolDescription, longArgumentsCaseSensitive,
            allowsTrailingArguments, minTrailingArguments, maxTrailingArguments,
            trailingArgsDisplayName);
    addLdapConnectionArguments();
    addLdapConnectionArguments(argumentGroup);
  }

  /**
@@ -397,12 +406,12 @@
    return args;
  }

  private void addLdapConnectionArguments() {
  private void addLdapConnectionArguments(ArgumentGroup argGroup) {
    args = new SecureConnectionCliArgs();
    try {
      LinkedHashSet<Argument> argSet = args.createGlobalArguments();
      for (Argument arg : argSet) {
        addArgument(arg);
        addArgument(arg, argGroup);
      }
    }
    catch (ArgumentException ae) {