From a0da6cb78f400664751fe21ea297e36984e2ba8e Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@intellij.com>
Date: Tue, 28 Oct 2008 14:21:53 +0300
Subject: [PATCH] NPE (IDEADEV-30578) [r=max]

---
 .../com/intellij/openapi/fileEditor/impl/EditorTabbedContainer.java | 6 +++---
 .../src/com/intellij/openapi/fileEditor/impl/EditorWindow.java      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorTabbedContainer.java b/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorTabbedContainer.java
index 8454dd3fb3..e64feb878e 100644
--- a/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorTabbedContainer.java
+++ b/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorTabbedContainer.java
@@ -218,7 +218,7 @@ final class EditorTabbedContainer implements Disposable {
     if (tab != null) return;
 
 
-    tab = new TabInfo(comp).setText(getTabTitle(file)).setIcon(icon).setTooltipText(tooltip).setObject(file);
+    tab = new TabInfo(comp).setText(calcTabTitle(myProject, file)).setIcon(icon).setTooltipText(tooltip).setObject(file);
 
     final DefaultActionGroup tabActions = new DefaultActionGroup();
     tabActions.add(new CloseTab(comp, tab));
@@ -227,9 +227,9 @@ final class EditorTabbedContainer implements Disposable {
     myTabs.addTab(tab, indexToInsert);
   }
 
-  public String getTabTitle(final VirtualFile file) {
+  public static String calcTabTitle(final Project project, final VirtualFile file) {
     for (EditorTabTitleProvider provider : Extensions.getExtensions(EditorTabTitleProvider.EP_NAME)) {
-      final String result = provider.getEditorTabTitle(myProject, file);
+      final String result = provider.getEditorTabTitle(project, file);
       if (result != null) {
         return result;
       }
diff --git a/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorWindow.java b/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorWindow.java
index 8b35774332..30cb94749c 100644
--- a/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorWindow.java
+++ b/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorWindow.java
@@ -465,7 +465,7 @@ public class EditorWindow {
   protected void updateFileName(VirtualFile file) {
     final int index = findEditorIndex(findFileComposite(file));
     if (index != -1) {
-      setTitleAt(index, myTabbedPane.getTabTitle(file));
+      setTitleAt(index, EditorTabbedContainer.calcTabTitle(getManager().getProject(), file));
       setToolTipTextAt(index, getManager().getFileTooltipText(file));
     }
   }
-- 
2.11.4.GIT