diff options
3 files changed, 19 insertions, 32 deletions
diff --git a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2Messages.java b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2Messages.java index edafb2d9a..fc0128159 100644 --- a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2Messages.java +++ b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2Messages.java @@ -75,7 +75,6 @@ public class CVSSSH2Messages extends NLS { public static String CVSSSH2PreferencePage_134; public static String CVSSSH2PreferencePage_135; public static String CVSSSH2PreferencePage_136; - public static String CVSSSH2PreferencePage_137; public static String CVSSSH2PreferencePage_138; public static String CVSSSH2PreferencePage_139; static { diff --git a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2PreferencePage.java b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2PreferencePage.java index 47df6e06f..9ae517852 100644 --- a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2PreferencePage.java +++ b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/CVSSSH2PreferencePage.java @@ -807,7 +807,6 @@ public class CVSSSH2PreferencePage extends PreferencePage } private TableViewer viewer; - private Button addHostKeyButton; private Button removeHostKeyButton; class TableLabelProvider extends LabelProvider implements ITableLabelProvider { public String getColumnText(Object element, int columnIndex) { @@ -829,7 +828,6 @@ public class CVSSSH2PreferencePage extends PreferencePage }; private Control createHostKeyManagementPage(Composite parent) { - int columnSpan=3; Composite group=new Composite(parent, SWT.NULL); GridLayout layout=new GridLayout(); layout.marginWidth = 0; @@ -891,8 +889,8 @@ public class CVSSSH2PreferencePage extends PreferencePage } }); TableLayout tl = new TableLayout(); + tl.addColumnData(new ColumnWeightData(30)); tl.addColumnData(new ColumnWeightData(20)); - tl.addColumnData(new ColumnWeightData(10)); tl.addColumnData(new ColumnWeightData(70)); table.setLayout(tl); @@ -903,17 +901,6 @@ public class CVSSSH2PreferencePage extends PreferencePage layout.marginWidth = 0; buttons.setLayout(layout); - addHostKeyButton = new Button(buttons, SWT.PUSH); - addHostKeyButton.setText(CVSSSH2Messages.CVSSSH2PreferencePage_137); //$NON-NLS-1$ - gd = new GridData(); - gd.horizontalAlignment = GridData.FILL; - addHostKeyButton.setLayoutData(gd); - addHostKeyButton.setEnabled(false); - addHostKeyButton.addListener(SWT.Selection, new Listener() { - public void handleEvent(Event e) { - //addHostKey(); - } - }); removeHostKeyButton = new Button(buttons, SWT.PUSH); removeHostKeyButton.setText(CVSSSH2Messages.CVSSSH2PreferencePage_138); //$NON-NLS-1$ gd = new GridData(); @@ -1163,13 +1150,15 @@ public class CVSSSH2PreferencePage extends PreferencePage protected void performDefaults(){ super.performDefaults(); - enableProxy.setSelection(false); - proxyHostText.setText(""); //$NON-NLS-1$ - proxyPortText.setText(ISSHContants.HTTP_DEFAULT_PORT); - proxyTypeCombo.select(0); - enableAuth.setSelection(false); - proxyUserText.setText(""); //$NON-NLS-1$ - proxyPassText.setText(""); //$NON-NLS-1$ + IPreferenceStore store = CVSSSH2Plugin.getDefault().getPreferenceStore(); + store.setToDefault(ISSHContants.KEY_SSH2HOME); + store.setToDefault(ISSHContants.KEY_PRIVATEKEY); + store.setToDefault(ISSHContants.KEY_PROXY); + store.setToDefault(ISSHContants.KEY_PROXY_TYPE); + store.setToDefault(ISSHContants.KEY_PROXY_HOST); + store.setToDefault(ISSHContants.KEY_PROXY_PORT); + store.setToDefault(ISSHContants.KEY_PROXY_AUTH); + initControls(); updateControls(); } diff --git a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/messages.properties b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/messages.properties index de52bf12f..b628876d0 100644 --- a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/messages.properties +++ b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/internal/ccvs/ssh2/messages.properties @@ -14,9 +14,9 @@ CVSSSH2PreferencePage_18=Configuration options for SSH2: CVSSSH2PreferencePage_19=&General CVSSSH2PreferencePage_20=&Proxy CVSSSH2PreferencePage_21=&Key Management -CVSSSH2PreferencePage_23=SSH2 &Home: +CVSSSH2PreferencePage_23=SSH2 &home: CVSSSH2PreferencePage_24=&Browse... -CVSSSH2PreferencePage_25=P&rivate key: +CVSSSH2PreferencePage_25=P&rivate keys: CVSSSH2PreferencePage_26=Add Pr&ivate Key... CVSSSH2PreferencePage_27=SSH Home: CVSSSH2PreferencePage_30=&Enable proxy connection @@ -43,7 +43,7 @@ CVSSSH2PreferencePage_59=Public key: CVSSSH2PreferencePage_99={0} does not exist.\nAre you sure you want to create it? CVSSSH2PreferencePage_100=Failed to create CVSSSH2PreferencePage_104=Proxy host port must be a number between 0 and 65535. -CVSSSH2PreferencePage_105=E&xport via sftp... +CVSSSH2PreferencePage_105=E&xport Via SFTP... CVSSSH2PreferencePage_106=Export ssh key to remote server via sftp. CVSSSH2PreferencePage_107=Specify a target site(in user@host[:port] format) where your public key should be installed.\nYour key will be stored in user@host[:port]:~/.ssh/authorized_keys CVSSSH2PreferencePage_108={0} is not valid site. @@ -60,15 +60,14 @@ CVSSSH2PreferencePage_question=Question CVSSSH2PreferencePage_125=Target site: CVSSSH2PreferencePage_126=Enter passphrase for {0} CVSSSH2PreferencePage_127=Passphrase: -CVSSSH2PreferencePage_128=&Load existing key... +CVSSSH2PreferencePage_128=&Load Existing Key... CVSSSH2PreferencePage_129=failed to decrypt {0} CVSSSH2PreferencePage_130=failed to load given file. -CVSSSH2PreferencePage_131=G&enerate DSA key... -CVSSSH2PreferencePage_132=Ge&nerate RSA key... -CVSSSH2PreferencePage_133=Kno&wnHosts +CVSSSH2PreferencePage_131=G&enerate DSA Key... +CVSSSH2PreferencePage_132=Ge&nerate RSA Key... +CVSSSH2PreferencePage_133=Kno&wn Hosts CVSSSH2PreferencePage_134=Hostname CVSSSH2PreferencePage_135=Type CVSSSH2PreferencePage_136=Fingerprint -CVSSSH2PreferencePage_137=Add... -CVSSSH2PreferencePage_138=Remove -CVSSSH2PreferencePage_139=Host Keys included in known_hosts. +CVSSSH2PreferencePage_138=&Remove +CVSSSH2PreferencePage_139=Keys of known hosts: |