From 4889341700df32f0d1bac04516e1b2cf14d99061 Mon Sep 17 00:00:00 2001
From: peter <peter@jetbrains.com>
Date: Wed, 18 Dec 2013 08:20:45 +0100
Subject: [PATCH] @NotNull VirtualFile.getPresentableUrl (IDEA-117476)

---
 .../src/com/intellij/openapi/vfs/VirtualFile.java    |  2 +-
 .../openapi/project/impl/ProjectManagerImpl.java     | 12 +++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/platform/core-api/src/com/intellij/openapi/vfs/VirtualFile.java b/platform/core-api/src/com/intellij/openapi/vfs/VirtualFile.java
index e1deb9b87bdf..8b67321dc6c8 100644
--- a/platform/core-api/src/com/intellij/openapi/vfs/VirtualFile.java
+++ b/platform/core-api/src/com/intellij/openapi/vfs/VirtualFile.java
@@ -150,8 +150,8 @@ public abstract class VirtualFile extends UserDataHolderBase implements Modifica
    * @return the presentable URL.
    * @see VirtualFileSystem#extractPresentableUrl
    */
+  @NotNull
   public final String getPresentableUrl() {
-    if (!isValid()) return null;
     return getFileSystem().extractPresentableUrl(getPath());
   }
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectManagerImpl.java
index 4b7756fa924b..ccc5db7f17f7 100644
--- a/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/project/impl/ProjectManagerImpl.java
@@ -709,15 +709,14 @@ public class ProjectManagerImpl extends ProjectManagerEx implements NamedJDOMExt
 
     String message;
     if (causes.size() == 1) {
-      message = ProjectBundle.message("project.reload.external.change.single", getPresentablePath(causes.iterator().next().first));
+      message = ProjectBundle.message("project.reload.external.change.single", causes.iterator().next().first.getPresentableUrl());
     }
     else {
       StringBuilder filesBuilder = new StringBuilder();
       boolean first = true;
       Set<String> alreadyShown = new HashSet<String>();
       for (Pair<VirtualFile, StateStorage> cause : causes) {
-        VirtualFile file = cause.first;
-        String url = getPresentablePath(file);
+        String url = cause.first.getPresentableUrl();
         if (!alreadyShown.contains(url)) {
           if (alreadyShown.size() > 10) {
             filesBuilder.append("\n" + "and ").append(causes.size() - alreadyShown.size()).append(" more");
@@ -736,11 +735,6 @@ public class ProjectManagerImpl extends ProjectManagerEx implements NamedJDOMExt
                                                   Messages.getQuestionIcon()) == 0;
   }
 
-  private static String getPresentablePath(@NotNull VirtualFile file) {
-    String url = file.getPresentableUrl(); // might be null for invalid file
-    return url == null ? file.getPath() : url;
-  }
-
   @Override
   public boolean isFileSavedToBeReloaded(VirtualFile candidate) {
     return mySavedCopies.containsKey(candidate);
@@ -866,7 +860,7 @@ public class ProjectManagerImpl extends ProjectManagerEx implements NamedJDOMExt
           file.setBinaryContent(bytes, -1, mySavedTimestamps.get(file));
         }
         catch (IOException e) {
-          Messages.showWarningDialog(ProjectBundle.message("project.reload.write.failed", getPresentablePath(file)),
+          Messages.showWarningDialog(ProjectBundle.message("project.reload.write.failed", file.getPresentableUrl()),
                                      ProjectBundle.message("project.reload.write.failed.title"));
         }
       }