Code cleanup

Gaetan Boismal

25.30.2016 6ea56ecde3d05b84f42a7338d7c2c159817d00d0

 opendj-server-legacy/src/main/java/org/opends/server/tools/LDAPModify.java

@@ -21,7 +21,6 @@
import static com.forgerock.opendj.cli.CliMessages.INFO_DESCRIPTION_BINDPASSWORDFILE;
import static com.forgerock.opendj.cli.Utils.*;
import static com.forgerock.opendj.cli.CommonArguments.*;
import static com.forgerock.opendj.cli.CliMessages.ERR_TOOL_CONFLICTING_ARGS;

import static org.opends.messages.ToolMessages.*;
import static org.opends.server.protocols.ldap.LDAPResultCode.*;
@@ -811,10 +810,9 @@
      return SUCCESS;
    }

    if(bindPassword.isPresent() && bindPasswordFile.isPresent())
    if (bindPassword.isPresent() && bindPasswordFile.isPresent())
    {
      printWrappedText(
          err, ERR_TOOL_CONFLICTING_ARGS.get(bindPassword.getLongIdentifier(), bindPasswordFile.getLongIdentifier()));
      printWrappedText(err, conflictingArgsErrorMessage(bindPassword, bindPasswordFile));
      return CLIENT_SIDE_PARAM_ERROR;
    }