diff --git a/platform/lang-impl/src/com/intellij/openapi/file/exclude/PersistentFileSetManager.java b/platform/lang-impl/src/com/intellij/openapi/file/exclude/PersistentFileSetManager.java
index 49338fefcdcc..aab5c78defb8 100644
--- a/platform/lang-impl/src/com/intellij/openapi/file/exclude/PersistentFileSetManager.java
+++ b/platform/lang-impl/src/com/intellij/openapi/file/exclude/PersistentFileSetManager.java
@@ -16,13 +16,13 @@
 package com.intellij.openapi.file.exclude;
 
 import com.intellij.openapi.components.PersistentStateComponent;
-import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VfsUtilCore;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.VirtualFileManager;
 import com.intellij.util.containers.HashSet;
 import org.jdom.Attribute;
 import org.jdom.Element;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.*;
 
@@ -30,8 +30,8 @@ import java.util.*;
  * @author Rustam Vishnyakov
  */
 public class PersistentFileSetManager implements PersistentStateComponent<Element> {
-  private final static String FILE_ELEMENT = "file";
-  private final static String PATH_ATTR = "url";
+  private static final String FILE_ELEMENT = "file";
+  private static final String PATH_ATTR = "url";
 
   private final Set<VirtualFile> myFiles = new HashSet<VirtualFile>();
   
@@ -50,7 +50,8 @@ public class PersistentFileSetManager implements PersistentStateComponent<Elemen
     myFiles.remove(file);
     return true;
   }
-  
+
+  @NotNull
   public Collection<VirtualFile> getFiles() {
     return myFiles;
   }
diff --git a/platform/lang-impl/src/com/intellij/openapi/file/exclude/ProjectPlainTextFileTypeManager.java b/platform/lang-impl/src/com/intellij/openapi/file/exclude/ProjectPlainTextFileTypeManager.java
index ba74997c8433..193e862dada7 100644
--- a/platform/lang-impl/src/com/intellij/openapi/file/exclude/ProjectPlainTextFileTypeManager.java
+++ b/platform/lang-impl/src/com/intellij/openapi/file/exclude/ProjectPlainTextFileTypeManager.java
@@ -21,7 +21,6 @@ import com.intellij.openapi.components.Storage;
 import com.intellij.openapi.components.StoragePathMacros;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.ProjectFileIndex;
-import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.vfs.VirtualFile;
 
 /**
@@ -29,10 +28,10 @@ import com.intellij.openapi.vfs.VirtualFile;
  */
 @State(name = "ProjectPlainTextFileTypeManager", storages = {@Storage( file = StoragePathMacros.PROJECT_FILE)})
 public class ProjectPlainTextFileTypeManager extends PersistentFileSetManager {
-  private ProjectFileIndex myIndex;
+  private final ProjectFileIndex myIndex;
 
-  public ProjectPlainTextFileTypeManager(Project project) {
-    myIndex = ProjectRootManager.getInstance(project).getFileIndex();
+  public ProjectPlainTextFileTypeManager(ProjectFileIndex projectFileIndex) {
+    myIndex = projectFileIndex;
   }
 
   public boolean hasProjectContaining(VirtualFile file) {
@@ -42,5 +41,4 @@ public class ProjectPlainTextFileTypeManager extends PersistentFileSetManager {
   public static ProjectPlainTextFileTypeManager getInstance(Project project) {
     return ServiceManager.getService(project, ProjectPlainTextFileTypeManager.class);
   }
-
 }