1 files changed, 5 insertions, 28 deletions
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsManagerConfigurable.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsManagerConfigurable.java
index 304275d732d7..a392ff1f5db2 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsManagerConfigurable.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsManagerConfigurable.java
@@ -40,7 +40,7 @@ import java.util.List;
 public class VcsManagerConfigurable extends SearchableConfigurable.Parent.Abstract implements Configurable.NoScroll {
   private final Project myProject;
   private VcsDirectoryConfigurationPanel myMappings;
-  private VcsGeneralConfigurationPanel myGeneralPanel;
+  private VcsGeneralConfigurationConfigurable myGeneralPanel;
 
   public VcsManagerConfigurable(Project project) {
     myProject = project;
@@ -49,9 +49,6 @@ public class VcsManagerConfigurable extends SearchableConfigurable.Parent.Abstra
   @Override
   public JComponent createComponent() {
     myMappings = new VcsDirectoryConfigurationPanel(myProject);
-    if (myGeneralPanel != null) {
-      addListenerToGeneralPanel();
-    }
     return myMappings;
   }
 
@@ -118,26 +115,12 @@ public class VcsManagerConfigurable extends SearchableConfigurable.Parent.Abstra
 
   @Override
   protected Configurable[] buildConfigurables() {
-    myGeneralPanel = new VcsGeneralConfigurationPanel(myProject){
-      @Override
-      public void disposeUIResources() {
-        super.disposeUIResources();
-        myGeneralPanel = null;
-      }
-    };
-
-    if (myMappings != null) {
-      myGeneralPanel.updateAvailableOptions(myMappings.getActiveVcses());
-      addListenerToGeneralPanel();
-    }
-    else {
-      myGeneralPanel.updateAvailableOptions(Arrays.asList(ProjectLevelVcsManager.getInstance(myProject).getAllActiveVcss()));
-    }
+    myGeneralPanel = new VcsGeneralConfigurationConfigurable(myProject, this);
 
     List<Configurable> result = new ArrayList<Configurable>();
 
     result.add(myGeneralPanel);
-    result.add(new VcsBackgroundOperationsConfigurationPanel(myProject));
+    result.add(new VcsBackgroundOperationsConfigurable(myProject));
 
     if (!myProject.isDefault()) {
       result.add(new IgnoredSettingsPanel(myProject));
@@ -165,13 +148,8 @@ public class VcsManagerConfigurable extends SearchableConfigurable.Parent.Abstra
     return result.toArray(new Configurable[result.size()]);
   }
 
-  private void addListenerToGeneralPanel() {
-    myMappings.addVcsListener(new ModuleVcsListener() {
-      @Override
-      public void activeVcsSetChanged(Collection<AbstractVcs> activeVcses) {
-        myGeneralPanel.updateAvailableOptions(activeVcses);
-      }
-    });
+  public VcsDirectoryConfigurationPanel getMappings() {
+    return myMappings;
   }
 
   private Configurable createVcsConfigurableWrapper(final VcsDescriptor vcs) {
@@ -237,5 +215,4 @@ public class VcsManagerConfigurable extends SearchableConfigurable.Parent.Abstra
       }
     };
   }
-
 }