From e6c5ae94ba674fc2510148dd1a217e2c9e2fcbf1 Mon Sep 17 00:00:00 2001 From: Nadya Zabrodina Date: Thu, 20 Oct 2016 19:14:29 +0300 Subject: [PATCH] [patch]: (IDEA-162742) in Abort Applying dialog fix text presentation * use html underlined tag instead of braces; --- .../openapi/vcs/changes/patch/ApplyPatchAction.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchAction.java index 9bcb95c09861..aa7ba1c3c922 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchAction.java @@ -58,6 +58,7 @@ import com.intellij.util.Function; import com.intellij.util.ObjectUtils; import com.intellij.util.containers.ContainerUtil; import com.intellij.vcsUtil.VcsUtil; +import com.intellij.xml.util.XmlStringUtil; import org.jetbrains.annotations.CalledInAwt; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -241,9 +242,9 @@ public class ApplyPatchAction extends DumbAwareAction { @Override public boolean value(MergeTool.MergeViewer viewer) { int result = Messages.showYesNoCancelDialog(viewer.getComponent().getRootPane(), - "Would you like to (A)bort&Rollback applying patch action or (S)kip this file?", - "Close Merge", - "_Abort", "_Skip", "Cancel", Messages.getQuestionIcon()); + XmlStringUtil.wrapInHtml( + "Would you like to Abort&Rollback applying patch action or Skip this file?"), + "Close Merge", "_Abort", "_Skip", "Cancel", Messages.getQuestionIcon()); if (result == Messages.YES) { applyPatchStatusReference.set(ApplyPatchStatus.ABORT);