From 72c39dc903ff6d3813d876a005ca917f483f975b Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Tue, 31 Jul 2012 16:45:13 +0400
Subject: [PATCH] Renamed doDoMain -> doMainNoExit.

---
 .../cli/src/org/jetbrains/jet/cli/common/CLICompiler.java     | 4 ++--
 compiler/tests/org/jetbrains/jet/cli/jvm/CliTest.java         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/compiler/cli/src/org/jetbrains/jet/cli/common/CLICompiler.java b/compiler/cli/src/org/jetbrains/jet/cli/common/CLICompiler.java
index b48ff5cef9d..6a37fd65239 100644
--- a/compiler/cli/src/org/jetbrains/jet/cli/common/CLICompiler.java
+++ b/compiler/cli/src/org/jetbrains/jet/cli/common/CLICompiler.java
@@ -148,14 +148,14 @@ public abstract class CLICompiler<A extends CompilerArguments> {
      * Useful main for derived command line tools
      */
     public static void doMain(@NotNull CLICompiler compiler, @NotNull String[] args) {
-        ExitCode exitCode = doDoMain(compiler, args);
+        ExitCode exitCode = doMainNoExit(compiler, args);
         if (exitCode != OK) {
             System.exit(exitCode.getCode());
         }
     }
 
     @NotNull
-    public static ExitCode doDoMain(@NotNull CLICompiler compiler, @NotNull String[] args) {
+    public static ExitCode doMainNoExit(@NotNull CLICompiler compiler, @NotNull String[] args) {
         try {
             ExitCode rc = compiler.exec(System.out, args);
             if (rc != OK) {
diff --git a/compiler/tests/org/jetbrains/jet/cli/jvm/CliTest.java b/compiler/tests/org/jetbrains/jet/cli/jvm/CliTest.java
index 4e11b3e25e0..afeb7c0f710 100644
--- a/compiler/tests/org/jetbrains/jet/cli/jvm/CliTest.java
+++ b/compiler/tests/org/jetbrains/jet/cli/jvm/CliTest.java
@@ -56,7 +56,7 @@ public class CliTest {
         PrintStream origOut = System.out;
         try {
             System.setOut(new PrintStream(bytes));
-            ExitCode exitCode = CLICompiler.doDoMain(new K2JVMCompiler(), args);
+            ExitCode exitCode = CLICompiler.doMainNoExit(new K2JVMCompiler(), args);
             return bytes.toString("utf-8") + exitCode + "\n";
         }
         catch (Exception e) {