MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-67487 (Editing global cvs settings from pserver root is confusing)

Browse Source
This commit is contained in:
Bas Leijdekkers
2011-04-04 18:38:14 +02:00
parent 6c8caff68a
commit 33aa918757
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/Cvs2SettingsEditPanel.java
+1 -5
View File
@@ -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) {