Revert the changes made in revision 2281 for issue #1865 because they have ...

neil_a_wilson

07.36.2007 5f8b6b9c154ee7af10e5b3db6228fc3bfe905949

 opends/src/quicksetup/org/opends/quicksetup/Launcher.java

@@ -305,23 +305,21 @@

  /**
   * The main method which is called by the command lines.
   *
   * @return the error return code.
   */
  public int launch() {
  public void launch() {
    if (shouldPrintVersion())
    {
      printVersion();
      return QuickSetupCli.VERSION_PRINT;
      System.exit(QuickSetupCli.SUCCESSFUL);
    }
    else if (shouldPrintUsage()) {
      printUsage(false);
      return QuickSetupCli.SUCCESSFUL;
      System.exit(QuickSetupCli.SUCCESSFUL);
    } else if (isCli()) {
      CliApplication cliApp = createCliApplication();
      int exitCode = launchCli(args, cliApp);
      preExit(cliApp);
      return exitCode;
      System.exit(exitCode);
    } else {
      willLaunchGui();
      int exitCode = launchGui(args);
@@ -339,17 +337,10 @@
        exitCode = launchCli(args, cliApp);
        if (exitCode != 0) {
          preExit(cliApp);
          return exitCode;
          System.exit(exitCode);
        }
      }
      else
      {
        return exitCode ;
      }
    }

    // We should never reach this code
    return QuickSetupCli.UNKNOWN;
  }

  private void preExit(CliApplication cliApp) {