From 224353a3421cfbfe190f433faf52ac1db6cbed0e Mon Sep 17 00:00:00 2001 From: Konstantin Bulenkov Date: Thu, 23 Aug 2012 16:56:30 +0400 Subject: [PATCH] presentable path for some files --- .../src/com/intellij/ide/actions/Switcher.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java b/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java index 4ce431c2d420..5855844f779c 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/Switcher.java @@ -442,7 +442,8 @@ public class Switcher extends AnAction implements DumbAware { new NameFilteringListModel(files, new Function() { @Override public String fun(FileInfo info) { - return info.getFirst().getName(); + final VirtualFile file = info.getFirst(); + return file instanceof VirtualFilePathWrapper ? ((VirtualFilePathWrapper)file).getPresentablePath() : file.getName(); } }, new Condition() { @Override @@ -925,10 +926,13 @@ public class Switcher extends AnAction implements DumbAware { @Override protected String getElementText(Object element) { - return element instanceof ToolWindow - ? ids.get(element) - : element instanceof FileInfo - ? ((FileInfo)element).getFirst().getName() : ""; + if (element instanceof ToolWindow) { + return ids.get(element); + } else if (element instanceof FileInfo) { + final VirtualFile file = ((FileInfo)element).getFirst(); + return file instanceof VirtualFilePathWrapper ? ((VirtualFilePathWrapper)file).getPresentablePath() : file.getName(); + } + return ""; } @Override