Checkpoint for OPENDJ-1303 "opendj-cli" - replaced ToolConstants by Argumen...

Violette Roche-Montane

21.33.2014 0f8c0db941311b7e34f0abc3299385175b9051cb

 opendj3-server-dev/src/server/org/opends/server/tools/dsconfig/LDAPManagementContextFactory.java

@@ -44,7 +44,8 @@
import com.forgerock.opendj.cli.ClientException;

import org.opends.server.tools.JavaPropertiesTool.ErrorReturnCode;
import org.opends.server.tools.ToolConstants;
import static com.forgerock.opendj.cli.ArgumentConstants.OPTION_LONG_HELP;
import static com.forgerock.opendj.cli.ArgumentConstants.OPTION_SHORT_HELP;
import com.forgerock.opendj.cli.CommandBuilder;
import com.forgerock.opendj.cli.ConsoleApplication;
import org.opends.server.util.cli.LDAPConnectionConsoleInteraction;
@@ -365,8 +366,8 @@
            // This is not a help command
            continue;
          }
          if (rawArg.contains(ToolConstants.OPTION_LONG_HELP) ||
            (rawArg.charAt(1) == ToolConstants.OPTION_SHORT_HELP) || (rawArg.
          if (rawArg.contains(OPTION_LONG_HELP) ||
            (rawArg.charAt(1) == OPTION_SHORT_HELP) || (rawArg.
            charAt(1) == '?')) {
            // used for usage help default values only
            secureArgsList.initArgumentsWithConfiguration();