Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryamanaka2003-12-23 12:52:19 +0000
committeryamanaka2003-12-23 12:52:19 +0000
commit22bb94f2e69758a17a70021c18e5f4f4120320d2 (patch)
tree282c3fd60100f855dddd0cd9d6c8cc921533a8e1
parent6eaf08f3c6b6bf28a23c36e2cbdcbb4c504ad39c (diff)
downloadeclipse.platform.team-22bb94f2e69758a17a70021c18e5f4f4120320d2.tar.gz
eclipse.platform.team-22bb94f2e69758a17a70021c18e5f4f4120320d2.tar.xz
eclipse.platform.team-22bb94f2e69758a17a70021c18e5f4f4120320d2.zip
* fix for 49220; Dialog Font
* fix for 49225; Fingerprint not editable * fix for 49228; Private key text problem
-rw-r--r--bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/ccvs/ssh2/CVSSSH2PreferencePage.java6
-rw-r--r--bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/ccvs/ssh2/messages.properties4
2 files changed, 7 insertions, 3 deletions
diff --git a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/ccvs/ssh2/CVSSSH2PreferencePage.java b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/ccvs/ssh2/CVSSSH2PreferencePage.java
index b62705067..65d93b55f 100644
--- a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/ccvs/ssh2/CVSSSH2PreferencePage.java
+++ b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/ccvs/ssh2/CVSSSH2PreferencePage.java
@@ -11,6 +11,7 @@ Contributors:
**********************************************************************/
package org.eclipse.team.ccvs.ssh2;
+import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.preference.*;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.*;
@@ -127,6 +128,7 @@ public class CVSSSH2PreferencePage extends PreferencePage
initDefaults(store);
initControls();
+ Dialog.applyDialogFont(parent);
return container;
}
@@ -222,7 +224,8 @@ public class CVSSSH2PreferencePage extends PreferencePage
for(int i=0; i<files.length; i++){
String foo=files[i];
- keys=keys+","+dir+foo; //$NON-NLS-1$
+ if(keys.length()!=0)keys=keys+",";
+ keys=keys+dir+foo;
}
privateKeyText.setText(keys);
}
@@ -387,6 +390,7 @@ public class CVSSSH2PreferencePage extends PreferencePage
keyFingerPrintLabel.setText(Policy.bind("CVSSSH2PreferencePage.41")); //$NON-NLS-1$
keyFingerPrintText=new Text(group, SWT.SINGLE | SWT.BORDER);
keyFingerPrintText.setFont(group.getFont());
+ keyFingerPrintText.setEditable(false);
gd=new GridData(GridData.FILL_HORIZONTAL);
gd.horizontalSpan=2;
keyFingerPrintText.setLayoutData(gd);
diff --git a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/ccvs/ssh2/messages.properties b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/ccvs/ssh2/messages.properties
index abe87a6f0..c107a12e2 100644
--- a/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/ccvs/ssh2/messages.properties
+++ b/bundles/org.eclipse.team.cvs.ssh2/src/org/eclipse/team/ccvs/ssh2/messages.properties
@@ -21,7 +21,7 @@ CVSSSH2PreferencePage.36=Proxy password:
CVSSSH2PreferencePage.37=Key type:
CVSSSH2PreferencePage.38=Generate
CVSSSH2PreferencePage.39=You can paste this public key into the remote authorized_keys file:
-CVSSSH2PreferencePage.41=Finger print:
+CVSSSH2PreferencePage.41=Fingerprint:
CVSSSH2PreferencePage.42=Comment:
CVSSSH2PreferencePage.43=Passphrase:
CVSSSH2PreferencePage.44=Confirm passphrase:
@@ -46,7 +46,7 @@ CVSSSH2PreferencePage.74=Key Management
CVSSSH2PreferencePage.75=Key type
CVSSSH2PreferencePage.76=Generate
CVSSSH2PreferencePage.77=You can paste this public key into the remote authorized_keys file:
-CVSSSH2PreferencePage.79=Finger print
+CVSSSH2PreferencePage.79=Fingerprint
CVSSSH2PreferencePage.80=Comment
CVSSSH2PreferencePage.81=Passphrase
CVSSSH2PreferencePage.82=Confirm passphrase

Back to the top