From 0c98b4a13680c043ebe5456366c8b6203daea5d2 Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Wed, 20 Feb 2019 19:19:58 +0300 Subject: [PATCH] replace title with action name for IDEA-CR-43679 --- .../src/com/intellij/ide/util/SuperMethodWarningDialog.java | 2 +- .../refactoring/util/duplicates/DuplicatesImpl.java | 2 +- .../src/com/intellij/ui/tabs/impl/DragHelper.java | 2 +- .../src/com/intellij/diagnostic/ITNReporter.kt | 2 +- .../intellij/ide/plugins/InstalledPluginsManagerMain.java | 6 +++--- .../src/com/intellij/ide/util/ExportToFileUtil.java | 2 +- .../vcs/changes/patch/CreatePatchCommitExecutor.java | 2 +- .../src/com/intellij/coverage/CoverageSuite.java | 2 +- .../src/com/intellij/execution/junit/JUnit4Framework.java | 2 +- .../src/com/intellij/execution/junit/JUnit5Framework.java | 2 +- .../src/com/theoryinpractice/testng/TestNGFramework.java | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/java/java-impl/src/com/intellij/ide/util/SuperMethodWarningDialog.java b/java/java-impl/src/com/intellij/ide/util/SuperMethodWarningDialog.java index 78438bb50b19..c5254270badc 100644 --- a/java/java-impl/src/com/intellij/ide/util/SuperMethodWarningDialog.java +++ b/java/java-impl/src/com/intellij/ide/util/SuperMethodWarningDialog.java @@ -50,7 +50,7 @@ class SuperMethodWarningDialog extends DialogWrapper { myIsSuperAbstract = isSuperAbstract; myIsParentInterface = isParentInterface; myIsContainedInInterface = isContainedInInterface; - setTitle("Method Overrides Found"); + setTitle("Method Overrides"); setButtonsAlignment(SwingConstants.CENTER); setOKButtonText(CommonBundle.getYesButtonText()); init(); diff --git a/java/java-impl/src/com/intellij/refactoring/util/duplicates/DuplicatesImpl.java b/java/java-impl/src/com/intellij/refactoring/util/duplicates/DuplicatesImpl.java index 7c6131afe92f..1b3621bbec95 100644 --- a/java/java-impl/src/com/intellij/refactoring/util/duplicates/DuplicatesImpl.java +++ b/java/java-impl/src/com/intellij/refactoring/util/duplicates/DuplicatesImpl.java @@ -129,7 +129,7 @@ public class DuplicatesImpl { showAll.set(allChosen); if (allChosen && confirmDuplicatePrompt != null && prompt == null) { if (Messages.showOkCancelDialog(project, "In order to replace all occurrences method signature will be changed. Proceed?", - "Signature Change Warning", CommonBundle.getContinueButtonText(), CommonBundle.getCancelButtonText(), Messages.getWarningIcon()) != + "Change Method Signature", CommonBundle.getContinueButtonText(), CommonBundle.getCancelButtonText(), Messages.getWarningIcon()) != Messages.OK) return true; } if (promptDialog.getExitCode() == FindManager.PromptResult.SKIP) return false; diff --git a/platform/platform-api/src/com/intellij/ui/tabs/impl/DragHelper.java b/platform/platform-api/src/com/intellij/ui/tabs/impl/DragHelper.java index 978ab9677b7d..3a83a45da7be 100644 --- a/platform/platform-api/src/com/intellij/ui/tabs/impl/DragHelper.java +++ b/platform/platform-api/src/com/intellij/ui/tabs/impl/DragHelper.java @@ -251,7 +251,7 @@ class DragHelper extends MouseDragHelper { if (myTabs.getVisibleRect().contains(p) && myPressedOnScreenPoint.distance(new RelativePoint(event).getScreenPoint()) > 15) { final int answer = Messages.showOkCancelDialog(myTabs, IdeBundle.message("alphabetical.mode.is.on.warning"), - "Tabs Order Conflict", + "Reorder Tabs", "Off", "On", Messages.getQuestionIcon()); if (answer == Messages.OK) { diff --git a/platform/platform-impl/src/com/intellij/diagnostic/ITNReporter.kt b/platform/platform-impl/src/com/intellij/diagnostic/ITNReporter.kt index c0f76deaa8ff..35c3b90eff1a 100644 --- a/platform/platform-impl/src/com/intellij/diagnostic/ITNReporter.kt +++ b/platform/platform-impl/src/com/intellij/diagnostic/ITNReporter.kt @@ -108,7 +108,7 @@ private fun onError(e: Exception, errorBean: ErrorBean, callback: Consumer 1 ? "s " : " ") + deps; - MessagesEx.showWarningDialog(parent, message, "Unknown Plugin Found"); + MessagesEx.showWarningDialog(parent, message, "Install Plugin"); } if (!disabledIds.isEmpty()) { final Set dependencies = new HashSet<>(); @@ -192,7 +192,7 @@ public class InstalledPluginsManagerMain extends PluginManagerMain { String part = "disabled plugin" + (dependencies.size() > 1 ? "s " : " "); String deps = StringUtil.join(dependencies, IdeaPluginDescriptor::getName, ", "); String message = "Plugin " + pluginDescriptor.getName() + " depends on " + part + deps + ". Enable " + part.trim() + "?"; - if (MessagesEx.showOkCancelDialog(parent, message, "Plugin Dependency Found", Messages.getWarningIcon()) == Messages.OK) { + if (MessagesEx.showOkCancelDialog(parent, message, "Install Plugin", Messages.getWarningIcon()) == Messages.OK) { model.enableRows(dependencies.toArray(new IdeaPluginDescriptor[0]), Boolean.TRUE); } } diff --git a/platform/platform-impl/src/com/intellij/ide/util/ExportToFileUtil.java b/platform/platform-impl/src/com/intellij/ide/util/ExportToFileUtil.java index e3ebb6f0a110..753258d5e7be 100644 --- a/platform/platform-impl/src/com/intellij/ide/util/ExportToFileUtil.java +++ b/platform/platform-impl/src/com/intellij/ide/util/ExportToFileUtil.java @@ -52,7 +52,7 @@ public class ExportToFileUtil { int result = Messages.showYesNoCancelDialog( project, IdeBundle.message("error.text.file.already.exists", fileName), - "File Already Exists", + "Export To File", IdeBundle.message("action.overwrite"), IdeBundle.message("action.append"), CommonBundle.getCancelButtonText(), diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/CreatePatchCommitExecutor.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/CreatePatchCommitExecutor.java index 28fb35b3cd3c..ae21119f369a 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/CreatePatchCommitExecutor.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/CreatePatchCommitExecutor.java @@ -183,7 +183,7 @@ public class CreatePatchCommitExecutor extends LocalCommitExecutor implements Pr WaitForProgressToShow.runOrInvokeAndWaitAboveProgress( () -> result[0] = Messages.showYesNoDialog(myProject, "File " + file.getName() + " (" + file.getParent() + ")" + " already exists.\nDo you want to overwrite it?", - "File Already Exists", + "Save Patch File", "Overwrite", "Cancel", Messages.getWarningIcon())); if (Messages.NO == result[0]) return false; diff --git a/plugins/coverage-common/src/com/intellij/coverage/CoverageSuite.java b/plugins/coverage-common/src/com/intellij/coverage/CoverageSuite.java index 1895094719d6..2d0349c13de6 100644 --- a/plugins/coverage-common/src/com/intellij/coverage/CoverageSuite.java +++ b/plugins/coverage-common/src/com/intellij/coverage/CoverageSuite.java @@ -66,7 +66,7 @@ public interface CoverageSuite extends JDOMExternalizable { final String fileName = getCoverageDataFileName(); if (!FileUtil.isAncestor(PathManager.getSystemPath(), fileName, false)) { String message = "Would you like to delete file \'" + fileName + "\' " + "on disk?"; - if (Messages.showYesNoDialog(getProject(), message, "Delete File Warning", Messages.getWarningIcon()) != Messages.YES) { + if (Messages.showYesNoDialog(getProject(), message, "Delete File", Messages.getWarningIcon()) != Messages.YES) { return; } } diff --git a/plugins/junit/src/com/intellij/execution/junit/JUnit4Framework.java b/plugins/junit/src/com/intellij/execution/junit/JUnit4Framework.java index f07cfe7ca72b..898be926e9cf 100644 --- a/plugins/junit/src/com/intellij/execution/junit/JUnit4Framework.java +++ b/plugins/junit/src/com/intellij/execution/junit/JUnit4Framework.java @@ -95,7 +95,7 @@ public class JUnit4Framework extends JavaTestFramework { int exit = ApplicationManager.getApplication().isUnitTestMode() ? Messages.OK : Messages.showOkCancelDialog("Method setUp already exist but is not annotated as @Before. Annotate?", - "SetUp Not Annotated", + "Create SetUp", Messages.getWarningIcon()); if (exit == Messages.OK) { new AddAnnotationFix(beforeAnnotationName, existingMethod).invoke(existingMethod.getProject(), null, existingMethod.getContainingFile()); diff --git a/plugins/junit/src/com/intellij/execution/junit/JUnit5Framework.java b/plugins/junit/src/com/intellij/execution/junit/JUnit5Framework.java index 95d2ebe95c91..3c52dcf85153 100644 --- a/plugins/junit/src/com/intellij/execution/junit/JUnit5Framework.java +++ b/plugins/junit/src/com/intellij/execution/junit/JUnit5Framework.java @@ -89,7 +89,7 @@ public class JUnit5Framework extends JavaTestFramework { int exit = ApplicationManager.getApplication().isUnitTestMode() ? Messages.OK : Messages.showOkCancelDialog("Method setUp already exist but is not annotated as @BeforeEach. Annotate?", - "SetUp Not Annotated", + "Create SetUp", Messages.getWarningIcon()); if (exit == Messages.OK) { new AddAnnotationFix(JUnitUtil.BEFORE_EACH_ANNOTATION_NAME, existingMethod).invoke(existingMethod.getProject(), null, existingMethod.getContainingFile()); diff --git a/plugins/testng/src/com/theoryinpractice/testng/TestNGFramework.java b/plugins/testng/src/com/theoryinpractice/testng/TestNGFramework.java index 996efc5c41f7..bcf3e2c1351c 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/TestNGFramework.java +++ b/plugins/testng/src/com/theoryinpractice/testng/TestNGFramework.java @@ -102,7 +102,7 @@ public class TestNGFramework extends JavaTestFramework { int exit = ApplicationManager.getApplication().isUnitTestMode() ? Messages.YES : Messages.showYesNoDialog(manager.getProject(), "Method \'" + setUpName + "\' already exist but is not annotated as @BeforeMethod.", - "SetUp Not Annotated", + "Create SetUp", "Annotate", "Create new method", Messages.getWarningIcon());