diff options
Diffstat (limited to 'platform/platform-api/src/com/intellij/openapi/vfs/VfsUtil.java')
-rw-r--r-- | platform/platform-api/src/com/intellij/openapi/vfs/VfsUtil.java | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/platform/platform-api/src/com/intellij/openapi/vfs/VfsUtil.java b/platform/platform-api/src/com/intellij/openapi/vfs/VfsUtil.java index 3cd467048e98..254f7749fb25 100644 --- a/platform/platform-api/src/com/intellij/openapi/vfs/VfsUtil.java +++ b/platform/platform-api/src/com/intellij/openapi/vfs/VfsUtil.java @@ -51,7 +51,9 @@ import java.util.*; public class VfsUtil extends VfsUtilCore { private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.vfs.VfsUtil"); - public static final char VFS_PATH_SEPARATOR = '/'; + + /** @deprecated incorrect name, use {@link #VFS_SEPARATOR_CHAR} (to be removed in IDEA 15) */ + public static final char VFS_PATH_SEPARATOR = VFS_SEPARATOR_CHAR; public static void saveText(@NotNull VirtualFile file, @NotNull String text) throws IOException { Charset charset = file.getCharset(); @@ -585,7 +587,7 @@ public class VfsUtil extends VfsUtilCore { if (url == null) { return null; } - final int index = url.lastIndexOf(VFS_PATH_SEPARATOR); + final int index = url.lastIndexOf(VfsUtil.VFS_SEPARATOR_CHAR); return index < 0 ? null : url.substring(0, index); } @@ -598,12 +600,12 @@ public class VfsUtil extends VfsUtilCore { if (urlOrPath == null) { return null; } - final int index = urlOrPath.lastIndexOf(VFS_PATH_SEPARATOR); + final int index = urlOrPath.lastIndexOf(VfsUtil.VFS_SEPARATOR_CHAR); return index < 0 ? null : urlOrPath.substring(index+1); } @NotNull - public static List<VirtualFile> markDirty(boolean recursive, boolean reloadChildren, VirtualFile... files) { + public static List<VirtualFile> markDirty(boolean recursive, boolean reloadChildren, @NotNull VirtualFile... files) { List<VirtualFile> list = ContainerUtil.filter(Condition.NOT_NULL, files); if (list.isEmpty()) { return Collections.emptyList(); @@ -626,7 +628,7 @@ public class VfsUtil extends VfsUtilCore { return list; } - public static void markDirtyAndRefresh(boolean async, boolean recursive, boolean reloadChildren, VirtualFile... files) { + public static void markDirtyAndRefresh(boolean async, boolean recursive, boolean reloadChildren, @NotNull VirtualFile... files) { List<VirtualFile> list = markDirty(recursive, reloadChildren, files); if (list.isEmpty()) return; LocalFileSystem.getInstance().refreshFiles(list, async, recursive, null); |