From aa9d51ad825c372a3cea8ecf32d18f0e0f7cefb0 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Thu, 19 Apr 2012 11:11:10 +0200
Subject: [PATCH] Fix NPE in diff

---
 .../src/com/intellij/openapi/diff/DiffApplication.java     | 7 ++++---
 .../src/com/intellij/openapi/diff/SimpleDiffRequest.java   | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/platform/platform-api/src/com/intellij/openapi/diff/DiffApplication.java b/platform/platform-api/src/com/intellij/openapi/diff/DiffApplication.java
index e81347ff2d80..1df743e95664 100644
--- a/platform/platform-api/src/com/intellij/openapi/diff/DiffApplication.java
+++ b/platform/platform-api/src/com/intellij/openapi/diff/DiffApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2012 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -110,10 +110,11 @@ public class DiffApplication implements ApplicationStarterEx {
       final DirDiffSettings settings = new DirDiffSettings();
       settings.showInFrame = false;
       diffManager.showDiff(d1, d2, settings, null);
-    } else {
+    }
+    else {
       file1.refresh(false, false);
       file2.refresh(false, false);
-      SimpleDiffRequest request = SimpleDiffRequest.compareFiles(file1, file2, null);
+      SimpleDiffRequest request = SimpleDiffRequest.compareFiles(file1, file2, ProjectManager.getInstance().getDefaultProject());
       request.addHint(DiffTool.HINT_SHOW_MODAL_DIALOG);
       DiffManager.getInstance().getIdeaDiffTool().show(request);
       FileDocumentManager.getInstance().saveAllDocuments();
diff --git a/platform/platform-api/src/com/intellij/openapi/diff/SimpleDiffRequest.java b/platform/platform-api/src/com/intellij/openapi/diff/SimpleDiffRequest.java
index fa87be32dbd2..9e71a61de0f0 100644
--- a/platform/platform-api/src/com/intellij/openapi/diff/SimpleDiffRequest.java
+++ b/platform/platform-api/src/com/intellij/openapi/diff/SimpleDiffRequest.java
@@ -62,9 +62,9 @@ public class SimpleDiffRequest extends DiffRequest {
     return result;
   }
 
-  public static SimpleDiffRequest compareFiles(VirtualFile file1, VirtualFile file2, Project project) {
-    return compareFiles(file1, file2, project,
-                        DiffBundle.message("compare.file.vs.file.dialog.title", file1.getPresentableUrl(), file2.getPresentableUrl()));
+  public static SimpleDiffRequest compareFiles(@NotNull VirtualFile file1, @NotNull VirtualFile file2, @NotNull Project project) {
+    final String title = DiffBundle.message("compare.file.vs.file.dialog.title", file1.getPresentableUrl(), file2.getPresentableUrl());
+    return compareFiles(file1, file2, project, title);
   }
 
   private static class FileDiffRequest extends SimpleDiffRequest {