1 files changed, 10 insertions, 6 deletions
diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/IgnoredFileBean.java b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/IgnoredFileBean.java
index c09ce973634f..1091f908b600 100644
--- a/platform/vcs-api/src/com/intellij/openapi/vcs/changes/IgnoredFileBean.java
+++ b/platform/vcs-api/src/com/intellij/openapi/vcs/changes/IgnoredFileBean.java
@@ -26,7 +26,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.LocalFileSystem;
-import com.intellij.openapi.vfs.VfsUtil;
+import com.intellij.openapi.vfs.VfsUtilCore;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.newvfs.impl.NullVirtualFile;
 import com.intellij.util.PatternUtil;
@@ -49,7 +49,8 @@ public class IgnoredFileBean {
     myType = type;
     if (IgnoreSettingsType.FILE.equals(type)) {
       myFilenameIfFile = new File(path).getName();
-    } else {
+    }
+    else {
       myFilenameIfFile = null;
     }
     myProject = project;
@@ -115,9 +116,10 @@ public class IgnoredFileBean {
     if (myType == IgnoreSettingsType.MASK) {
       myMatcher.reset(file.getName());
       return myMatcher.matches();
-    } else {
+    }
+    else {
       // quick check for 'file' == exact match pattern
-      if (IgnoreSettingsType.FILE.equals(myType) && ! myFilenameIfFile.equals(file.getName())) return false;
+      if (IgnoreSettingsType.FILE.equals(myType) && !myFilenameIfFile.equals(file.getName())) return false;
 
       VirtualFile selector = resolve();
       if (Comparing.equal(selector, NullVirtualFile.INSTANCE)) return false;
@@ -130,7 +132,7 @@ public class IgnoredFileBean {
           // special case for ignoring the project base dir (IDEADEV-16056)
           return !file.isDirectory() && Comparing.equal(file.getParent(), selector);
         }
-        return VfsUtil.isAncestor(selector, file, false);
+        return VfsUtilCore.isAncestor(selector, file, false);
       }
     }
   }
@@ -146,7 +148,9 @@ public class IgnoredFileBean {
 
   @Nullable
   private VirtualFile doResolve() {
-    if (myProject == null || myProject.isDisposed()) { return null; }
+    if (myProject == null || myProject.isDisposed()) {
+      return null;
+    }
     VirtualFile baseDir = myProject.getBaseDir();
 
     String path = FileUtil.toSystemIndependentName(myPath);