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

compilation

Browse Source
This commit is contained in:
Alexey Kudravtsev
2013-03-14 17:48:15 +04:00
parent 0187d15d7b
commit 53fe800475
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/core-api/src/com/intellij/openapi/vfs/VfsUtilCore.java
+5 -2
View File
@@ -24,7 +24,6 @@ import com.intellij.util.Function;
import com.intellij.util.PathUtil;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.DistinctRootsCollection;
import com.intellij.util.text.CharsetUtil;
import com.intellij.util.text.StringFactory;
import org.jetbrains.annotations.NonNls;
import org.jetbrains.annotations.NotNull;
@@ -82,6 +81,10 @@ public class VfsUtilCore {
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);
}
public static String doGetRelative(VirtualFile file, VirtualFile ancestor, char separator) {
int length = 0;
VirtualFile parent = file;
while (true) {
@@ -166,7 +169,7 @@ public class VfsUtilCore {
@NotNull
public static InputStream inputStreamSkippingBOM(@NotNull InputStream stream, @NotNull VirtualFile file) throws IOException {
return CharsetUtil.inputStreamSkippingBOM(stream);
return CharsetToolkit.inputStreamSkippingBOM(stream);
}
@NotNull