From 929722f0ebd18d986d9178e681b932710ebd500d Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@jetbrains.com>
Date: Tue, 25 Nov 2014 18:35:38 +0300
Subject: [PATCH] Revert "[vcs] Add toggle button to hide unregistered roots
 from the table"

This reverts commit 3ec8e6dcf3efdd9700ed1581f63db0d69f9bef92.

The implementation is buggy, and the need for the button is questionable,
so removing it until explicitly requested.
---
 .../openapi/vcs/VcsConfiguration.java         |  1 -
 .../VcsDirectoryConfigurationPanel.java       | 32 ++++++-------------
 2 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/VcsConfiguration.java b/platform/vcs-api/src/com/intellij/openapi/vcs/VcsConfiguration.java
index 840452df22e9..0d2ad32a66ff 100644
--- a/platform/vcs-api/src/com/intellij/openapi/vcs/VcsConfiguration.java
+++ b/platform/vcs-api/src/com/intellij/openapi/vcs/VcsConfiguration.java
@@ -94,7 +94,6 @@ public final class VcsConfiguration implements PersistentStateComponent<VcsConfi
   public boolean USE_COMMIT_MESSAGE_MARGIN = false;
   public int COMMIT_MESSAGE_MARGIN_SIZE = 72;
   public boolean WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN = false;
-  public boolean SHOW_UNREGISTERED_ROOTS_IN_SETTINGS = true;
 
   @AbstractCollection(surroundWithTag = false, elementTag = "path")
   @Tag("ignored-roots")
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsDirectoryConfigurationPanel.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsDirectoryConfigurationPanel.java
index d30cc63d1b8d..81ecb76e7986 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsDirectoryConfigurationPanel.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsDirectoryConfigurationPanel.java
@@ -16,7 +16,6 @@
 
 package com.intellij.openapi.vcs.configurable;
 
-import com.intellij.icons.AllIcons;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.options.Configurable;
@@ -127,16 +126,18 @@ public class VcsDirectoryConfigurationPanel extends JPanel implements Configurab
     }
   }
 
-  private class MyDirectoryRenderer extends ColoredTableCellRenderer {
+  private static class MyDirectoryRenderer extends ColoredTableCellRenderer {
+    private final Project myProject;
+
+    public MyDirectoryRenderer(Project project) {
+      myProject = project;
+    }
+
     @Override
     protected void customizeCellRenderer(JTable table, Object value, boolean selected, boolean hasFocus, int row, int column) {
       if (value instanceof MapInfo) {
         MapInfo info = (MapInfo)value;
 
-        if (!myVcsConfiguration.SHOW_UNREGISTERED_ROOTS_IN_SETTINGS && !info.type.isRegistered()) {
-          return;
-        }
-
         if (!selected && (info == MapInfo.SEPARATOR || info.type == MapInfo.Type.UNREGISTERED)) {
           setBackground(getUnregisteredRootBackground());
         }
@@ -218,10 +219,6 @@ public class VcsDirectoryConfigurationPanel extends JPanel implements Configurab
         return new ColoredTableCellRenderer() {
           @Override
           protected void customizeCellRenderer(JTable table, Object value, boolean selected, boolean hasFocus, int row, int column) {
-            if (!myVcsConfiguration.SHOW_UNREGISTERED_ROOTS_IN_SETTINGS && !info.type.isRegistered()) {
-              return;
-            }
-
             if (info == MapInfo.SEPARATOR) {
               if (!selected) {
                 setBackground(getUnregisteredRootBackground());
@@ -315,7 +312,7 @@ public class VcsDirectoryConfigurationPanel extends JPanel implements Configurab
     setLayout(new BorderLayout());
     add(createMainComponent());
 
-    myDirectoryRenderer = new MyDirectoryRenderer();
+    myDirectoryRenderer = new MyDirectoryRenderer(myProject);
     DIRECTORY = new ColumnInfo<MapInfo, MapInfo>(VcsBundle.message("column.info.configure.vcses.directory")) {
       @Override
       public MapInfo valueOf(final MapInfo mapping) {
@@ -568,18 +565,7 @@ public class VcsDirectoryConfigurationPanel extends JPanel implements Configurab
         public boolean isEnabled(AnActionEvent e) {
           return !myIsDisabled && onlyRegisteredRootsInSelection();
         }
-      }).disableUpDownActions().addExtraAction(new ToggleActionButton("Show unregistered roots", AllIcons.General.Filter) {
-        @Override
-        public boolean isSelected(AnActionEvent e) {
-          return myVcsConfiguration.SHOW_UNREGISTERED_ROOTS_IN_SETTINGS;
-        }
-
-        @Override
-        public void setSelected(AnActionEvent e, boolean state) {
-          myVcsConfiguration.SHOW_UNREGISTERED_ROOTS_IN_SETTINGS = state;
-          myDirectoryMappingTable.repaint();
-        }
-      }).createPanel();
+      }).disableUpDownActions().createPanel();
     panelForTable.setPreferredSize(new Dimension(-1, 200));
     return panelForTable;
   }