replaced FileTypeRegistry.getFileTypeByFile() with file.getFileType()

diff --git a/images/src/org/intellij/images/fileTypes/impl/ImageFileTypeManagerImpl.java b/images/src/org/intellij/images/fileTypes/impl/ImageFileTypeManagerImpl.java
index a04402da7596dc26386d95c27344c1914b57aaf0..761f578bb50fe62b95b9a4153c7772b79abfea41 100644 (file)
--- a/images/src/org/intellij/images/fileTypes/impl/ImageFileTypeManagerImpl.java
+++ b/images/src/org/intellij/images/fileTypes/impl/ImageFileTypeManagerImpl.java
@@ -53,7 +53,7 @@ final class ImageFileTypeManagerImpl extends ImageFileTypeManager implements App
 
   public boolean isImage(VirtualFile file) {
     FileTypeManager fileTypeManager = FileTypeManager.getInstance();
-    FileType fileTypeByFile = fileTypeManager.getFileTypeByFile(file);
+    FileType fileTypeByFile = file.getFileType();
     return fileTypeByFile instanceof ImageFileType;
   }
 

diff --git a/java/compiler/impl/src/com/intellij/compiler/actions/CompileAction.java b/java/compiler/impl/src/com/intellij/compiler/actions/CompileAction.java
index 2441648578a6f92f4aa7393fce826144929d7c4a..7793fcb8a33704ee6460493a0da17df3af4e6dc2 100644 (file)
--- a/java/compiler/impl/src/com/intellij/compiler/actions/CompileAction.java
+++ b/java/compiler/impl/src/com/intellij/compiler/actions/CompileAction.java
@@ -107,7 +107,7 @@ public class CompileAction extends CompileActionBase {
       }
       else if (files.length == 1) {
         final VirtualFile file = files[0];
-        FileType fileType = FileTypeManager.getInstance().getFileTypeByFile(file);
+        FileType fileType = file.getFileType();
         if (CompilerManager.getInstance(project).isCompilableFileType(fileType) || isCompilableResourceFile(project, compilerConfiguration, file)) {
           elementDescription = "'" + file.getName() + "'";
         }
@@ -175,7 +175,7 @@ public class CompileAction extends CompileActionBase {
         }
       }
       else {
-        FileType fileType = typeManager.getFileTypeByFile(file);
+        FileType fileType = file.getFileType();
         if (!(compilerManager.isCompilableFileType(fileType) || isCompilableResourceFile(project, compilerConfiguration, file))) {
           continue;
         }

diff --git a/java/compiler/impl/src/com/intellij/compiler/actions/ProcessAnnotationsAction.java b/java/compiler/impl/src/com/intellij/compiler/actions/ProcessAnnotationsAction.java
index d1723a8f29f987be13949c7ea4e4d7a4f6f3b1d9..47757caee0c07db25e6ae7b20ed691e0080fd2ce 100644 (file)
--- a/java/compiler/impl/src/com/intellij/compiler/actions/ProcessAnnotationsAction.java
+++ b/java/compiler/impl/src/com/intellij/compiler/actions/ProcessAnnotationsAction.java
@@ -127,7 +127,7 @@ public class ProcessAnnotationsAction extends CompileActionBase {
       }
       else if (files.size() == 1) {
         final VirtualFile file = files.iterator().next();
-        FileType fileType = FileTypeManager.getInstance().getFileTypeByFile(file);
+        FileType fileType = file.getFileType();
         if (CompilerManager.getInstance(project).isCompilableFileType(fileType)) {
           elementDescription = "'" + file.getName() + "'";
         }
@@ -185,7 +185,7 @@ public class ProcessAnnotationsAction extends CompileActionBase {
         }
       }
       else {
-        FileType fileType = typeManager.getFileTypeByFile(file);
+        FileType fileType = file.getFileType();
         if (!(compilerManager.isCompilableFileType(fileType))) {
           continue;
         }

diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/CompilerContentIterator.java b/java/compiler/impl/src/com/intellij/compiler/impl/CompilerContentIterator.java
index 64de3f9cd9cebb0f8e967457c34e4029e61b0e60..74bba4091d7bcce6d1d2c6e4bad80bef8c907338 100644 (file)
--- a/java/compiler/impl/src/com/intellij/compiler/impl/CompilerContentIterator.java
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/CompilerContentIterator.java
@@ -42,7 +42,7 @@ public class CompilerContentIterator implements ContentIterator {
     if (fileOrDir.isDirectory()) return true;
     if (!fileOrDir.isInLocalFileSystem()) return true;
     if (myInSourceOnly && !myFileIndex.isInSourceContent(fileOrDir)) return true;
-    if (myFileType == null || myFileType == fileTypeManager.getFileTypeByFile(fileOrDir)) {
+    if (myFileType == null || myFileType == fileOrDir.getFileType()) {
       myFiles.add(fileOrDir);
     }
     return true;

diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/FileSetCompileScope.java b/java/compiler/impl/src/com/intellij/compiler/impl/FileSetCompileScope.java
index 9d4ba6a720564334fb75db327f89027bffb95279..38ab59e6ee7b40c2e531e7a1124f9f90dc23d9e8 100644 (file)
--- a/java/compiler/impl/src/com/intellij/compiler/impl/FileSetCompileScope.java
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/FileSetCompileScope.java
@@ -77,7 +77,7 @@ public class FileSetCompileScope extends UserDataHolderBase implements CompileSc
         addRecursively(files, file, fileType);
       }
       else {
-        if (fileType == null || fileType.equals(typeManager.getFileTypeByFile(file))) {
+        if (fileType == null || fileType.equals(file.getFileType())) {
           files.add(file);
         }
       }
@@ -126,7 +126,7 @@ public class FileSetCompileScope extends UserDataHolderBase implements CompileSc
           addRecursively(container, child, fileType);
         }
         else {
-          if (fileType == null || fileType.equals(typeManager.getFileTypeByFile(child))) {
+          if (fileType == null || fileType.equals(child.getFileType())) {
             container.add(child);
           }
         }

diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/BackendCompilerWrapper.java b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/BackendCompilerWrapper.java
index 62cf7fb60f4c704107ec25b7a5db843fa1ff19b0..58768a2bf4b90755fbd51838dc1283806471c1ac 100644 (file)
--- a/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/BackendCompilerWrapper.java
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/javaCompiler/BackendCompilerWrapper.java
@@ -592,7 +592,7 @@ public class BackendCompilerWrapper {
       public boolean processFile(final VirtualFile child) {
         try {
           assert child.isValid();
-          if (!child.isDirectory() && myCompiler.getCompilableFileTypes().contains(typeManager.getFileTypeByFile(child))) {
+          if (!child.isDirectory() && myCompiler.getCompilableFileTypes().contains(child.getFileType())) {
             updateOutputItemsList(outputDir, child, sourceRoot, packagePrefix, filesToRefresh, results, srcRootScope);
           }
           return true;

diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/resourceCompiler/ResourceCompiler.java b/java/compiler/impl/src/com/intellij/compiler/impl/resourceCompiler/ResourceCompiler.java
index ae95ced0efa3206cd7ec24dbd418c783ed0c6a37..99ca53fa1b2a3df2398a963d843584b10ade7e31 100644 (file)
--- a/java/compiler/impl/src/com/intellij/compiler/impl/resourceCompiler/ResourceCompiler.java
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/resourceCompiler/ResourceCompiler.java
@@ -68,7 +68,7 @@ public class ResourceCompiler implements TranslatingCompiler {
   }
 
   public boolean isCompilableFile(VirtualFile file, CompileContext context) {
-    return !StdFileTypes.JAVA.equals(FILE_TYPE_MANAGER.getFileTypeByFile(file)) && myConfiguration.isResourceFile(file);
+    return !StdFileTypes.JAVA.equals(file.getFileType()) && myConfiguration.isResourceFile(file);
   }
 
   public void compile(final CompileContext context, Chunk<Module> moduleChunk, final VirtualFile[] files, OutputSink sink) {

diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/RunToCursorActionHandler.java b/java/debugger/impl/src/com/intellij/debugger/actions/RunToCursorActionHandler.java
index d61805dede89adc613d0b98130db365d7a6e6aad..56ed1c566584700e47e0ac6a1438a213f8beeba8 100644 (file)
--- a/java/debugger/impl/src/com/intellij/debugger/actions/RunToCursorActionHandler.java
+++ b/java/debugger/impl/src/com/intellij/debugger/actions/RunToCursorActionHandler.java
@@ -63,7 +63,7 @@ public class RunToCursorActionHandler extends DebuggerActionHandler {
     }
 
     final VirtualFile virtualFile = file.getVirtualFile();
-    FileType fileType = virtualFile != null ? fileTypeManager.getFileTypeByFile(virtualFile) : null;
+    FileType fileType = virtualFile != null ? virtualFile.getFileType() : null;
     if (DebuggerUtils.supportsJVMDebugging(fileType) || DebuggerUtils.supportsJVMDebugging(file)) {
       DebuggerSession debuggerSession = DebuggerManagerEx.getInstanceEx(project).getContext().getDebuggerSession();
       return debuggerSession != null && debuggerSession.isPaused();

diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/ToggleBreakpointEnabledAction.java b/java/debugger/impl/src/com/intellij/debugger/actions/ToggleBreakpointEnabledAction.java
index 64bb8c240ea5ce43758024a6e9ab670af79b0faf..a3f395bbd2acc0e919b507e310893763e8409e68 100644 (file)
--- a/java/debugger/impl/src/com/intellij/debugger/actions/ToggleBreakpointEnabledAction.java
+++ b/java/debugger/impl/src/com/intellij/debugger/actions/ToggleBreakpointEnabledAction.java
@@ -76,7 +76,7 @@ public class ToggleBreakpointEnabledAction extends AnAction {
 
     FileTypeManager fileTypeManager = FileTypeManager.getInstance();
     final VirtualFile virtualFile = file.getVirtualFile();
-    FileType fileType = virtualFile != null ? fileTypeManager.getFileTypeByFile(virtualFile) : null;
+    FileType fileType = virtualFile != null ? virtualFile.getFileType() : null;
     if (DebuggerUtils.supportsJVMDebugging(fileType) || DebuggerUtils.supportsJVMDebugging(file)) {
       Breakpoint breakpoint = findBreakpoint(project);
       if (breakpoint == null) {

diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/ToggleFieldBreakpointAction.java b/java/debugger/impl/src/com/intellij/debugger/actions/ToggleFieldBreakpointAction.java
index dc3449921fc52d054c7c2f8abd095fd1f43b8d41..41dfa24b64f422a0dcbfacf2da1dae5c3df8ab06 100644 (file)
--- a/java/debugger/impl/src/com/intellij/debugger/actions/ToggleFieldBreakpointAction.java
+++ b/java/debugger/impl/src/com/intellij/debugger/actions/ToggleFieldBreakpointAction.java
@@ -176,7 +176,7 @@ public class ToggleFieldBreakpointAction extends AnAction {
       if (file != null) {
         FileTypeManager fileTypeManager = FileTypeManager.getInstance();
         final VirtualFile virtualFile = file.getVirtualFile();
-        FileType fileType = virtualFile != null ? fileTypeManager.getFileTypeByFile(virtualFile) : null;
+        FileType fileType = virtualFile != null ? virtualFile.getFileType() : null;
         if (StdFileTypes.JAVA == fileType || StdFileTypes.CLASS  == fileType) {
           final PsiField field = FieldBreakpoint.findField(project, document, editor.getCaretModel().getOffset());
           if(field != null){

diff --git a/java/debugger/impl/src/com/intellij/debugger/actions/ToggleMethodBreakpointAction.java b/java/debugger/impl/src/com/intellij/debugger/actions/ToggleMethodBreakpointAction.java
index 538dd76a0399a7b908f411eff8d195883298e10d..15d34a6e1eb05ac98f7e977cdb19861b5c058bba 100644 (file)
--- a/java/debugger/impl/src/com/intellij/debugger/actions/ToggleMethodBreakpointAction.java
+++ b/java/debugger/impl/src/com/intellij/debugger/actions/ToggleMethodBreakpointAction.java
@@ -111,7 +111,7 @@ public class ToggleMethodBreakpointAction extends AnAction {
         if (file != null) {
           FileTypeManager fileTypeManager = FileTypeManager.getInstance();
           final VirtualFile virtualFile = file.getVirtualFile();
-          FileType fileType = virtualFile != null ? fileTypeManager.getFileTypeByFile(virtualFile) : null;
+          FileType fileType = virtualFile != null ? virtualFile.getFileType() : null;
           if (StdFileTypes.JAVA == fileType || StdFileTypes.CLASS  == fileType) {
             method = findMethod(project, editor);
           }

diff --git a/java/debugger/impl/src/com/intellij/debugger/impl/HotSwapManager.java b/java/debugger/impl/src/com/intellij/debugger/impl/HotSwapManager.java
index f531717f6bdd4a2a1960abc0a987581dd9ebe9ab..8821ab1c8ae0df49136554eae412ee39d70e7be9 100644 (file)
--- a/java/debugger/impl/src/com/intellij/debugger/impl/HotSwapManager.java
+++ b/java/debugger/impl/src/com/intellij/debugger/impl/HotSwapManager.java
@@ -88,7 +88,7 @@ public class HotSwapManager extends AbstractProjectComponent {
               return;
             }
             progress.setText(DebuggerBundle.message("progress.hotswap.scanning.path", filePath));
-            if(file.getFileSystem() instanceof JarFileSystem && FileTypes.ARCHIVE.equals(fileTypeManager.getFileTypeByFile(file))) {
+            if(file.getFileSystem() instanceof JarFileSystem && FileTypes.ARCHIVE.equals(file.getFileType())) {
               if(file.getTimeStamp() > timeStamp) {
                 super.acceptDirectory(file, fileRoot, filePath);
               }
@@ -102,7 +102,7 @@ public class HotSwapManager extends AbstractProjectComponent {
             if (progress.isCancelled()) {
               return;
             }
-            if (file.getTimeStamp() > timeStamp && StdFileTypes.CLASS.equals(fileTypeManager.getFileTypeByFile(file))) {
+            if (file.getTimeStamp() > timeStamp && StdFileTypes.CLASS.equals(file.getFileType())) {
               //noinspection HardCodedStringLiteral
               if (SystemInfo.isFileSystemCaseSensitive? filePath.endsWith(CLASS_EXTENSION) : StringUtil.endsWithIgnoreCase(filePath, CLASS_EXTENSION)) {
                 progress.setText(DebuggerBundle.message("progress.hotswap.scanning.path", filePath));

diff --git a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/ImportImlMode.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/ImportImlMode.java
index da740a33d8ad3260bb702fd0eab5b42b00c39a54..f1bd7e0835650d074abcd6ae59d25aae9139b463 100644 (file)
--- a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/ImportImlMode.java
+++ b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/modes/ImportImlMode.java
@@ -120,7 +120,7 @@ public class ImportImlMode extends WizardMode {
       if (!isVisible || file.isDirectory()) {
         return isVisible;
       }
-      return StdFileTypes.IDEA_MODULE.equals(FileTypeManager.getInstance().getFileTypeByFile(file));
+      return StdFileTypes.IDEA_MODULE.equals(file.getFileType());
     }
   }
 }
\ No newline at end of file

diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/util/ValidFileCellAppearance.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/util/ValidFileCellAppearance.java
index efb412c767aed998033551fd6774e3afcd98f0a1..513bafcb1fd1bc92930f6cb16f113eb03997cf10 100644 (file)
--- a/java/idea-ui/src/com/intellij/openapi/roots/ui/util/ValidFileCellAppearance.java
+++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/util/ValidFileCellAppearance.java
@@ -29,7 +29,7 @@ public class ValidFileCellAppearance extends BaseTextCommentCellAppearance {
   }
 
   protected Icon getIcon() {
-    return FileTypeManager.getInstance().getFileTypeByFile(myFile).getIcon();
+    return myFile.getFileType().getIcon();
   }
 
   protected String getSecondaryText() {

diff --git a/java/java-impl/src/com/intellij/ide/JavaFileIconPatcher.java b/java/java-impl/src/com/intellij/ide/JavaFileIconPatcher.java
index 2fd17fe42d0291946f59e9ccbe4276eb4c823679..7299612ac640c528cb682f85efa1095cf16597c8 100644 (file)
--- a/java/java-impl/src/com/intellij/ide/JavaFileIconPatcher.java
+++ b/java/java-impl/src/com/intellij/ide/JavaFileIconPatcher.java
@@ -52,7 +52,7 @@ public class JavaFileIconPatcher implements FileIconPatcher {
   }
 
   private static Icon replaceIcon(VirtualFile file, int flags, Project project, Icon baseIcon) {
-    FileType fileType = FileTypeManager.getInstance().getFileTypeByFile(file);
+    FileType fileType = file.getFileType();
     if (fileType == StdFileTypes.JAVA && !FileIndexUtil.isJavaSourceFile(project, file)) {
       return PlatformIcons.JAVA_OUTSIDE_SOURCE_ICON;
     }

diff --git a/java/openapi/src/com/intellij/openapi/roots/FileIndexUtil.java b/java/openapi/src/com/intellij/openapi/roots/FileIndexUtil.java
index 692e9c0c520e70f5e00c46b6332460ca45c1105d..42e5f38794bf7b9dd568c1122e6baf0b872c5155 100644 (file)
--- a/java/openapi/src/com/intellij/openapi/roots/FileIndexUtil.java
+++ b/java/openapi/src/com/intellij/openapi/roots/FileIndexUtil.java
@@ -31,7 +31,7 @@ public class FileIndexUtil {
   public static boolean isJavaSourceFile(@NotNull Project project, @NotNull VirtualFile file) {
     FileTypeManager fileTypeManager = FileTypeManager.getInstance();
     if (file.isDirectory()) return false;
-    if (fileTypeManager.getFileTypeByFile(file) != StdFileTypes.JAVA) return false;
+    if (file.getFileType() != StdFileTypes.JAVA) return false;
     if (fileTypeManager.isFileIgnored(file)) return false;
     return ProjectRootManager.getInstance(project).getFileIndex().isInSource(file);
   }

diff --git a/platform/core-api/src/com/intellij/psi/search/GlobalSearchScope.java b/platform/core-api/src/com/intellij/psi/search/GlobalSearchScope.java
index 51670e4368cc66e545692fe9cddcf286a85b931a..32138b8c3da5a515246851a03524a4647552fcbf 100644 (file)
--- a/platform/core-api/src/com/intellij/psi/search/GlobalSearchScope.java
+++ b/platform/core-api/src/com/intellij/psi/search/GlobalSearchScope.java
@@ -406,7 +406,7 @@ public abstract class GlobalSearchScope extends SearchScope implements ProjectAw
     public boolean contains(VirtualFile file) {
       if (!super.contains(file)) return false;
 
-      final FileType fileType = FileTypeRegistry.getInstance().getFileTypeByFile(file);
+      final FileType fileType = file.getFileType();
       for (FileType otherFileType : myFileTypes) {
         if (fileType.equals(otherFileType)) return true;
       }

diff --git a/platform/core-impl/src/com/intellij/core/CoreFileTypeRegistry.java b/platform/core-impl/src/com/intellij/core/CoreFileTypeRegistry.java
index 908109a2a2e5c3561c1e52a39b9ac271043dc645..df0db12a1438a964b6a7e8b99e6a80393c5da503 100644 (file)
--- a/platform/core-impl/src/com/intellij/core/CoreFileTypeRegistry.java
+++ b/platform/core-impl/src/com/intellij/core/CoreFileTypeRegistry.java
@@ -32,8 +32,8 @@ import java.util.Map;
  * @author yole
  */
 public class CoreFileTypeRegistry extends FileTypeRegistry {
-  private Map<String, FileType> myExtensionsMap = new HashMap<String, FileType>();
-  private List<FileType> myAllFileTypes = new ArrayList<FileType>();
+  private final Map<String, FileType> myExtensionsMap = new HashMap<String, FileType>();
+  private final List<FileType> myAllFileTypes = new ArrayList<FileType>();
 
   public CoreFileTypeRegistry() {
     myAllFileTypes.add(UnknownFileType.INSTANCE);

diff --git a/platform/core-impl/src/com/intellij/util/indexing/FileContentImpl.java b/platform/core-impl/src/com/intellij/util/indexing/FileContentImpl.java
index b47d103a6e5ed7a08aa7c420703aabba25f2c22d..68405a760786d8ebf757ea75d7d5948f879005c3 100644 (file)
--- a/platform/core-impl/src/com/intellij/util/indexing/FileContentImpl.java
+++ b/platform/core-impl/src/com/intellij/util/indexing/FileContentImpl.java
@@ -18,7 +18,6 @@ package com.intellij.util.indexing;
 import com.intellij.lang.Language;
 import com.intellij.openapi.fileEditor.impl.LoadTextUtil;
 import com.intellij.openapi.fileTypes.FileType;
-import com.intellij.openapi.fileTypes.FileTypeRegistry;
 import com.intellij.openapi.fileTypes.LanguageFileType;
 import com.intellij.openapi.project.DefaultProjectFactory;
 import com.intellij.openapi.project.Project;
@@ -102,7 +101,7 @@ public final class FileContentImpl extends UserDataHolderBase implements FileCon
     myContentAsText = contentAsText;
     myContent = content;
     myCharset = charset;
-    myFileType = FileTypeRegistry.getInstance().getFileTypeByFile(file);
+    myFileType = file.getFileType();
     // remember name explicitly because the file could be renamed afterwards
     myFileName = file.getName();
   }

diff --git a/platform/lang-api/src/com/intellij/openapi/projectRoots/ui/PathEditor.java b/platform/lang-api/src/com/intellij/openapi/projectRoots/ui/PathEditor.java
index 8d8e1174b4864a55e7900f7e0fabf9eb81e08add..3d1b22e88c3fdd6dbb61edf5c70f0ca5123b3efe 100644 (file)
--- a/platform/lang-api/src/com/intellij/openapi/projectRoots/ui/PathEditor.java
+++ b/platform/lang-api/src/com/intellij/openapi/projectRoots/ui/PathEditor.java
@@ -376,7 +376,7 @@ public class PathEditor {
           tempFile = LocalFileSystem.getInstance().findFileByPath(path);
         }
         if (tempFile != null && !tempFile.isDirectory()) {
-          return Boolean.valueOf(FileTypeManager.getInstance().getFileTypeByFile(tempFile).equals(FileTypes.ARCHIVE));
+          return Boolean.valueOf(tempFile.getFileType().equals(FileTypes.ARCHIVE));
         }
         return Boolean.FALSE;
       }

diff --git a/platform/lang-impl/src/com/intellij/find/actions/UsageListCellRenderer.java b/platform/lang-impl/src/com/intellij/find/actions/UsageListCellRenderer.java
index 012eef21c17c606e89a470d3f50daddb220bce34..caf99b9fb0f2c22e97cc50b924a95005453d5663 100644 (file)
--- a/platform/lang-impl/src/com/intellij/find/actions/UsageListCellRenderer.java
+++ b/platform/lang-impl/src/com/intellij/find/actions/UsageListCellRenderer.java
@@ -55,7 +55,7 @@ public class UsageListCellRenderer extends ColoredListCellRenderer {
     VirtualFile virtualFile = getVirtualFile(usage);
     if (virtualFile != null) {
       append(virtualFile.getName() + ": ", SimpleTextAttributes.REGULAR_ATTRIBUTES);
-      setIcon(FileTypeManager.getInstance().getFileTypeByFile(virtualFile).getIcon());
+      setIcon(virtualFile.getFileType().getIcon());
       PsiFile psiFile = PsiManager.getInstance(myProject).findFile(virtualFile);
       if (psiFile != null) {
         setIcon(psiFile.getIcon(0));

diff --git a/platform/lang-impl/src/com/intellij/find/impl/FindInProjectUtil.java b/platform/lang-impl/src/com/intellij/find/impl/FindInProjectUtil.java
index 1aeb6cd3dc6439918ca8103fb891b13396245046..29b2dd4c598ddcf07a71a5b5ca5dd83147fedcb5 100644 (file)
--- a/platform/lang-impl/src/com/intellij/find/impl/FindInProjectUtil.java
+++ b/platform/lang-impl/src/com/intellij/find/impl/FindInProjectUtil.java
@@ -304,7 +304,7 @@ public class FindInProjectUtil {
                                          final Processor<UsageInfo> consumer) {
     final VirtualFile virtualFile = psiFile.getVirtualFile();
     if (virtualFile == null) return 0;
-    if (FileTypeManager.getInstance().getFileTypeByFile(virtualFile).isBinary()) return 0; // do not decompile .class files
+    if (virtualFile.getFileType().isBinary()) return 0; // do not decompile .class files
     final Document document = FileDocumentManager.getInstance().getDocument(virtualFile);
     if (document == null) return 0;
     final int[] offset = {0};
@@ -343,7 +343,7 @@ public class FindInProjectUtil {
     ApplicationManager.getApplication().runReadAction(new Runnable() {
       public void run() {
         if (!virtualFile.isValid()) return;
-        if (FileTypeManager.getInstance().getFileTypeByFile(virtualFile).isBinary()) return;
+        if (virtualFile.getFileType().isBinary()) return;
         length[0] = virtualFile.getLength();
       }
     });
@@ -423,7 +423,7 @@ public class FindInProjectUtil {
     final VirtualFileFilter contentFilter = new VirtualFileFilter() {
       public boolean accept(final VirtualFile file) {
         return file.isDirectory() ||
-               !fileTypeManager.isFileIgnored(file) && !fileTypeManager.getFileTypeByFile(file).isBinary() && searchScope.contains(file);
+               !fileTypeManager.isFileIgnored(file) && !file.getFileType().isBinary() && searchScope.contains(file);
       }
     };
     for (VirtualFile file : files) {

diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/ProjectViewPsiTreeChangeListener.java b/platform/lang-impl/src/com/intellij/ide/projectView/ProjectViewPsiTreeChangeListener.java
index 277372415e36050fc90a98c2b9935b600d047a46..7ef50c1d79cac437adee1b502e0e47c3ffd98357 100644 (file)
--- a/platform/lang-impl/src/com/intellij/ide/projectView/ProjectViewPsiTreeChangeListener.java
+++ b/platform/lang-impl/src/com/intellij/ide/projectView/ProjectViewPsiTreeChangeListener.java
@@ -87,7 +87,7 @@ public abstract class ProjectViewPsiTreeChangeListener extends PsiTreeChangeAdap
       if (parent == null) break;
       if (parent instanceof PsiFile) {
         VirtualFile virtualFile = ((PsiFile)parent).getVirtualFile();
-        if (virtualFile != null && myFileTypeManager.getFileTypeByFile(virtualFile) != FileTypes.PLAIN_TEXT) {
+        if (virtualFile != null && virtualFile.getFileType() != FileTypes.PLAIN_TEXT) {
           // adding a class within a file causes a new node to appear in project view => entire dir should be updated
           parent = ((PsiFile)parent).getContainingDirectory();
           if (parent == null) break;

diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/impl/ModuleFileIndexImpl.java b/platform/lang-impl/src/com/intellij/openapi/roots/impl/ModuleFileIndexImpl.java
index 187bd3910390c593c68396a186bd540baf5db5e4..f66fd5a640f927df80ae0c22472078008e7c160b 100644 (file)
--- a/platform/lang-impl/src/com/intellij/openapi/roots/impl/ModuleFileIndexImpl.java
+++ b/platform/lang-impl/src/com/intellij/openapi/roots/impl/ModuleFileIndexImpl.java
@@ -70,7 +70,7 @@ public class ModuleFileIndexImpl implements ModuleFileIndex {
 
   public boolean isContentJavaSourceFile(@NotNull VirtualFile file) {
     return !file.isDirectory()
-           && myFileTypeManager.getFileTypeByFile(file) == StdFileTypes.JAVA
+           && file.getFileType() == StdFileTypes.JAVA
            && !myFileTypeManager.isFileIgnored(file)
            && isInSourceContent(file);
   }

diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/impl/ProjectFileIndexImpl.java b/platform/lang-impl/src/com/intellij/openapi/roots/impl/ProjectFileIndexImpl.java
index 4a1fe45776b9bf5a0fb980dffc7a1a3a1d859acc..97d7580e0cc162e07c80eb3df865fa4bc5b11e6e 100644 (file)
--- a/platform/lang-impl/src/com/intellij/openapi/roots/impl/ProjectFileIndexImpl.java
+++ b/platform/lang-impl/src/com/intellij/openapi/roots/impl/ProjectFileIndexImpl.java
@@ -158,14 +158,14 @@ public class ProjectFileIndexImpl implements ProjectFileIndex {
 
   public boolean isContentJavaSourceFile(@NotNull VirtualFile file) {
     return !file.isDirectory() &&
-           myFileTypeManager.getFileTypeByFile(file) == StdFileTypes.JAVA &&
+           file.getFileType() == StdFileTypes.JAVA &&
            !myFileTypeManager.isFileIgnored(file) &&
            isInSourceContent(file);
   }
 
   public boolean isLibraryClassFile(@NotNull VirtualFile file) {
     if (file.isDirectory()) return false;
-    if (myFileTypeManager.getFileTypeByFile(file) != StdFileTypes.CLASS) return false;
+    if (file.getFileType() != StdFileTypes.CLASS) return false;
     if (myFileTypeManager.isFileIgnored(file)) return false;
     VirtualFile parent = file.getParent();
     DirectoryInfo parentInfo = getInfoForDirectory(parent);

diff --git a/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/todo/TodoIndex.java b/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/todo/TodoIndex.java
index 6d410ad075f98668636d3fc370ddfe503f1d7732..915546308966c3ac5187bd36c6d95361ffc35b5e 100644 (file)
--- a/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/todo/TodoIndex.java
+++ b/platform/lang-impl/src/com/intellij/psi/impl/cache/impl/todo/TodoIndex.java
@@ -110,7 +110,7 @@ public class TodoIndex extends FileBasedIndexExtension<TodoIndexEntry, Integer>
         return false; // do not index TODOs in library sources
       }
 
-      final FileType fileType = myFtManager.getFileTypeByFile(file);
+      final FileType fileType = file.getFileType();
       if (ProjectUtil.isProjectOrWorkspaceFile(file, fileType)) {
         return false;
       }

diff --git a/platform/platform-api/src/com/intellij/openapi/diff/DiffContentUtil.java b/platform/platform-api/src/com/intellij/openapi/diff/DiffContentUtil.java
index e7f57c00f0f358d0cfcbde7edf7aa423f57cc00c..f10d0f6537aaeab47d0ba8e20462d1d669a31260 100644 (file)
--- a/platform/platform-api/src/com/intellij/openapi/diff/DiffContentUtil.java
+++ b/platform/platform-api/src/com/intellij/openapi/diff/DiffContentUtil.java
@@ -16,7 +16,6 @@
 package com.intellij.openapi.diff;
 
 import com.intellij.openapi.fileTypes.FileType;
-import com.intellij.openapi.fileTypes.FileTypeManager;
 import com.intellij.openapi.vfs.VirtualFile;
 
 /**
@@ -25,12 +24,12 @@ import com.intellij.openapi.vfs.VirtualFile;
 public class DiffContentUtil {
   public static FileType getContentType(VirtualFile file) {
     if (file == null) return null;
-    return FileTypeManager.getInstance().getFileTypeByFile(file);
+    return file.getFileType();
   }
 
   public static boolean isTextFile(VirtualFile file) {
     return file != null && file.isValid() && !file.isDirectory() &&
-           isTextType(FileTypeManager.getInstance().getFileTypeByFile(file));
+           isTextType(file.getFileType());
   }
 
   public static boolean isTextType(FileType fileType) {

diff --git a/platform/platform-api/src/com/intellij/openapi/diff/FileContent.java b/platform/platform-api/src/com/intellij/openapi/diff/FileContent.java
index 92b4f63633f60b00ff7f78325892cba15b22d8b0..84c2500233c4d57c1838f8ff853384cf3dcb43c1 100644 (file)
--- a/platform/platform-api/src/com/intellij/openapi/diff/FileContent.java
+++ b/platform/platform-api/src/com/intellij/openapi/diff/FileContent.java
@@ -66,7 +66,7 @@ public class FileContent extends DiffContent {
 
   public boolean isBinary() {
     if (myFile.isDirectory()) return false;
-    return FileTypeManager.getInstance().getFileTypeByFile(myFile).isBinary();
+    return myFile.getFileType().isBinary();
   }
 
   public static FileContent createFromTempFile(Project project, String name, String ext, byte[] content) throws IOException {

diff --git a/platform/platform-api/src/com/intellij/openapi/diff/FragmentContent.java b/platform/platform-api/src/com/intellij/openapi/diff/FragmentContent.java
index 4ffe3988aada8f7e8e23fd8c769214bb999de2a8..f6cc099264bdbdca80078e6af94e8dbd79154e88 100644 (file)
--- a/platform/platform-api/src/com/intellij/openapi/diff/FragmentContent.java
+++ b/platform/platform-api/src/com/intellij/openapi/diff/FragmentContent.java
@@ -91,7 +91,7 @@ public class FragmentContent extends DiffContent {
   public static FragmentContent fromRangeMarker(RangeMarker rangeMarker, Project project) {
     Document document = rangeMarker.getDocument();
     VirtualFile file = FileDocumentManager.getInstance().getFile(document);
-    FileType type = FileTypeManager.getInstance().getFileTypeByFile(file);
+    FileType type = file.getFileType();
     return new FragmentContent(new DocumentContent(project, document), TextRange.create(rangeMarker), project, type);
   }
 

diff --git a/platform/platform-api/src/com/intellij/openapi/editor/LazyRangeMarkerFactory.java b/platform/platform-api/src/com/intellij/openapi/editor/LazyRangeMarkerFactory.java
index 6ced8135f974adb81aedcbda99ab9158b25a4d55..c152297d3729fe9ba0b546a29a09e420c5d34b4b 100644 (file)
--- a/platform/platform-api/src/com/intellij/openapi/editor/LazyRangeMarkerFactory.java
+++ b/platform/platform-api/src/com/intellij/openapi/editor/LazyRangeMarkerFactory.java
@@ -189,7 +189,7 @@ public class LazyRangeMarkerFactory extends AbstractProjectComponent {
       final int lineStart = document.getLineStartOffset(line);
       final int lineEnd = document.getLineEndOffset(line);
       final CharSequence docText = document.getCharsSequence();
-      final int tabSize = CodeStyleFacade.getInstance(project).getTabSize(FileTypeManager.getInstance().getFileTypeByFile(file));
+      final int tabSize = CodeStyleFacade.getInstance(project).getTabSize(file.getFileType());
 
       offset = lineStart;
       int col = 0;

diff --git a/platform/platform-api/src/com/intellij/openapi/fileChooser/FileChooserDescriptor.java b/platform/platform-api/src/com/intellij/openapi/fileChooser/FileChooserDescriptor.java
index 9d8fe5eff7cffb1fa3f47b0b0a36051e8738b43c..20199d29944c8b741feca824ba57f02344b41ea6 100644 (file)
--- a/platform/platform-api/src/com/intellij/openapi/fileChooser/FileChooserDescriptor.java
+++ b/platform/platform-api/src/com/intellij/openapi/fileChooser/FileChooserDescriptor.java
@@ -214,7 +214,7 @@ public class FileChooserDescriptor implements Cloneable{
     if (file.isDirectory() && myChooseFolders) {
       return file;
     }
-    boolean isJar = FileTypeManager.getInstance().getFileTypeByFile(file) == FileTypes.ARCHIVE;
+    boolean isJar = file.getFileType() == FileTypes.ARCHIVE;
     if (!isJar) {
       return acceptAsGeneralFile(file) ? file : null;
     }

diff --git a/platform/platform-api/src/com/intellij/openapi/fileChooser/FileElement.java b/platform/platform-api/src/com/intellij/openapi/fileChooser/FileElement.java
index 47f3a403c61aedfe388c6f99579eb0cdfb7720b3..8b18d2c56271ae02d4d3fa10826270f1131b8ec3 100644 (file)
--- a/platform/platform-api/src/com/intellij/openapi/fileChooser/FileElement.java
+++ b/platform/platform-api/src/com/intellij/openapi/fileChooser/FileElement.java
@@ -15,7 +15,6 @@
  */
 package com.intellij.openapi.fileChooser;
 
-import com.intellij.openapi.fileTypes.FileTypeManager;
 import com.intellij.openapi.fileTypes.FileTypes;
 import com.intellij.openapi.vfs.JarFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -83,7 +82,7 @@ public class FileElement {
   public static boolean isArchive(VirtualFile file) {
     if (isArchiveFileSystem(file) && file.getParent() == null) return true;
     return !file.isDirectory() &&
-           FileTypeManager.getInstance().getFileTypeByFile(file) == FileTypes.ARCHIVE &&
+           file.getFileType() == FileTypes.ARCHIVE &&
            !isArchiveFileSystem(file.getParent());
   }
 

diff --git a/platform/platform-api/src/com/intellij/ui/AutoScrollToSourceHandler.java b/platform/platform-api/src/com/intellij/ui/AutoScrollToSourceHandler.java
index d42881301d223ed6834508b57aad1f9ec4be6d60..83b396651d51104640266012968cc9efd4290a95 100644 (file)
--- a/platform/platform-api/src/com/intellij/ui/AutoScrollToSourceHandler.java
+++ b/platform/platform-api/src/com/intellij/ui/AutoScrollToSourceHandler.java
@@ -153,7 +153,7 @@ public abstract class AutoScrollToSourceHandler {
         if (vFile != null) {
           // Attempt to navigate to the virtual file with unknown file type will show a modal dialog
           // asking to register some file type for this file. This behaviour is undesirable when autoscrolling.
-          if (FileTypeManager.getInstance().getFileTypeByFile(vFile) == FileTypes.UNKNOWN) return;
+          if (vFile.getFileType() == FileTypes.UNKNOWN) return;
         }
         Navigatable[] navigatables = PlatformDataKeys.NAVIGATABLE_ARRAY.getData(context);
         if (navigatables != null) {

diff --git a/platform/platform-impl/src/com/intellij/ide/actions/AssociateFileType.java b/platform/platform-impl/src/com/intellij/ide/actions/AssociateFileType.java
index f8325325ea820663d7b61c5eb1f46b9c32165a14..bb2589951462751b7d12a0925fb1c5d61e8132dc 100644 (file)
--- a/platform/platform-impl/src/com/intellij/ide/actions/AssociateFileType.java
+++ b/platform/platform-impl/src/com/intellij/ide/actions/AssociateFileType.java
@@ -39,7 +39,7 @@ public class AssociateFileType extends AnAction {
       haveSmthToDo = false;
     }
     else {
-      haveSmthToDo = FileTypeManager.getInstance().getFileTypeByFile(file) == FileTypes.UNKNOWN;
+      haveSmthToDo = file.getFileType() == FileTypes.UNKNOWN;
     }
     presentation.setVisible(haveSmthToDo || ActionPlaces.MAIN_MENU.equals(e.getPlace()));
     presentation.setEnabled(haveSmthToDo);

diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/ExtCompareFiles.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/ExtCompareFiles.java
index aa94de49c2b17f299d683d641f5ee083c2c9a510..9949ceb1a7c6bc20ee0068806a87c4caaa199807 100644 (file)
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/ExtCompareFiles.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/external/ExtCompareFiles.java
@@ -19,7 +19,6 @@ import com.intellij.openapi.diff.DiffContent;
 import com.intellij.openapi.diff.DiffRequest;
 import com.intellij.openapi.diff.impl.DiffUtil;
 import com.intellij.openapi.fileTypes.FileType;
-import com.intellij.openapi.fileTypes.FileTypeManager;
 import com.intellij.openapi.fileTypes.FileTypes;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -55,7 +54,7 @@ class ExtCompareFiles extends BaseExternalTool {
 
   private boolean canExternalizeAsFile(VirtualFile file) {
     if (file == null || file.isDirectory()) return false;
-    FileType fileType = FileTypeManager.getInstance().getFileTypeByFile(file);
+    FileType fileType = file.getFileType();
     if (fileType.isBinary() && fileType != FileTypes.UNKNOWN) return false;
     return true;
   }

diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/mergeTool/MergeVersion.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/mergeTool/MergeVersion.java
index 901babbf609d6b6afe5c46b396a06f93a378b74b..d51e5f99ddc877450299bc891f4e6904b0f2f7ae 100644 (file)
--- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/mergeTool/MergeVersion.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/mergeTool/MergeVersion.java
@@ -123,7 +123,7 @@ public interface MergeVersion {
     public FileType getContentType() {
       VirtualFile file = getFile();
       if (file == null) return FileTypes.PLAIN_TEXT;
-      return FileTypeManager.getInstance().getFileTypeByFile(file);
+      return file.getFileType();
     }
 
     private static void setDocumentText(final Document document, final String text, String name, Project project) {

diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/actions/IndentSelectionAction.java b/platform/platform-impl/src/com/intellij/openapi/editor/actions/IndentSelectionAction.java
index 9020e7a70aedc0667b371653a99feb7de919b58b..5585658f8a2cd2e5801fc7aa7b068e58eb0d7dbe 100644 (file)
--- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/IndentSelectionAction.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/IndentSelectionAction.java
@@ -78,7 +78,7 @@ public class IndentSelectionAction extends EditorAction {
     }
     
     VirtualFile vFile = FileDocumentManager.getInstance().getFile(document);
-    final FileType fileType = vFile == null ? null : FileTypeManager.getInstance().getFileTypeByFile(vFile);
+    final FileType fileType = vFile == null ? null : vFile.getFileType();
     int blockIndent = CodeStyleFacade.getInstance(project).getIndentSize(fileType);
     doIndent(endIndex, startIndex, document, project, editor, blockIndent);
   }

diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/actions/TabAction.java b/platform/platform-impl/src/com/intellij/openapi/editor/actions/TabAction.java
index 26651392f4f7e7292a9332f83932f17ec7a45750..c0f01b8e56fed62343e0e2bd9d06f29012a247e3 100644 (file)
--- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/TabAction.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/TabAction.java
@@ -65,7 +65,7 @@ public class TabAction extends EditorAction {
 
     final Document doc = editor.getDocument();
     VirtualFile vFile = FileDocumentManager.getInstance().getFile(doc);
-    final FileType fileType = vFile == null ? null : FileTypeManager.getInstance().getFileTypeByFile(vFile);
+    final FileType fileType = vFile == null ? null : vFile.getFileType();
 
     int tabSize = settings.getIndentSize(fileType);
     int spacesToAddCount = tabSize - columnNumber % tabSize;

diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/actions/UnindentSelectionAction.java b/platform/platform-impl/src/com/intellij/openapi/editor/actions/UnindentSelectionAction.java
index 5834b1890d6728fa319f94287cdb7904e7b66e28..85dd34512baae604abb1ac817efe99f0aeecab0a 100644 (file)
--- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/UnindentSelectionAction.java
+++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/UnindentSelectionAction.java
@@ -78,7 +78,7 @@ public class UnindentSelectionAction extends EditorAction {
     if (startIndex < 0 || endIndex < 0) return;
 
     VirtualFile vFile = FileDocumentManager.getInstance().getFile(document);
-    final FileType fileType = vFile == null ? null : FileTypeManager.getInstance().getFileTypeByFile(vFile);
+    final FileType fileType = vFile == null ? null : vFile.getFileType();
 
     int blockIndent = CodeStyleFacade.getInstance(project).getIndentSize(fileType);
     IndentSelectionAction.doIndent(endIndex, startIndex, document, project, editor, -blockIndent);

diff --git a/platform/testFramework/src/com/intellij/testFramework/FileTreeAccessFilter.java b/platform/testFramework/src/com/intellij/testFramework/FileTreeAccessFilter.java
index 71e7217b841ec34bd495ab519d841b53bc3598ee..678dbefbbbcbcf23a7134f51227317fc2bf2b35f 100755 (executable)
--- a/platform/testFramework/src/com/intellij/testFramework/FileTreeAccessFilter.java
+++ b/platform/testFramework/src/com/intellij/testFramework/FileTreeAccessFilter.java
@@ -39,7 +39,7 @@ public class FileTreeAccessFilter implements VirtualFileFilter {
 
     if (myAddedClasses.contains(file) || myTreeAccessAllowed) return false;
 
-    FileType fileType = FileTypeManager.getInstance().getFileTypeByFile(file);
+    FileType fileType = file.getFileType();
     return (fileType == StdFileTypes.JAVA || fileType == StdFileTypes.CLASS) && !file.getName().equals("package-info.java");
   }
 

diff --git a/platform/vcs-api/src/com/intellij/vcsUtil/VcsUtil.java b/platform/vcs-api/src/com/intellij/vcsUtil/VcsUtil.java
index 237cae541d905341117cdb1f62059398e7ff468b..06bd271cd1250f0559c88c314aa26297d5af1cb3 100644 (file)
--- a/platform/vcs-api/src/com/intellij/vcsUtil/VcsUtil.java
+++ b/platform/vcs-api/src/com/intellij/vcsUtil/VcsUtil.java
@@ -434,7 +434,7 @@ public class VcsUtil {
     FileTypeManager fileTypeManager = FileTypeManager.getInstance();
     VirtualFile[] children = dir.getChildren();
     for (VirtualFile child : children) {
-      if (!child.isDirectory() && (fileTypeManager == null || fileTypeManager.getFileTypeByFile(child) != FileTypes.UNKNOWN)) {
+      if (!child.isDirectory() && (fileTypeManager == null || child.getFileType() != FileTypes.UNKNOWN)) {
         files.add(child);
       }
       else if (recursive && child.isDirectory()) {

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AnnotateToggleAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AnnotateToggleAction.java
index 7ad24d33e5d3a72b8622a86668364fdf866286ca..380b513b09c715bc2a4a60cd1b8f32f772febbaa 100644 (file)
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AnnotateToggleAction.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AnnotateToggleAction.java
@@ -95,7 +95,7 @@ public class AnnotateToggleAction extends ToggleAction implements DumbAware, Ann
 
   private static boolean hasTextEditor(VirtualFile selectedFile) {
     FileTypeManager fileTypeManager = FileTypeManager.getInstance();
-    FileType fileType = fileTypeManager.getFileTypeByFile(selectedFile);
+    FileType fileType = selectedFile.getFileType();
     return !fileType.isBinary() && fileType != StdFileTypes.GUI_DESIGNER_FORM;
   }
 

diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/impl/VcsHistoryDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/impl/VcsHistoryDialog.java
index 8eb91eb4e7a7ea37e32865499e58f18a73c220cf..fcd27d07828e7efb33672a876d7ecd9b318378f2 100644 (file)
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/impl/VcsHistoryDialog.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/impl/VcsHistoryDialog.java
@@ -154,7 +154,7 @@ public class VcsHistoryDialog extends DialogWrapper implements DataProvider {
     });
     Collections.reverse(myRevisions);
 
-    myContentFileType = FileTypeManager.getInstance().getFileTypeByFile(file);
+    myContentFileType = file.getFileType();
 
     final VcsConfiguration configuration = VcsConfiguration.getInstance(myProject);
 

diff --git a/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorer.java b/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorer.java
index fe0050200014447e1cc2f871daff7037bae0eab9..afcc85cee970b4f7f3754552094392a19d6bb597 100644 (file)
--- a/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorer.java
+++ b/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorer.java
@@ -487,7 +487,7 @@ public class AntExplorer extends SimpleToolWindowPanel implements DataProvider,
       public boolean isFileVisible(VirtualFile file, boolean showHiddenFiles) {
         boolean b = super.isFileVisible(file, showHiddenFiles);
         if (!file.isDirectory()) {
-          b &= StdFileTypes.XML.equals(FileTypeManager.getInstance().getFileTypeByFile(file));
+          b &= StdFileTypes.XML.equals(file.getFileType());
         }
         return b;
       }

diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/util/FileTypeUtil.java b/plugins/copyright/src/com/maddyhome/idea/copyright/util/FileTypeUtil.java
index 2285b65309a304b8278b6c638df8ed17f5fabe70..970560eb49319480fa7bd247af71e23ef4b76d85 100644 (file)
--- a/plugins/copyright/src/com/maddyhome/idea/copyright/util/FileTypeUtil.java
+++ b/plugins/copyright/src/com/maddyhome/idea/copyright/util/FileTypeUtil.java
@@ -227,7 +227,7 @@ public class FileTypeUtil
         }
 
         if (ProjectUtil.isProjectOrWorkspaceFile(file)) return false;
-        FileType type = FileTypeManager.getInstance().getFileTypeByFile(file);
+      FileType type = file.getFileType();
 
         return types.get(type.getName()) != null;
     }
@@ -251,7 +251,7 @@ public class FileTypeUtil
 
     public FileType getFileTypeByFile(VirtualFile file)
     {
-        FileType type = FileTypeManager.getInstance().getFileTypeByFile(file);
+      FileType type = file.getFileType();
 
         return getFileTypeByType(type);
     }

diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsUpdate/UpdateReceivedFileProcessor.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsUpdate/UpdateReceivedFileProcessor.java
index 4cf4e630ddf824db639b236baff75bf3fe89d46a..743ae8f22b8507e46eb5f292537ae1f544e067c5 100644 (file)
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsUpdate/UpdateReceivedFileProcessor.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsUpdate/UpdateReceivedFileProcessor.java
@@ -67,7 +67,7 @@ public class UpdateReceivedFileProcessor implements ReceivedFileProcessor {
     if (virtualFile == null) return false;
     final ProjectOpenProcessor importProvider = ProjectOpenProcessor.getImportProvider(virtualFile);
     if (importProvider != null && importProvider.isProjectFile(virtualFile)) return true;
-    FileType fileType = FileTypeManager.getInstance().getFileTypeByFile(virtualFile);
+    FileType fileType = virtualFile.getFileType();
     return
       fileType == StdFileTypes.IDEA_PROJECT
       || fileType == StdFileTypes.IDEA_MODULE

diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsUpdate/ui/CorruptedProjectFilesDialog.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsUpdate/ui/CorruptedProjectFilesDialog.java
index 5d71da89132820a525e1fa194c2535c32d540fa3..67e0efcd88640d85e72ce1c7cfc33968d4ec6199 100644 (file)
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsUpdate/ui/CorruptedProjectFilesDialog.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsUpdate/ui/CorruptedProjectFilesDialog.java
@@ -83,7 +83,7 @@ public class CorruptedProjectFilesDialog extends DialogWrapper {
 
   private void showNextFileInfo() {
     VirtualFile currentVirtualFile = getCurrentVirtualFile();
-    FileType fileType = FileTypeManager.getInstance().getFileTypeByFile(currentVirtualFile);
+    FileType fileType = currentVirtualFile.getFileType();
     myMessageLabel.setText(
       com.intellij.CvsBundle.message("label.project.files.cannot.be.merged.without.conflict",
 

diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/GroovyProblemFileHighlightFilter.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/GroovyProblemFileHighlightFilter.java
index f616c2f8019a6fcbaf248e495eaa951c9c9580fc..a5f23e3ffed25b3ce3b07eb41a5139bc326e67b5 100644 (file)
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/GroovyProblemFileHighlightFilter.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/GroovyProblemFileHighlightFilter.java
@@ -24,6 +24,6 @@ import com.intellij.openapi.vfs.VirtualFile;
 */
 public class GroovyProblemFileHighlightFilter implements Condition<VirtualFile> {
   public boolean value(VirtualFile virtualFile) {
-    return FileTypeManager.getInstance().getFileTypeByFile(virtualFile) == GroovyFileType.GROOVY_FILE_TYPE;
+    return virtualFile.getFileType() == GroovyFileType.GROOVY_FILE_TYPE;
   }
 }

diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/PreviewFormAction.java b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/PreviewFormAction.java
index d56264f83e1f5e63837dc5dbaf4e2565e380e35d..cf3bddc4c96509192d825d8c39b4d91893c4bb6b 100644 (file)
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/actions/PreviewFormAction.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/actions/PreviewFormAction.java
@@ -103,7 +103,7 @@ public final class PreviewFormAction extends AnAction{
     final VirtualFile file = editor.getFile();
     e.getPresentation().setVisible(
       FileDocumentManager.getInstance().getDocument(file) != null &&
-      FileTypeManager.getInstance().getFileTypeByFile(file) == StdFileTypes.GUI_DESIGNER_FORM
+      file.getFileType() == StdFileTypes.GUI_DESIGNER_FORM
     );
   }
 

diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/editor/UIFormEditor.java b/plugins/ui-designer/src/com/intellij/uiDesigner/editor/UIFormEditor.java
index 23993b22377fd96fe8d30e86e003df4667df2ea2..fa2c7a71fab2a121ed93a034ca57481689379064 100644 (file)
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/editor/UIFormEditor.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/editor/UIFormEditor.java
@@ -87,7 +87,7 @@ public final class UIFormEditor extends UserDataHolderBase implements /*Navigata
     //TODO[anton,vova] fire when changed
     return
       FileDocumentManager.getInstance().getDocument(myFile) != null &&
-      FileTypeManager.getInstance().getFileTypeByFile(myFile) == StdFileTypes.GUI_DESIGNER_FORM;
+      myFile.getFileType() == StdFileTypes.GUI_DESIGNER_FORM;
   }
 
   public void selectNotify(){

diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/editor/UIFormEditorProvider.java b/plugins/ui-designer/src/com/intellij/uiDesigner/editor/UIFormEditorProvider.java
index 3d6f02baa5227b0e14a8fa91879ec2b230083288..d0d0b5affd87c6b2b74a9b672556cb560d166164 100644 (file)
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/editor/UIFormEditorProvider.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/editor/UIFormEditorProvider.java
@@ -37,7 +37,7 @@ public final class UIFormEditorProvider implements FileEditorProvider, DumbAware
 
   public boolean accept(@NotNull final Project project, @NotNull final VirtualFile file){
     return
-      FileTypeManager.getInstance().getFileTypeByFile(file) == StdFileTypes.GUI_DESIGNER_FORM &&
+      file.getFileType() == StdFileTypes.GUI_DESIGNER_FORM &&
       !StdFileTypes.GUI_DESIGNER_FORM.isBinary() &&
       ModuleUtil.findModuleForFile(file, project) != null;
   }

diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/projectView/UIDesignerFavoriteNodeProvider.java b/plugins/ui-designer/src/com/intellij/uiDesigner/projectView/UIDesignerFavoriteNodeProvider.java
index dad7c0ddd1d0a8625f3fa6f8dd9587b7132e3f56..287d305fe85a01cb53e734961dd2ad7d2373c9f8 100644 (file)
--- a/plugins/ui-designer/src/com/intellij/uiDesigner/projectView/UIDesignerFavoriteNodeProvider.java
+++ b/plugins/ui-designer/src/com/intellij/uiDesigner/projectView/UIDesignerFavoriteNodeProvider.java
@@ -67,7 +67,7 @@ public class UIDesignerFavoriteNodeProvider extends FavoriteNodeProvider {
 
     VirtualFile vFile = PlatformDataKeys.VIRTUAL_FILE.getData(context);
     if (vFile != null) {
-      final FileType fileType = FileTypeManager.getInstance().getFileTypeByFile(vFile);
+      final FileType fileType = vFile.getFileType();
       if (fileType.equals(StdFileTypes.GUI_DESIGNER_FORM)) {
         final PsiFile formFile = PsiManager.getInstance(project).findFile(vFile);
         if (formFile == null) return null;

diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/AnyXMLDescriptor.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/AnyXMLDescriptor.java
index 040ce4d3f449bf04c9d266726baf39d617b9f375..e9eb09b1f7e7a9db14444082d8e9f003f9a425c1 100644 (file)
--- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/AnyXMLDescriptor.java
+++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/associations/impl/AnyXMLDescriptor.java
@@ -33,7 +33,7 @@ public class AnyXMLDescriptor extends FileChooserDescriptor {
     }
 
     public boolean isFileVisible(VirtualFile file, boolean showHiddenFiles) {
-        final FileType fileType = myFileTypeManager.getFileTypeByFile(file);
+      final FileType fileType = file.getFileType();
         return file.isDirectory() || (super.isFileVisible(file, showHiddenFiles)
                 && FileAssociationsManager.XML_FILES_LIST.contains(fileType));
     }

diff --git a/samples/vfs/src/myVFS/VfsSamplePlugin.java b/samples/vfs/src/myVFS/VfsSamplePlugin.java
index 40a563d23d89d3489965a4e31fa7e7811befff7a..64287932f4d1dce0889c669090191d61a2cb31b3 100644 (file)
--- a/samples/vfs/src/myVFS/VfsSamplePlugin.java
+++ b/samples/vfs/src/myVFS/VfsSamplePlugin.java
@@ -70,7 +70,7 @@ public class VfsSamplePlugin implements ProjectComponent {
 
         FileTypeManager fileTypeManager = FileTypeManager.getInstance();
         if (!fileTypeManager.isFileIgnored(file)
-                && fileTypeManager.getFileTypeByFile(file) == StdFileTypes.JAVA) {
+                && file.getFileType() == StdFileTypes.JAVA) {
             ourJavaFilesCount += increase;
             return true;
             //System.out.println("ourJavaFilesCount = " + ourJavaFilesCount);

diff --git a/xml/impl/src/com/intellij/codeInsight/editorActions/HtmlSelectioner.java b/xml/impl/src/com/intellij/codeInsight/editorActions/HtmlSelectioner.java
index 23fbe90312485e90712ec184590256a408a32d93..f71b98de8bbd7f5c2abd24452b188c12c8724daa 100644 (file)
--- a/xml/impl/src/com/intellij/codeInsight/editorActions/HtmlSelectioner.java
+++ b/xml/impl/src/com/intellij/codeInsight/editorActions/HtmlSelectioner.java
@@ -75,7 +75,7 @@ public class HtmlSelectioner extends AbstractWordSelectioner {
     }
 
     PsiFile psiFile = e.getContainingFile();
-    FileType fileType = FileTypeManager.getInstance().getFileTypeByFile(psiFile.getVirtualFile());
+    FileType fileType = psiFile.getVirtualFile().getFileType();
 
     addAttributeSelection(result, e);
     final FileViewProvider fileViewProvider = psiFile.getViewProvider();