Code cleanup

Gaetan Boismal

25.30.2016 6ea56ecde3d05b84f42a7338d7c2c159817d00d0

 opendj-server-legacy/src/main/java/org/opends/guitools/controlpanel/ControlPanelArgumentParser.java

@@ -16,10 +16,10 @@
 */
package org.opends.guitools.controlpanel;

import static com.forgerock.opendj.cli.Utils.addErrorMessageIfArgumentsConflict;
import static org.opends.messages.ToolMessages.*;

import static com.forgerock.opendj.cli.CommonArguments.*;
import static com.forgerock.opendj.cli.CliMessages.ERR_TOOL_CONFLICTING_ARGS;

import java.util.LinkedHashSet;

@@ -145,14 +145,7 @@
    {
      errorMessages.add(ae.getMessageObject());
    }

    if (bindPasswordArg.isPresent() && bindPasswordFileArg.isPresent())
    {
      LocalizableMessage message = ERR_TOOL_CONFLICTING_ARGS.get(
          bindPasswordArg.getLongIdentifier(),
          bindPasswordFileArg.getLongIdentifier());
      errorMessages.add(message);
    }
    addErrorMessageIfArgumentsConflict(errorMessages, bindPasswordArg, bindPasswordArg);

    if (!errorMessages.isEmpty())
    {