From 0593cd6c049528d8f79d23f04f76fab49b3ee974 Mon Sep 17 00:00:00 2001
From: develar <develar@gmail.com>
Date: Fri, 26 Apr 2019 13:44:56 +0200
Subject: [PATCH] convert project component MavenEditorTabTitleUpdater to
 applicationInitializedListener

GitOrigin-RevId: 917ad294485349c22dbf20d98c99c10c9ef11473
---
 .../utils/MavenEditorTabTitleUpdater.java     | 32 ++++++++++++-------
 .../utils/MavenEnvironmentRegistrar.java      |  4 +--
 .../src/main/resources/META-INF/plugin.xml    |  8 ++---
 3 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenEditorTabTitleUpdater.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenEditorTabTitleUpdater.java
index 9720e9e3f1db..c46c7b33ca0b 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenEditorTabTitleUpdater.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenEditorTabTitleUpdater.java
@@ -1,8 +1,13 @@
 // Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.idea.maven.utils;
 
+import com.intellij.ide.ApplicationInitializedListener;
+import com.intellij.openapi.application.Application;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.fileEditor.ex.FileEditorManagerEx;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.project.ProjectManager;
+import com.intellij.openapi.project.ProjectManagerListener;
 import com.intellij.openapi.util.Pair;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.idea.maven.project.MavenProject;
@@ -12,26 +17,31 @@ import org.jetbrains.idea.maven.project.MavenProjectsTree;
 
 import java.util.List;
 
-final class MavenEditorTabTitleUpdater extends MavenSimpleProjectComponent {
-  MavenEditorTabTitleUpdater(Project project) {
-    super(project);
-
-    if (!isNormalProject()) {
+final class MavenEditorTabTitleUpdater implements ApplicationInitializedListener {
+  @Override
+  public void componentsInitialized() {
+    Application app = ApplicationManager.getApplication();
+    if (app.isUnitTestMode() || app.isHeadlessEnvironment()) {
       return;
     }
 
-    MavenProjectsManager.getInstance(myProject).addProjectsTreeListener(new MavenProjectsTree.Listener() {
+    app.getMessageBus().connect().subscribe(ProjectManager.TOPIC, new ProjectManagerListener() {
       @Override
-      public void projectsUpdated(@NotNull List<Pair<MavenProject, MavenProjectChanges>> updated, @NotNull List<MavenProject> deleted) {
-        updateTabName(MavenUtil.collectFirsts(updated));
+      public void projectOpened(@NotNull Project project) {
+        MavenProjectsManager.getInstance(project).addProjectsTreeListener(new MavenProjectsTree.Listener() {
+          @Override
+          public void projectsUpdated(@NotNull List<Pair<MavenProject, MavenProjectChanges>> updated, @NotNull List<MavenProject> deleted) {
+            updateTabName(MavenUtil.collectFirsts(updated), project);
+          }
+        });
       }
     });
   }
 
-  private void updateTabName(@NotNull List<MavenProject> projects) {
-    MavenUtil.invokeLater(myProject, () -> {
+  private static void updateTabName(@NotNull List<MavenProject> projects, @NotNull Project project) {
+    MavenUtil.invokeLater(project, () -> {
       for (MavenProject each : projects) {
-        FileEditorManagerEx.getInstanceEx(myProject).updateFilePresentation(each.getFile());
+        FileEditorManagerEx.getInstanceEx(project).updateFilePresentation(each.getFile());
       }
     });
   }
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenEnvironmentRegistrar.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenEnvironmentRegistrar.java
index 68e8e9d1a0e4..fb310be28a0a 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenEnvironmentRegistrar.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenEnvironmentRegistrar.java
@@ -1,4 +1,4 @@
-// Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
+// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
 package org.jetbrains.idea.maven.utils;
 
 import com.intellij.application.options.PathMacrosImpl;
@@ -6,7 +6,7 @@ import com.intellij.ide.ApplicationInitializedListener;
 import com.intellij.openapi.application.PathMacros;
 import com.intellij.openapi.util.io.FileUtil;
 
-public class MavenEnvironmentRegistrar implements ApplicationInitializedListener {
+final class MavenEnvironmentRegistrar implements ApplicationInitializedListener {
   @Override
   public void componentsInitialized() {
     registerPathVariable();
diff --git a/plugins/maven/src/main/resources/META-INF/plugin.xml b/plugins/maven/src/main/resources/META-INF/plugin.xml
index 02a696e8c32d..afe31ba2c5e6 100644
--- a/plugins/maven/src/main/resources/META-INF/plugin.xml
+++ b/plugins/maven/src/main/resources/META-INF/plugin.xml
@@ -39,8 +39,8 @@
   <depends optional="true" config-file="errorProne-compiler-support.xml">Error-prone plugin</depends>
 
   <extensions defaultExtensionNs="com.intellij">
-
     <applicationInitializedListener implementation="org.jetbrains.idea.maven.utils.MavenEnvironmentRegistrar"/>
+    <applicationInitializedListener implementation="org.jetbrains.idea.maven.utils.MavenEditorTabTitleUpdater"/>
     <customJavadocTagProvider implementation="org.jetbrains.idea.maven.javadoc.MojoClassAnnotationTagProvider"/>
     <fileTypeFactory implementation="org.jetbrains.idea.maven.config.MavenConfigFileTypeFactory"/>
     <fileTypeFactory implementation="org.jetbrains.idea.maven.utils.MavenFileTypeFactory"/>
@@ -351,8 +351,7 @@
 
     <compiler implementation="org.jetbrains.idea.maven.importing.MavenCompilerJavacExtension"/>
     <compiler implementation="org.jetbrains.idea.maven.importing.MavenCompilerEclipseExtension"/>
-    <executionEnvironmentProvider
-        implementation="org.jetbrains.idea.maven.execution.MavenApplicationConfigurationExecutionEnvironmentProvider"/>
+    <executionEnvironmentProvider implementation="org.jetbrains.idea.maven.execution.MavenApplicationConfigurationExecutionEnvironmentProvider"/>
   </extensions>
 
   <project-components>
@@ -372,9 +371,6 @@
     <component>
       <implementation-class>org.jetbrains.idea.maven.tasks.MavenShortcutsManager</implementation-class>
     </component>
-    <component>
-      <implementation-class>org.jetbrains.idea.maven.utils.MavenEditorTabTitleUpdater</implementation-class>
-    </component>
     <component>
       <implementation-class>org.jetbrains.idea.maven.utils.MavenImportNotifier</implementation-class>
     </component>