diff options
Diffstat (limited to 'platform/core-api/src/com/intellij/openapi/vfs/VfsUtilCore.java')
-rw-r--r-- | platform/core-api/src/com/intellij/openapi/vfs/VfsUtilCore.java | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/platform/core-api/src/com/intellij/openapi/vfs/VfsUtilCore.java b/platform/core-api/src/com/intellij/openapi/vfs/VfsUtilCore.java index 9e8c37880589..b3fc7550adfa 100644 --- a/platform/core-api/src/com/intellij/openapi/vfs/VfsUtilCore.java +++ b/platform/core-api/src/com/intellij/openapi/vfs/VfsUtilCore.java @@ -46,6 +46,8 @@ public class VfsUtilCore { private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vfs.VfsUtilCore"); public static final String LOCALHOST_URI_PATH_PREFIX = "localhost/"; + public static final char VFS_SEPARATOR_CHAR = '/'; + private static final String PROTOCOL_DELIMITER = ":"; /** @@ -118,6 +120,11 @@ public class VfsUtilCore { return false; } + @Nullable + public static String getRelativePath(@NotNull VirtualFile file, @NotNull VirtualFile ancestor) { + return getRelativePath(file, ancestor, VFS_SEPARATOR_CHAR); + } + /** * Gets the relative path of <code>file</code> to its <code>ancestor</code>. Uses <code>separator</code> for * separating files. @@ -129,12 +136,10 @@ public class VfsUtilCore { */ @Nullable public static String getRelativePath(@NotNull VirtualFile file, @NotNull VirtualFile ancestor, char separator) { - if (!file.getFileSystem().equals(ancestor.getFileSystem())) return null; - - return doGetRelative(file, ancestor, separator); - } + if (!file.getFileSystem().equals(ancestor.getFileSystem())) { + return null; + } - public static String doGetRelative(VirtualFile file, VirtualFile ancestor, char separator) { int length = 0; VirtualFile parent = file; while (true) { |