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

Merge remote-tracking branch 'origin/R1_1_maintenance'

Browse source
This commit is contained in:
Greg Watson 2015-01-14 16:49:59 -05:00
commit ef14e0d51c
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); fPasswordButton.setSelection(false);
fPublicKeyButton.setSelection(true); fPublicKeyButton.setSelection(true);
controls.setTabList(new Control[] { fHostText, fUserText, fPublicKeyButton, controls.setTabList(new Control[] { fHostText, fUserText, fPublicKeyButton, fPassphraseText, fPasswordButton, fPasswordText });
fPassphraseText, fPasswordButton, fPasswordText });
} }
@Override @Override
@ -302,6 +301,7 @@ public class JSchConnectionPage extends WizardPage {
new String[] { PREFS_PAGE_ID_NET_PROXY }, null); new String[] { PREFS_PAGE_ID_NET_PROXY }, null);
dlg.open(); dlg.open();
} }
@Override @Override
public void widgetDefaultSelected(SelectionEvent e) { public void widgetDefaultSelected(SelectionEvent e) {
// ignore // ignore
@ -349,8 +349,12 @@ public class JSchConnectionPage extends WizardPage {
fPassphraseText.setText(fConnection.getPassphrase()); fPassphraseText.setText(fConnection.getPassphrase());
} }
fProxyCommandText.setText(fConnection.getProxyCommand()); fProxyCommandText.setText(fConnection.getProxyCommand());
IRemoteConnection proxyConn = fConnection.getProxyConnection();
fProxyConnectionWidget.setConnection(fConnection.getProxyConnection()); if (proxyConn == null) {
proxyConn = RemoteServices.getLocalServices().getConnectionManager()
.getConnection(IRemoteConnectionManager.LOCAL_CONNECTION_NAME);
}
fProxyConnectionWidget.setConnection(proxyConn);
} else { } else {
fConnectionName.setText(fInitialName); fConnectionName.setText(fInitialName);
String host = fInitialAttributes.get(JSchConnectionAttributes.ADDRESS_ATTR); String host = fInitialAttributes.get(JSchConnectionAttributes.ADDRESS_ATTR);
@ -381,8 +385,8 @@ public class JSchConnectionPage extends WizardPage {
if (passphrase != null) { if (passphrase != null) {
fPassphraseText.setText(passphrase); fPassphraseText.setText(passphrase);
} }
fProxyConnectionWidget.setConnection(RemoteServices.getLocalServices().getConnectionManager().getConnection( fProxyConnectionWidget.setConnection(RemoteServices.getLocalServices().getConnectionManager()
IRemoteConnectionManager.LOCAL_CONNECTION_NAME)); .getConnection(IRemoteConnectionManager.LOCAL_CONNECTION_NAME));
} }
} }