From e5d8175887e15d1d055cbdf7857b67de9d962d8a Mon Sep 17 00:00:00 2001
From: Anton Makeev <Anton.Makeev@jetbrains.com>
Date: Thu, 24 Nov 2011 12:55:40 +0100
Subject: [PATCH] Undo: method renamed according to its purpose

---
 .../com/intellij/openapi/command/impl/CommandMerger.java  | 8 ++++----
 .../com/intellij/openapi/command/impl/UndoableGroup.java  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/command/impl/CommandMerger.java b/platform/platform-impl/src/com/intellij/openapi/command/impl/CommandMerger.java
index f54296693ac4..d2b855e5aae4 100644
--- a/platform/platform-impl/src/com/intellij/openapi/command/impl/CommandMerger.java
+++ b/platform/platform-impl/src/com/intellij/openapi/command/impl/CommandMerger.java
@@ -207,11 +207,11 @@ public class CommandMerger {
       if (!undoRedo.hasMoreActions()) break;
     }
 
-    boolean isInsideStopFinishGroup = false;
+    boolean isInsideStartFinishGroup = false;
     while ((undoRedo = createUndoOrRedo(editor, isUndo)) != null) {
-      if (!undoRedo.execute(false, isInsideStopFinishGroup)) return;
-      isInsideStopFinishGroup = undoRedo.myUndoableGroup.isInsideStopFinishGroup(isUndo, isInsideStopFinishGroup);
-      if (isInsideStopFinishGroup) continue;
+      if (!undoRedo.execute(false, isInsideStartFinishGroup)) return;
+      isInsideStartFinishGroup = undoRedo.myUndoableGroup.isInsideStartFinishGroup(isUndo, isInsideStartFinishGroup);
+      if (isInsideStartFinishGroup) continue;
       boolean shouldRepeat = undoRedo.isTransparent() && undoRedo.hasMoreActions();
       if (!shouldRepeat) break;
     }
diff --git a/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoableGroup.java b/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoableGroup.java
index 708f77eb8010..f50811e2f039 100644
--- a/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoableGroup.java
+++ b/platform/platform-impl/src/com/intellij/openapi/command/impl/UndoableGroup.java
@@ -171,7 +171,7 @@ class UndoableGroup {
     commitAllDocuments();
   }
 
-  boolean isInsideStopFinishGroup(boolean isUndo, boolean isInsideStartFinishGroup) {
+  boolean isInsideStartFinishGroup(boolean isUndo, boolean isInsideStartFinishGroup) {
     final FinishMarkAction finishMark = getFinishMark();
     final StartMarkAction startMark = getStartMark();
     if (startMark == null || finishMark == null) {