From 7b7f0f09d56db18dff486c6314f381f300c90572 Mon Sep 17 00:00:00 2001 From: Kirill Likhodedov Date: Mon, 20 Apr 2015 15:20:01 +0300 Subject: [PATCH] [vcs] IDEA-137136 simplify --- .../openapi/vcs/changes/actions/RollbackAction.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RollbackAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RollbackAction.java index 069821cc41dd..ef03c72f762b 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RollbackAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RollbackAction.java @@ -82,14 +82,15 @@ public class RollbackAction extends AnAction implements DumbAware { final int MAX_FILES_TO_CHECK = 100; final VirtualFile[] files = e.getData(CommonDataKeys.VIRTUAL_FILE_ARRAY); if (files != null) { + if (files.length > MAX_FILES_TO_CHECK) { + return true; + } ChangeListManager clManager = ChangeListManager.getInstance(project); Set modifiedWithoutEditing = ContainerUtil.newHashSet(clManager.getModifiedWithoutEditing()); - int checkedFiles = 0; for (VirtualFile file : files) { - if (!clManager.getChangesIn(file).isEmpty() || modifiedWithoutEditing.contains(file) || checkedFiles > MAX_FILES_TO_CHECK) { + if (!clManager.getChangesIn(file).isEmpty() || modifiedWithoutEditing.contains(file)) { return true; } - checkedFiles++; } } return false;