From 6f7066339c56280f139ff02c768b63a58c4ceb6b Mon Sep 17 00:00:00 2001
From: Aleksey Pivovarov <AMPivovarov@gmail.com>
Date: Tue, 31 Mar 2015 14:24:04 +0300
Subject: [PATCH] EA-66942 diff: do not create OpenFileDescriptor with default
 project

a better solution would be to use 'null' project everywhere, using Default only when applicable and necessary. But this is not possible without removing/fixing of old DiffPanelImpl / DirDiff*.
---
 .../src/com/intellij/diff/contents/BinaryFileContentImpl.java   | 2 +-
 .../src/com/intellij/diff/contents/DirectoryContentImpl.java    | 2 +-
 .../src/com/intellij/diff/contents/FileDocumentContentImpl.java | 2 +-
 .../src/com/intellij/ide/diff/VirtualFileDiffElement.java       | 2 +-
 .../src/com/intellij/openapi/diff/ex/DiffPanelOptions.java      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/platform/diff-impl/src/com/intellij/diff/contents/BinaryFileContentImpl.java b/platform/diff-impl/src/com/intellij/diff/contents/BinaryFileContentImpl.java
index e61040b1c67a..155e3fd27bc2 100644
--- a/platform/diff-impl/src/com/intellij/diff/contents/BinaryFileContentImpl.java
+++ b/platform/diff-impl/src/com/intellij/diff/contents/BinaryFileContentImpl.java
@@ -42,7 +42,7 @@ public class BinaryFileContentImpl implements DiffContent, BinaryFileContent {
   @Nullable
   @Override
   public OpenFileDescriptor getOpenFileDescriptor() {
-    if (myProject == null) return null;
+    if (myProject == null || myProject.isDefault()) return null;
     return new OpenFileDescriptor(myProject, myFile);
   }
 
diff --git a/platform/diff-impl/src/com/intellij/diff/contents/DirectoryContentImpl.java b/platform/diff-impl/src/com/intellij/diff/contents/DirectoryContentImpl.java
index b59154fb3956..9f615079039c 100644
--- a/platform/diff-impl/src/com/intellij/diff/contents/DirectoryContentImpl.java
+++ b/platform/diff-impl/src/com/intellij/diff/contents/DirectoryContentImpl.java
@@ -35,7 +35,7 @@ public class DirectoryContentImpl implements DiffContent, DirectoryContent {
   @Nullable
   @Override
   public OpenFileDescriptor getOpenFileDescriptor() {
-    if (myProject == null) return null;
+    if (myProject == null || myProject.isDefault()) return null;
     return new OpenFileDescriptor(myProject, myFile);
   }
 
diff --git a/platform/diff-impl/src/com/intellij/diff/contents/FileDocumentContentImpl.java b/platform/diff-impl/src/com/intellij/diff/contents/FileDocumentContentImpl.java
index cccce658ad3f..0ced9087ad7b 100644
--- a/platform/diff-impl/src/com/intellij/diff/contents/FileDocumentContentImpl.java
+++ b/platform/diff-impl/src/com/intellij/diff/contents/FileDocumentContentImpl.java
@@ -39,7 +39,7 @@ public class FileDocumentContentImpl extends DocumentContentImpl implements File
   @Nullable
   @Override
   public OpenFileDescriptor getOpenFileDescriptor(int offset) {
-    if (myProject == null) return null;
+    if (myProject == null || myProject.isDefault()) return null;
     return new OpenFileDescriptor(myProject, myFile, offset);
   }
 
diff --git a/platform/platform-impl/src/com/intellij/ide/diff/VirtualFileDiffElement.java b/platform/platform-impl/src/com/intellij/ide/diff/VirtualFileDiffElement.java
index 136271b8c8c9..b697be14276f 100644
--- a/platform/platform-impl/src/com/intellij/ide/diff/VirtualFileDiffElement.java
+++ b/platform/platform-impl/src/com/intellij/ide/diff/VirtualFileDiffElement.java
@@ -96,7 +96,7 @@ public class VirtualFileDiffElement extends DiffElement<VirtualFile> {
   @Override
   @Nullable
   public OpenFileDescriptor getOpenFileDescriptor(@Nullable Project project) {
-    if (project == null) return null;
+    if (project == null || project.isDefault()) return null;
     return new OpenFileDescriptor(project, myFile);
   }
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/ex/DiffPanelOptions.java b/platform/platform-impl/src/com/intellij/openapi/diff/ex/DiffPanelOptions.java
index d3911acac596..5f1baa1a8dff 100644
--- a/platform/platform-impl/src/com/intellij/openapi/diff/ex/DiffPanelOptions.java
+++ b/platform/platform-impl/src/com/intellij/openapi/diff/ex/DiffPanelOptions.java
@@ -59,7 +59,7 @@ public class DiffPanelOptions {
   }
 
   public void showSource(@Nullable OpenFileDescriptor descriptor) {
-    if (descriptor == null || myDiffPanel.getProject() == null) return;
+    if (descriptor == null || myDiffPanel.getProject() == null || myDiffPanel.getProject().isDefault()) return;
     myShowSourcePolicy.showSource(descriptor, myDiffPanel);
   }