MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Undo: method renamed according to its purpose

Browse Source
This commit is contained in:
Anton Makeev
2011-11-24 12:56:41 +01:00
parent fcf9052f3a
commit e5d8175887
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-impl/src/com/intellij/openapi/command/impl/CommandMerger.java
+4 -4
View File
@@ -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;
}
platform/platform-impl/src/com/intellij/openapi/command/impl/UndoableGroup.java
+1 -1
View File
@@ -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) {