fix for issue #1809 (Avoid operands wherever possible)

lutoff

27.50.2007 27d28aa590fd561d20be4f6d1c35e6fa9eb49efd

 opendj-sdk/opends/src/server/org/opends/server/admin/client/cli/DsFrameworkCliAds.java

@@ -39,6 +39,7 @@
import org.opends.server.admin.client.cli.DsFrameworkCliReturnCode.ReturnCode;
import org.opends.server.util.args.ArgumentException;
import org.opends.server.util.args.BooleanArgument;
import org.opends.server.util.args.StringArgument;
import org.opends.server.util.args.SubCommand;
import org.opends.server.util.args.SubCommandArgumentParser;

@@ -102,11 +103,21 @@
  public SubCommand createAdsSubCmd;

  /**
   * The 'backend-name' argument of the 'create-ads' subcommand.
   */
  private StringArgument createAdsBackendNameArg;

  /**
   * The 'delete-ads' subcommand.
   */
  private SubCommand deleteAdsSubCmd;

  /**
   * The 'backend-name' argument of the 'delete-ads' subcommand.
   */
  private StringArgument deleteAdsBackendNameArg;

  /**
   * {@inheritDoc}
   */
  public void initializeCliGroup(SubCommandArgumentParser argParser,
@@ -115,15 +126,25 @@
  {
    // Create-ads subcommand
    createAdsSubCmd = new SubCommand(argParser, SubCommandNameEnum.CREATE_ADS
        .toString(), true, 1, 1, OPERAND_BACKEND,
        MSGID_ADMIN_SUBCMD_CREATE_ADS_DESCRIPTION);
        .toString(), MSGID_ADMIN_SUBCMD_CREATE_ADS_DESCRIPTION);
    createAdsSubCmd.setHidden(true);

    createAdsBackendNameArg = new StringArgument("backendName",
        OPTION_SHORT_BACKENDNAME, OPTION_LONG_BACKENDNAME, true, true,
        OPTION_VALUE_BACKENDNAME,
        MSGID_ADMIN_ARG_BACKENDNAME_DESCRIPTION);
    createAdsSubCmd.addArgument(createAdsBackendNameArg);

    // delete-ads
    deleteAdsSubCmd = new SubCommand(argParser,SubCommandNameEnum.DELETE_ADS
        .toString(),  true, 1, 1, OPERAND_BACKEND,
        MSGID_ADMIN_SUBCMD_DELETE_ADS_DESCRIPTION);
        .toString(), MSGID_ADMIN_SUBCMD_DELETE_ADS_DESCRIPTION);
    deleteAdsSubCmd.setHidden(true);

    deleteAdsBackendNameArg = new StringArgument("backendName",
        OPTION_SHORT_BACKENDNAME, OPTION_LONG_BACKENDNAME, true, true,
        OPTION_VALUE_BACKENDNAME,
        MSGID_ADMIN_ARG_BACKENDNAME_DESCRIPTION);
    deleteAdsSubCmd.addArgument(deleteAdsBackendNameArg);
  }

  /**
@@ -146,13 +167,13 @@
    // create-ads subcommand
    if (subCmd.getName().equals(createAdsSubCmd.getName()))
    {
      String backendName = subCmd.getTrailingArguments().get(0);
      String backendName = createAdsBackendNameArg.getValue();
      adsContext.createAdminData(backendName);
      return ReturnCode.SUCCESSFUL;
    }
    else if (subCmd.getName().equals(deleteAdsSubCmd.getName()))
    {
      String backendName = subCmd.getTrailingArguments().get(0);
      String backendName = deleteAdsBackendNameArg.getValue();
      ADSContextHelper helper = new ADSContextHelper();
      helper.removeAdministrationSuffix(adsContext.getDirContext(),
          backendName);