From 44001135e44f7d741c816d1706e2603ce9d9e268 Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Tue, 8 Sep 2015 15:45:41 +0300
Subject: [PATCH] LibraryScope: duplicated code removed, fixed 'getDisplayName'
 for disposed library

---
 .../module/impl/scopes/LibraryScope.java        | 17 ++++-------------
 .../openapi/roots/libraries/LibraryUtil.java    |  8 ++++++--
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/platform/indexing-impl/src/com/intellij/openapi/module/impl/scopes/LibraryScope.java b/platform/indexing-impl/src/com/intellij/openapi/module/impl/scopes/LibraryScope.java
index f78b69704db3..abf16ba38d9b 100644
--- a/platform/indexing-impl/src/com/intellij/openapi/module/impl/scopes/LibraryScope.java
+++ b/platform/indexing-impl/src/com/intellij/openapi/module/impl/scopes/LibraryScope.java
@@ -18,8 +18,7 @@ package com.intellij.openapi.module.impl.scopes;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.OrderRootType;
 import com.intellij.openapi.roots.libraries.Library;
-import com.intellij.openapi.vfs.VfsUtilCore;
-import com.intellij.util.PathUtil;
+import com.intellij.openapi.roots.libraries.LibraryUtil;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -27,26 +26,18 @@ import org.jetbrains.annotations.NotNull;
  */
 public class LibraryScope extends LibraryScopeBase {
   private final Library myLibrary;
+  private final String myLibraryName;
 
   public LibraryScope(Project project, Library library) {
     super(project, library.getFiles(OrderRootType.CLASSES), library.getFiles(OrderRootType.SOURCES));
+    myLibraryName = LibraryUtil.getPresentableName(library);
     myLibrary = library;
   }
 
   @NotNull
   @Override
   public String getDisplayName() {
-    String name = myLibrary.getName();
-    if (name == null) {
-      String[] urls = myLibrary.getUrls(OrderRootType.CLASSES);
-      if (urls.length > 0) {
-        name = PathUtil.getFileName(VfsUtilCore.urlToPath(urls[0]));
-      }
-      else {
-        name = "empty";
-      }
-    }
-    return "Library '" + name + "'";
+    return "Library '" + myLibraryName + "'";
   }
 
   @Override
diff --git a/platform/projectModel-api/src/com/intellij/openapi/roots/libraries/LibraryUtil.java b/platform/projectModel-api/src/com/intellij/openapi/roots/libraries/LibraryUtil.java
index 2fd5f9346db8..3025b80ee53d 100644
--- a/platform/projectModel-api/src/com/intellij/openapi/roots/libraries/LibraryUtil.java
+++ b/platform/projectModel-api/src/com/intellij/openapi/roots/libraries/LibraryUtil.java
@@ -26,6 +26,7 @@ import com.intellij.openapi.roots.*;
 import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.vfs.VfsUtilCore;
 import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.util.PathUtil;
 import com.intellij.util.Processor;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.HashSet;
@@ -169,7 +170,10 @@ public class LibraryUtil {
     if (name != null) {
       return name;
     }
-    final VirtualFile[] files = library.getFiles(OrderRootType.CLASSES);
-    return files.length > 0 ? files[0].getName() : "Empty Library";
+    String[] urls = library.getUrls(OrderRootType.CLASSES);
+    if (urls.length > 0) {
+      return PathUtil.getFileName(VfsUtilCore.urlToPath(urls[0]));
+    }
+    return "Empty Library";
   }
 }