From 16a4577cde3e8ca0b8156b012ef40b181f1d8efb Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Thu, 22 Sep 2011 18:14:57 +0200
Subject: [PATCH] reducing dependencies

---
 .../psi/impl/compiled/ClsFileImpl.java        | 24 +++++++++++--------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsFileImpl.java b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsFileImpl.java
index 0be0cd99b8ee..368c822af2e5 100644
--- a/java/java-impl/src/com/intellij/psi/impl/compiled/ClsFileImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/compiled/ClsFileImpl.java
@@ -16,6 +16,8 @@
 package com.intellij.psi.impl.compiled;
 
 import com.intellij.ide.caches.FileContent;
+import com.intellij.ide.highlighter.JavaClassFileType;
+import com.intellij.ide.highlighter.JavaFileType;
 import com.intellij.lang.ASTNode;
 import com.intellij.lang.FileASTNode;
 import com.intellij.lang.java.JavaLanguage;
@@ -24,8 +26,8 @@ import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.fileEditor.FileDocumentManager;
 import com.intellij.openapi.fileTypes.FileType;
-import com.intellij.openapi.fileTypes.StdFileTypes;
-import com.intellij.openapi.progress.ProgressManager;
+import com.intellij.openapi.progress.NonCancelableSection;
+import com.intellij.openapi.progress.ProgressIndicatorProvider;
 import com.intellij.openapi.ui.Queryable;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -266,7 +268,7 @@ public class ClsFileImpl extends ClsRepositoryPsiElement<PsiClassHolderFileStub>
         VirtualFile virtualFile = getVirtualFile();
         final Document document = FileDocumentManager.getInstance().getDocument(virtualFile);
         String text = document.getText();
-        String ext = StdFileTypes.JAVA.getDefaultExtension();
+        String ext = JavaFileType.INSTANCE.getDefaultExtension();
         PsiClass[] classes = getClasses();
 
         String fileName = (classes.length > 0 ? classes[0].getName(): virtualFile.getNameWithoutExtension()) + "." + ext;
@@ -275,12 +277,14 @@ public class ClsFileImpl extends ClsRepositoryPsiElement<PsiClassHolderFileStub>
         final ASTNode mirrorTreeElement = SourceTreeToPsiMap.psiElementToTree(mirror);
 
         //IMPORTANT: do not take lock too early - FileDocumentManager.getInstance().saveToString() can run write action...
-        ProgressManager.getInstance().executeNonCancelableSection(new Runnable() {
-          public void run() {
-            setMirror((TreeElement)mirrorTreeElement);
-            myMirrorFileElement.putUserData(DOCUMENT_IN_MIRROR_KEY, document);
-          }
-        });
+        final NonCancelableSection section = ProgressIndicatorProvider.getInstance().startNonCancelableSection();
+        try {
+          setMirror((TreeElement)mirrorTreeElement);
+          myMirrorFileElement.putUserData(DOCUMENT_IN_MIRROR_KEY, document);
+        }
+        finally {
+          section.done();
+        }
       }
 
       return myMirrorFileElement.getPsi();
@@ -311,7 +315,7 @@ public class ClsFileImpl extends ClsRepositoryPsiElement<PsiClassHolderFileStub>
 
   @NotNull
   public FileType getFileType() {
-    return StdFileTypes.CLASS;
+    return JavaClassFileType.INSTANCE;
   }
 
   @NotNull