From 19cef426a5b1ac0c4a107ee0d2be3349f2124a12 Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Thu, 22 Sep 2011 18:10:30 +0200
Subject: [PATCH] dependencies cleanup

---
 .../intellij/psi/impl/compiled/ClsElementImpl.java |  4 ++--
 .../intellij/psi/impl/source/PsiJavaFileImpl.java  | 14 +++++---------
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsElementImpl.java b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsElementImpl.java
index 28747d95e8f6..aef59c496d88 100644
--- a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsElementImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsElementImpl.java
@@ -15,11 +15,11 @@
  */
 package com.intellij.psi.impl.compiled;
 
+import com.intellij.ide.highlighter.JavaFileType;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.Language;
 import com.intellij.lang.java.JavaLanguage;
 import com.intellij.openapi.diagnostic.Logger;
-import com.intellij.openapi.fileTypes.StdFileTypes;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.*;
@@ -113,7 +113,7 @@ public abstract class ClsElementImpl extends PsiElementBase implements PsiCompil
   }
 
   protected int getIndentSize() {
-    return CodeStyleSettingsManager.getSettings(getProject()).getIndentSize(StdFileTypes.JAVA);
+    return CodeStyleSettingsManager.getSettings(getProject()).getIndentSize(JavaFileType.INSTANCE);
   }
 
   public abstract void setMirror(@NotNull TreeElement element);
diff --git a/java/java-impl/src/com/intellij/psi/impl/source/PsiJavaFileImpl.java b/java/java-impl/src/com/intellij/psi/impl/source/PsiJavaFileImpl.java
index 57b874d0a637..11bd56a8f739 100644
--- a/java/java-impl/src/com/intellij/psi/impl/source/PsiJavaFileImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/source/PsiJavaFileImpl.java
@@ -15,21 +15,17 @@
  */
 package com.intellij.psi.impl.source;
 
+import com.intellij.ide.highlighter.JavaFileType;
 import com.intellij.lexer.JavaLexer;
 import com.intellij.lexer.Lexer;
+import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.fileTypes.FileType;
-import com.intellij.openapi.fileTypes.StdFileTypes;
-import com.intellij.openapi.roots.ProjectRootManager;
-import com.intellij.openapi.roots.ProjectFileIndex;
+import com.intellij.openapi.roots.FileIndexFacade;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.FileViewProvider;
-import com.intellij.psi.JavaPsiFacade;
-import com.intellij.psi.PsiElementFactory;
-import com.intellij.psi.PsiPackageStatement;
 import com.intellij.psi.impl.java.stubs.JavaStubElementTypes;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.search.GlobalSearchScopes;
-import com.intellij.util.IncorrectOperationException;
 import com.intellij.testFramework.LightVirtualFile;
 import org.jetbrains.annotations.NotNull;
 
@@ -51,7 +47,7 @@ public class PsiJavaFileImpl extends PsiJavaFileBaseImpl {
   public GlobalSearchScope getResolveScope() {
     final VirtualFile file = getVirtualFile();
     if (file != null && !(file instanceof LightVirtualFile)) {
-      final ProjectFileIndex index = ProjectRootManager.getInstance(getProject()).getFileIndex();
+      final FileIndexFacade index = ServiceManager.getService(getProject(), FileIndexFacade.class);
       if (!index.isInSource(file) && !index.isInLibraryClasses(file)) {
         return GlobalSearchScopes.fileScope(this);
       }
@@ -61,6 +57,6 @@ public class PsiJavaFileImpl extends PsiJavaFileBaseImpl {
 
   @NotNull
   public FileType getFileType() {
-    return StdFileTypes.JAVA;
+    return JavaFileType.INSTANCE;
   }
 }