From 7f308887b72536c76f873113b162da3de2a354fc Mon Sep 17 00:00:00 2001 From: Vassiliy Kudryashov Date: Tue, 2 Oct 2012 15:51:28 +0400 Subject: [PATCH] IDEA-92190 Run/Debug configurations: 'Single instance' checkbox does nothing --- .../intellij/execution/impl/ExecutionManagerImpl.java | 9 ++++++++- .../src/messages/ExecutionBundle.properties | 3 ++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/execution/impl/ExecutionManagerImpl.java b/platform/lang-impl/src/com/intellij/execution/impl/ExecutionManagerImpl.java index bdb13ea1b78e..df913f1e6dc7 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/ExecutionManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/ExecutionManagerImpl.java @@ -282,7 +282,14 @@ public class ExecutionManagerImpl extends ExecutionManager implements ProjectCom return CommonBundle.message("dialog.options.do.not.show"); } }; - if (Messages.OK != Messages.showOkCancelDialog(ExecutionBundle.message("rerun.confirmation.message", configuration.getName()), + String message; + if (allHandlers.size() == 1 && handler != null) {//we restart single running configuration + message = ExecutionBundle.message("rerun.confirmation.message", configuration.getName()); + } + else { + message = ExecutionBundle.message("rerun.singleton.confirmation.message", configuration.getName()); + } + if (Messages.OK != Messages.showOkCancelDialog(message, ExecutionBundle.message("rerun.confirmation.title") + " (" + pair.getSecond().getId() + diff --git a/platform/platform-resources-en/src/messages/ExecutionBundle.properties b/platform/platform-resources-en/src/messages/ExecutionBundle.properties index d3995a102dfc..69bc59533e37 100644 --- a/platform/platform-resources-en/src/messages/ExecutionBundle.properties +++ b/platform/platform-resources-en/src/messages/ExecutionBundle.properties @@ -160,7 +160,8 @@ terminating.process.progress.kill=Kill process waiting.for.vm.detach.progress.text=Waiting for process detach restart.error.message.title=Restart Error rerun.configuration.action.name=Rerun ''{0}'' -rerun.confirmation.message=''{0}'' is single-instance run configuration.\nAre you sure you want to stop running one? +rerun.singleton.confirmation.message=''{0}'' is single-instance run configuration.\nAre you sure you want to stop running one? +rerun.confirmation.message=Are you sure you want to stop ''{0}''? rerun.confirmation.title=Stop Confirmation rerun.confirmation.checkbox=Confirm rerun with process termination run.configuration.dump.threads.action.name=Dump Threads