From 33aa91875704bc72e8e963932e13fbdb469d519f Mon Sep 17 00:00:00 2001
From: Bas Leijdekkers <basleijdekkers@gmail.com>
Date: Mon, 4 Apr 2011 18:38:14 +0200
Subject: [PATCH] IDEA-67487 (Editing global cvs settings from pserver root is
 confusing)

---
 .../cvsSupport2/config/ui/Cvs2SettingsEditPanel.java        | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/Cvs2SettingsEditPanel.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/Cvs2SettingsEditPanel.java
index 3af0771a4b49..8a9b938a6e8a 100644
--- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/Cvs2SettingsEditPanel.java
+++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/Cvs2SettingsEditPanel.java
@@ -66,7 +66,6 @@ public class Cvs2SettingsEditPanel implements CvsRootEditor {
   private final SshConnectionSettingsPanel mySshConnectionSettingsEditor;
   private final LocalConnectionSettingsPanel myLocalConnectionSettingsPanel;
 
-  private final PServerSettingsPanel myPServerSettingsEditor;
   private JButton myTestButton;
   @NonNls public static final String EMPTY = "EMPTY";
   private JPanel myProxySettingsPanel;
@@ -91,9 +90,8 @@ public class Cvs2SettingsEditPanel implements CvsRootEditor {
     myExtConnectionSettingsEditor = new ExtConnectionDualPanel(this);
     mySshConnectionSettingsEditor = new SshConnectionSettingsPanel(this);
     myLocalConnectionSettingsPanel = new LocalConnectionSettingsPanel();
-    myPServerSettingsEditor = new PServerSettingsPanel();
     myConnectionSettingsPanel.add(myExtConnectionSettingsEditor.getPanel(), CvsMethod.EXT_METHOD.getDisplayName());
-    myConnectionSettingsPanel.add(myPServerSettingsEditor.getPanel(), CvsMethod.PSERVER_METHOD.getDisplayName());
+    myConnectionSettingsPanel.add(new JPanel(), CvsMethod.PSERVER_METHOD.getDisplayName());
     myConnectionSettingsPanel.add(mySshConnectionSettingsEditor.getPanel(), CvsMethod.SSH_METHOD.getDisplayName());
     myConnectionSettingsPanel.add(myLocalConnectionSettingsPanel.getPanel(), CvsMethod.LOCAL_METHOD.getDisplayName());
 
@@ -141,7 +139,6 @@ public class Cvs2SettingsEditPanel implements CvsRootEditor {
       myDateOrRevisionOrTagSettings.updateFrom(configuration.DATE_OR_REVISION_SETTINGS);
       myLocalConnectionSettingsPanel.updateFrom(configuration.LOCAL_CONFIGURATION);
       myProxySettingsNonEmptyPanel.updateFrom(configuration.PROXY_SETTINGS);
-      myPServerSettingsEditor.updateFrom(CvsApplicationLevelConfiguration.getInstance());
     }
     finally {
       myIsInUpdating.setValue(false);
@@ -178,7 +175,6 @@ public class Cvs2SettingsEditPanel implements CvsRootEditor {
 
 
       myDateOrRevisionOrTagSettings.saveTo(configuration.DATE_OR_REVISION_SETTINGS);
-      myPServerSettingsEditor.saveTo(globalCvsSettings);
       return true;
     }
     catch (InputException ex) {