From 9c302eb29b40de6d91d3ae103f9e2ffc65a1637e Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Wed, 18 May 2011 17:27:33 +0200 Subject: [PATCH] more consistently replace home dir with ~ on Mac/Linux --- .../com/intellij/psi/impl/file/PsiJavaDirectoryFactory.java | 3 ++- .../com/intellij/ide/projectView/impl/ProjectViewImpl.java | 5 +++-- .../com/intellij/ide/projectView/impl/nodes/PsiFileNode.java | 3 ++- .../com/intellij/psi/impl/file/PsiDirectoryFactoryImpl.java | 4 +++- .../intellij/openapi/wm/impl/PlatformFrameTitleBuilder.java | 4 ++-- 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/java/java-impl/src/com/intellij/psi/impl/file/PsiJavaDirectoryFactory.java b/java/java-impl/src/com/intellij/psi/impl/file/PsiJavaDirectoryFactory.java index a8f13f093832..81cf1f34a53e 100644 --- a/java/java-impl/src/com/intellij/psi/impl/file/PsiJavaDirectoryFactory.java +++ b/java/java-impl/src/com/intellij/psi/impl/file/PsiJavaDirectoryFactory.java @@ -15,6 +15,7 @@ */ package com.intellij.psi.impl.file; +import com.intellij.openapi.project.ProjectUtil; import com.intellij.openapi.roots.ProjectRootManager; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; @@ -46,7 +47,7 @@ public class PsiJavaDirectoryFactory extends PsiDirectoryFactory { } return ""; } - return presentable ? directory.getVirtualFile().getPresentableUrl() : ""; + return presentable ? ProjectUtil.getLocationRelativeToUserHome(directory.getVirtualFile().getPresentableUrl()) : ""; } @Override diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java index 15479826bb09..110978c930df 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java @@ -52,6 +52,7 @@ import com.intellij.openapi.fileEditor.ex.FileEditorManagerEx; import com.intellij.openapi.module.Module; import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.Project; +import com.intellij.openapi.project.ProjectUtil; import com.intellij.openapi.roots.*; import com.intellij.openapi.roots.ui.configuration.actions.ModuleDeleteProvider; import com.intellij.openapi.ui.ComboBox; @@ -859,7 +860,7 @@ public final class ProjectViewImpl extends ProjectView implements PersistentStat if (element != null) { PsiFile file = element.getContainingFile(); if (file != null) { - title = file.getVirtualFile().getPresentableUrl(); + title = ProjectUtil.getLocationRelativeToUserHome(file.getVirtualFile().getPresentableUrl()); } else if (element instanceof PsiDirectory) { title = PsiDirectoryFactory.getInstance(myProject).getQualifiedName((PsiDirectory) element, true); @@ -871,7 +872,7 @@ public final class ProjectViewImpl extends ProjectView implements PersistentStat else { title = ""; if (myProject != null) { - title = myProject.getPresentableUrl(); + title = ProjectUtil.getLocationRelativeToUserHome(myProject.getPresentableUrl()); } } } diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/PsiFileNode.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/PsiFileNode.java index 3c5844747f33..45cbf3bc1037 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/PsiFileNode.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/PsiFileNode.java @@ -22,6 +22,7 @@ import com.intellij.ide.projectView.ViewSettings; import com.intellij.ide.util.treeView.AbstractTreeNode; import com.intellij.openapi.fileTypes.StdFileTypes; import com.intellij.openapi.project.Project; +import com.intellij.openapi.project.ProjectUtil; import com.intellij.openapi.util.Iconable; import com.intellij.openapi.vfs.JarFileSystem; import com.intellij.openapi.vfs.VirtualFile; @@ -79,7 +80,7 @@ public class PsiFileNode extends BasePsiNode{ public String getTitle() { final PsiFile file = getValue(); if (file != null) { - return file.getVirtualFile().getPresentableUrl(); + return ProjectUtil.getLocationRelativeToUserHome(file.getVirtualFile().getPresentableUrl()); } return super.getTitle(); } diff --git a/platform/lang-impl/src/com/intellij/psi/impl/file/PsiDirectoryFactoryImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/file/PsiDirectoryFactoryImpl.java index 95b603c9d879..c0c3c1b40a8d 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/file/PsiDirectoryFactoryImpl.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/file/PsiDirectoryFactoryImpl.java @@ -16,9 +16,11 @@ package com.intellij.psi.impl.file; +import com.intellij.openapi.project.ProjectUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiDirectory; import com.intellij.psi.impl.PsiManagerImpl; +import com.intellij.util.PlatformUtils; import org.jetbrains.annotations.NotNull; /** @@ -37,7 +39,7 @@ public class PsiDirectoryFactoryImpl extends PsiDirectoryFactory { @NotNull public String getQualifiedName(@NotNull final PsiDirectory directory, final boolean presentable) { if (presentable) { - return directory.getVirtualFile().getPresentableUrl(); + return ProjectUtil.getLocationRelativeToUserHome(directory.getVirtualFile().getPresentableUrl()); } return ""; } diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/PlatformFrameTitleBuilder.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/PlatformFrameTitleBuilder.java index afce9857faef..9b228d342609 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/PlatformFrameTitleBuilder.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/PlatformFrameTitleBuilder.java @@ -43,12 +43,12 @@ public class PlatformFrameTitleBuilder extends FrameTitleBuilder { if (file instanceof VirtualFilePathWrapper) { return ((VirtualFilePathWrapper)file).getPresentablePath(); } - String url = file.getPresentableUrl(); + String url = ProjectUtil.getLocationRelativeToUserHome(file.getPresentableUrl()); VirtualFile baseDir = ProjectBaseDirectory.getInstance(project).getBaseDir(); if (baseDir == null) baseDir = project.getBaseDir(); if (baseDir != null) { //noinspection ConstantConditions - final String projectHomeUrl = baseDir.getPresentableUrl(); + final String projectHomeUrl = ProjectUtil.getLocationRelativeToUserHome(baseDir.getPresentableUrl()); if (url.startsWith(projectHomeUrl)) { url = "..." + url.substring(projectHomeUrl.length()); }