From b58295e64027d5ae0fb08008e297d85b3f41c9f8 Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 19 Jul 2012 18:51:36 +0200 Subject: [PATCH] IDEA-81098 Inconsistent Revert/Rollback naming in Commit Changes dialog --- .../vcs/changes/actions/RollbackDialogAction.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RollbackDialogAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RollbackDialogAction.java index 41d902dbc62c..76a2840329c3 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RollbackDialogAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RollbackDialogAction.java @@ -27,6 +27,7 @@ import com.intellij.openapi.vcs.VcsDataKeys; import com.intellij.openapi.vcs.changes.Change; import com.intellij.openapi.vcs.changes.ui.ChangesBrowser; import com.intellij.openapi.vcs.changes.ui.RollbackChangesDialog; +import com.intellij.vcsUtil.RollbackUtil; import java.util.Arrays; @@ -59,6 +60,14 @@ public class RollbackDialogAction extends AnAction implements DumbAware { public void update(AnActionEvent e) { Change[] changes = e.getData(VcsDataKeys.CHANGES); - e.getPresentation().setEnabled(changes != null); + Project project = e.getData(PlatformDataKeys.PROJECT); + boolean enabled = changes != null && project != null; + e.getPresentation().setEnabled(enabled); + if (enabled) { + String operationName = RollbackUtil.getRollbackOperationName(project); + e.getPresentation().setText(operationName); + e.getPresentation().setDescription(operationName + " selected changes"); + } + } }