mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-08 10:16:03 +02:00
Code Issues Wiki Activity

Merge "Bug 456102 - Set default proxy to Local" into R1_1_maintenance

Browse source
This commit is contained in:
Greg Watson 2015-01-14 15:40:56 -05:00 • committed by Gerrit Code Review @ Eclipse.org
commit 262b235b19
1 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
bundles/org.eclipse.remote.jsch.ui/src/org/eclipse/remote/internal/jsch/ui/wizards/JSchConnectionPage.java
View file

@ -223,8 +223,7 @@ public class JSchConnectionPage extends WizardPage {
fPasswordButton.setSelection(false);
fPublicKeyButton.setSelection(true);
controls.setTabList(new Control[] { fHostText, fUserText, fPublicKeyButton,
fPassphraseText, fPasswordButton, fPasswordText });
controls.setTabList(new Control[] { fHostText, fUserText, fPublicKeyButton, fPassphraseText, fPasswordButton, fPasswordText });
}
@Override
@ -302,6 +301,7 @@ public class JSchConnectionPage extends WizardPage {
new String[] { PREFS_PAGE_ID_NET_PROXY }, null);
dlg.open();
}
@Override
public void widgetDefaultSelected(SelectionEvent e) {
// ignore
@ -349,8 +349,12 @@ public class JSchConnectionPage extends WizardPage {
fPassphraseText.setText(fConnection.getPassphrase());
}
fProxyCommandText.setText(fConnection.getProxyCommand());
fProxyConnectionWidget.setConnection(fConnection.getProxyConnection());
IRemoteConnection proxyConn = fConnection.getProxyConnection();
if (proxyConn == null) {
proxyConn = RemoteServices.getLocalServices().getConnectionManager()
.getConnection(IRemoteConnectionManager.LOCAL_CONNECTION_NAME);
}
fProxyConnectionWidget.setConnection(proxyConn);
} else {
fConnectionName.setText(fInitialName);
String host = fInitialAttributes.get(JSchConnectionAttributes.ADDRESS_ATTR);
@ -381,8 +385,8 @@ public class JSchConnectionPage extends WizardPage {
if (passphrase != null) {
fPassphraseText.setText(passphrase);
}
fProxyConnectionWidget.setConnection(RemoteServices.getLocalServices().getConnectionManager().getConnection(
IRemoteConnectionManager.LOCAL_CONNECTION_NAME));
fProxyConnectionWidget.setConnection(RemoteServices.getLocalServices().getConnectionManager()
.getConnection(IRemoteConnectionManager.LOCAL_CONNECTION_NAME));
}
}