From 00adb8ede667b0b9d9a297308f4af3bd16ebcb0f Mon Sep 17 00:00:00 2001
From: Dmitry Avdeev <dmitry.avdeev@jetbrains.com>
Date: Wed, 21 Sep 2016 16:47:46 +0300
Subject: [PATCH] changes view toolwindow refactored to use bean: no initial
 availability check

---
 .../platform-resources/src/META-INF/VcsExtensions.xml  |  3 +--
 .../vcs/changes/ui/ChangesViewToolWindowFactory.java   | 10 +---------
 .../openapi/vcs/impl/projectlevelman/NewMappings.java  |  3 ---
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/platform/platform-resources/src/META-INF/VcsExtensions.xml b/platform/platform-resources/src/META-INF/VcsExtensions.xml
index 180b4dd89f99..0da7e1edfdf3 100644
--- a/platform/platform-resources/src/META-INF/VcsExtensions.xml
+++ b/platform/platform-resources/src/META-INF/VcsExtensions.xml
@@ -41,8 +41,7 @@
     <colorAndFontDescriptorProvider implementation="com.intellij.openapi.vcs.actions.VcsColorsPageFactory"/>
 
     <toolWindow id="Version Control" anchor="bottom" canCloseContents="true" icon="AllIcons.Toolwindows.ToolWindowChanges"
-                factoryClass="com.intellij.openapi.vcs.changes.ui.ChangesViewToolWindowFactory"
-                conditionClass="com.intellij.openapi.vcs.changes.ui.ChangesViewToolWindowFactory"/>
+                factoryClass="com.intellij.openapi.vcs.changes.ui.ChangesViewToolWindowFactory"/>
 
     <changesViewContent tabName="Repository" className="com.intellij.openapi.vcs.changes.committed.CommittedChangesViewManager"
                         predicateClassName="com.intellij.openapi.vcs.changes.committed.CommittedChangesVisibilityPredicate"/>
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesViewToolWindowFactory.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesViewToolWindowFactory.java
index 23ee94de4034..74713e21ca51 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesViewToolWindowFactory.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesViewToolWindowFactory.java
@@ -17,8 +17,6 @@ package com.intellij.openapi.vcs.changes.ui;
 
 import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.Condition;
-import com.intellij.openapi.vcs.ProjectLevelVcsManager;
 import com.intellij.openapi.wm.ToolWindow;
 import com.intellij.openapi.wm.ToolWindowFactory;
 import org.jetbrains.annotations.NotNull;
@@ -26,15 +24,9 @@ import org.jetbrains.annotations.NotNull;
 /**
  * @author Dmitry Avdeev
  */
-public class ChangesViewToolWindowFactory implements ToolWindowFactory, DumbAware, Condition<Project> {
+public class ChangesViewToolWindowFactory implements ToolWindowFactory, DumbAware {
   @Override
   public void createToolWindowContent(@NotNull Project project, @NotNull ToolWindow toolWindow) {
     ChangesViewContentManager.getInstance(project).setUp(toolWindow);
   }
-
-  @Override
-  public boolean value(Project project) {
-    ProjectLevelVcsManager manager = ProjectLevelVcsManager.getInstance(project);
-    return manager.getAllActiveVcss().length > 0;
-  }
 }
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/projectlevelman/NewMappings.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/projectlevelman/NewMappings.java
index a78efe498d15..c57d3dc5e34d 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/projectlevelman/NewMappings.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/projectlevelman/NewMappings.java
@@ -107,9 +107,6 @@ public class NewMappings {
 
   public AbstractVcs[] getActiveVcses() {
     synchronized (myLock) {
-      if (!myActivated) {
-        activateActiveVcses();
-      }
       final AbstractVcs[] result = new AbstractVcs[myActiveVcses.length];
       System.arraycopy(myActiveVcses, 0, result, 0, myActiveVcses.length);
       return result;