From 53fe8004757b4c3bee0613d2ec65f4fc9936f27d Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Thu, 14 Mar 2013 17:48:15 +0400
Subject: [PATCH] compilation

---
 .../core-api/src/com/intellij/openapi/vfs/VfsUtilCore.java | 7 +++++--
 1 file changed, 5 insertions(+), 2 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 57cf1fe4f8ef..93aad356b9de 100644
--- a/platform/core-api/src/com/intellij/openapi/vfs/VfsUtilCore.java
+++ b/platform/core-api/src/com/intellij/openapi/vfs/VfsUtilCore.java
@@ -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