From e2453f6e68000c0643d1eb5fc162764f3a0d4fe8 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Thu, 3 Mar 2011 15:38:27 +0100
Subject: [PATCH] use isFileModified instead of isDocumentUnsaved

---
 .../src/com/intellij/history/integration/IdeaGateway.java     | 3 +--
 .../org/jetbrains/plugins/groovy/dsl/GroovyDslAnnotator.java  | 4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/platform/lvcs-impl/src/com/intellij/history/integration/IdeaGateway.java b/platform/lvcs-impl/src/com/intellij/history/integration/IdeaGateway.java
index 2ff578882e1e..ad5b0dd2c54e 100644
--- a/platform/lvcs-impl/src/com/intellij/history/integration/IdeaGateway.java
+++ b/platform/lvcs-impl/src/com/intellij/history/integration/IdeaGateway.java
@@ -169,8 +169,7 @@ public class IdeaGateway {
       Pair<StoredContent, Long> contentAndStamps;
       if (forDeletion) {
         FileDocumentManager m = FileDocumentManager.getInstance();
-        Document d = m.getCachedDocument(file); // should not try to load document
-        if (d != null && !m.isDocumentUnsaved(d)) d = null;
+        Document d = m.isFileModified(file) ? m.getCachedDocument(file) : null; // should not try to load document
         contentAndStamps = acquireAndClearCurrentContent(file, d);
       }
       else {
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/GroovyDslAnnotator.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/GroovyDslAnnotator.java
index 7e8257080ba5..6896bacc8857 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/GroovyDslAnnotator.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/dsl/GroovyDslAnnotator.java
@@ -20,7 +20,6 @@ import com.intellij.codeInsight.intention.IntentionAction;
 import com.intellij.lang.annotation.Annotation;
 import com.intellij.lang.annotation.AnnotationHolder;
 import com.intellij.lang.annotation.Annotator;
-import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.fileEditor.FileDocumentManager;
 import com.intellij.openapi.project.Project;
@@ -39,9 +38,8 @@ public class GroovyDslAnnotator implements Annotator {
   public void annotate(@NotNull PsiElement psiElement, @NotNull AnnotationHolder holder) {
     if (psiElement instanceof GroovyFile) {
       final VirtualFile vfile = ((GroovyFile)psiElement).getVirtualFile();
-      Document document = ((GroovyFile)psiElement).getViewProvider().getDocument();
       if (vfile != null && "gdsl".equals(vfile.getExtension()) &&
-          (!GroovyDslFileIndex.isActivated(vfile) || document != null && FileDocumentManager.getInstance().isDocumentUnsaved(document))) {
+          (!GroovyDslFileIndex.isActivated(vfile) || FileDocumentManager.getInstance().isFileModified(vfile))) {
         final Annotation annotation = holder.createWarningAnnotation(psiElement, "DSL descriptor file has been changed and isn't currently executed. Click to activate it back.");
         annotation.setFileLevelAnnotation(true);
         annotation.registerFix(new IntentionAction() {