diff options
| author | Matthias Sohn | 2010-06-25 00:41:45 +0000 |
|---|---|---|
| committer | Mathias Kinzler | 2010-07-01 14:47:49 +0000 |
| commit | 79d6bfe61473e3ddcbc9a96045c9e1d5c2603bf8 (patch) | |
| tree | 83243773211918a7838428ca6ae0e662a0d77be4 /org.eclipse.egit.ui/src/org/eclipse/egit/ui | |
| parent | a32ad73e1440572aacff7599a53bdfba391a01fd (diff) | |
| download | egit-79d6bfe61473e3ddcbc9a96045c9e1d5c2603bf8.tar.gz egit-79d6bfe61473e3ddcbc9a96045c9e1d5c2603bf8.tar.xz egit-79d6bfe61473e3ddcbc9a96045c9e1d5c2603bf8.zip | |
Use "ssh" instead of "git+ssh" as default scheme for ssh protocol
This is the canonical URI form used by most other git tools. Add tooltips
to reduce the confusion for users used to the old syntax.
Change-Id: Id5e888d8ea5b0a09d435416d0212cee78f8b512b
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.egit.ui/src/org/eclipse/egit/ui')
3 files changed, 45 insertions, 3 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java index 4138c74bf8..9796ffa27f 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/UIText.java @@ -472,6 +472,27 @@ public class UIText extends NLS { public static String RepositorySelectionPage_ShowPreviousURIs_HoverText; /** */ + public static String RepositorySelectionPage_tip_file; + + /** */ + public static String RepositorySelectionPage_tip_ftp; + + /** */ + public static String RepositorySelectionPage_tip_git; + + /** */ + public static String RepositorySelectionPage_tip_http; + + /** */ + public static String RepositorySelectionPage_tip_https; + + /** */ + public static String RepositorySelectionPage_tip_sftp; + + /** */ + public static String RepositorySelectionPage_tip_ssh; + + /** */ public static String RepositorySelectionPage_uriChoice; /** */ diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/RepositorySelectionPage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/RepositorySelectionPage.java index 3b46e7bf74..b792c3b765 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/RepositorySelectionPage.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/components/RepositorySelectionPage.java @@ -82,15 +82,26 @@ public class RepositorySelectionPage extends BaseWizardPage { private static final String[] DEFAULT_SCHEMES; + private static final String[] SCHEME_TOOLTIPS; + static { DEFAULT_SCHEMES = new String[7]; DEFAULT_SCHEMES[S_GIT] = "git"; //$NON-NLS-1$ - DEFAULT_SCHEMES[S_SSH] = "git+ssh"; //$NON-NLS-1$ + DEFAULT_SCHEMES[S_SSH] = "ssh"; //$NON-NLS-1$ DEFAULT_SCHEMES[S_SFTP] = "sftp"; //$NON-NLS-1$ DEFAULT_SCHEMES[S_HTTP] = "http"; //$NON-NLS-1$ DEFAULT_SCHEMES[S_HTTPS] = "https"; //$NON-NLS-1$ DEFAULT_SCHEMES[S_FTP] = "ftp"; //$NON-NLS-1$ DEFAULT_SCHEMES[S_FILE] = "file"; //$NON-NLS-1$ + + SCHEME_TOOLTIPS = new String[7]; + SCHEME_TOOLTIPS[S_GIT] = UIText.RepositorySelectionPage_tip_git; + SCHEME_TOOLTIPS[S_SSH] = UIText.RepositorySelectionPage_tip_ssh; + SCHEME_TOOLTIPS[S_SFTP] = UIText.RepositorySelectionPage_tip_sftp; + SCHEME_TOOLTIPS[S_HTTP] = UIText.RepositorySelectionPage_tip_http; + SCHEME_TOOLTIPS[S_HTTPS] = UIText.RepositorySelectionPage_tip_https; + SCHEME_TOOLTIPS[S_FTP] = UIText.RepositorySelectionPage_tip_ftp; + SCHEME_TOOLTIPS[S_FILE] = UIText.RepositorySelectionPage_tip_file; } private final List<RemoteConfig> configuredRemotes; @@ -425,10 +436,13 @@ public class RepositorySelectionPage extends BaseWizardPage { scheme.addSelectionListener(new SelectionAdapter() { public void widgetSelected(final SelectionEvent e) { final int idx = scheme.getSelectionIndex(); - if (idx < 0) + if (idx < 0) { setURI(uri.setScheme(null)); - else + scheme.setToolTipText(""); //$NON-NLS-1$ + } else { setURI(uri.setScheme(nullString(scheme.getItem(idx)))); + scheme.setToolTipText(SCHEME_TOOLTIPS[idx]); + } updateAuthGroup(); } }); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties index 2862eec234..4010fb070d 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/uitext.properties @@ -168,6 +168,13 @@ RepositorySelectionPage_fieldNotSupported={0} not supported on {1} protocol. RepositorySelectionPage_fileNotFound={0} does not exist. RepositorySelectionPage_internalError=Internal error; consult Eclipse error log. RepositorySelectionPage_ShowPreviousURIs_HoverText=Start typing to see previously used URIs (use "*" as wildcard) +RepositorySelectionPage_tip_file=Local repository +RepositorySelectionPage_tip_ftp=FTP +RepositorySelectionPage_tip_git=Git native transfer +RepositorySelectionPage_tip_http=HTTP (smart or dumb) +RepositorySelectionPage_tip_https=Secure HTTP (smart or dumb) +RepositorySelectionPage_tip_sftp=Secure FTP +RepositorySelectionPage_tip_ssh=Git over SSH (also known as git+ssh) SoftResetToRevisionAction_softReset=Soft Reset SourceBranchPage_repoEmpty=Source Git Repository is empty SourceBranchPage_title=Branch Selection |