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

merge text conflict: better file paths presentation in a dialog

Browse Source
This commit is contained in:
irengrig
2012-07-27 17:24:06 +04:00
parent f43beb3368
commit 6a08f3183c
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/merge/MultipleFileMergeDialog.java
+5 -1
View File
@@ -356,7 +356,11 @@ public class MultipleFileMergeDialog extends DialogWrapper {
protected void customizeCellRenderer(JTable table, Object value, boolean selected, boolean hasFocus, int row, int column) {
VirtualFile vf = (VirtualFile)value;
setIcon(VirtualFilePresentation.getIcon(vf));
append(FileUtil.toSystemDependentName(vf.getPresentableUrl()), SimpleTextAttributes.REGULAR_ATTRIBUTES);
append(vf.getName(), SimpleTextAttributes.REGULAR_ATTRIBUTES);
final VirtualFile parent = vf.getParent();
if (parent != null) {
append(" (" + FileUtil.toSystemDependentName(parent.getPresentableUrl()) + ")", SimpleTextAttributes.GRAYED_ATTRIBUTES);
}
}
}
}