MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

[patch]: (IDEA-162742) in Abort Applying dialog fix text presentation

Browse Source 
* use html underlined tag instead of braces;
This commit is contained in:
Nadya Zabrodina
2016-10-21 15:03:57 +03:00
parent 6c4f354975
commit e6c5ae94ba
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchAction.java
+4 -3
View File
@@ -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 <u>A</u>bort&Rollback applying patch action or <u>S</u>kip this file?"),
"Close Merge", "_Abort", "_Skip", "Cancel", Messages.getQuestionIcon());
if (result == Messages.YES) {
applyPatchStatusReference.set(ApplyPatchStatus.ABORT);