diff options
Diffstat (limited to 'org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal')
3 files changed, 31 insertions, 0 deletions
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java index 394df70301..a37cc913ca 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/UIText.java @@ -694,6 +694,12 @@ public class UIText extends NLS { public static String GitPreferenceRoot_DefaultRepoFolderVariableButton; /** */ + public static String GitPreferenceRoot_HttpClient_Jdk_Label; + + /** */ + public static String GitPreferenceRoot_HttpClient_Apache_Label; + + /** */ public static String GitPreferenceRoot_MergeGroupHeader; /** */ @@ -4892,6 +4898,9 @@ public class UIText extends NLS { public static String GitPreferenceRoot_MaxPullThreadsCountTooltip; /** */ + public static String RemoteConnectionPreferencePage_HttpClientLabel; + + /** */ public static String RemoteConnectionPreferencePage_SshClientLabel; /** */ diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GitPreferenceRoot.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GitPreferenceRoot.java index 3e6b633635..61d9c77043 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GitPreferenceRoot.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/preferences/GitPreferenceRoot.java @@ -56,6 +56,8 @@ public class GitPreferenceRoot extends DoublePreferencesPreferencePage private final static String[][] SSH_CLIENT_NAMES_AND_VALUES = new String[2][2]; + private final static String[][] HTTP_CLIENT_NAMES_AND_VALUES = new String[2][2]; + private final static boolean HAS_DEBUG_UI = hasDebugUiBundle(); static { @@ -70,6 +72,11 @@ public class GitPreferenceRoot extends DoublePreferencesPreferencePage SSH_CLIENT_NAMES_AND_VALUES[0][1] = "jsch"; //$NON-NLS-1$ SSH_CLIENT_NAMES_AND_VALUES[1][0] = UIText.GitPreferenceRoot_SshClient_Apache_Label; SSH_CLIENT_NAMES_AND_VALUES[1][1] = "apache"; //$NON-NLS-1$ + + HTTP_CLIENT_NAMES_AND_VALUES[0][0] = UIText.GitPreferenceRoot_HttpClient_Jdk_Label; + HTTP_CLIENT_NAMES_AND_VALUES[0][1] = "jdk"; //$NON-NLS-1$ + HTTP_CLIENT_NAMES_AND_VALUES[1][0] = UIText.GitPreferenceRoot_HttpClient_Apache_Label; + HTTP_CLIENT_NAMES_AND_VALUES[1][1] = "apache"; //$NON-NLS-1$ } /** @@ -225,6 +232,18 @@ public class GitPreferenceRoot extends DoublePreferencesPreferencePage }; addField(sshClient); + ComboFieldEditor httpClient = new ComboFieldEditor( + GitCorePreferences.core_httpClient, + UIText.RemoteConnectionPreferencePage_HttpClientLabel, + HTTP_CLIENT_NAMES_AND_VALUES, remoteConnectionsGroup) { + + @Override + public IPreferenceStore getPreferenceStore() { + return getSecondaryPreferenceStore(); + } + + }; + addField(httpClient); updateMargins(remoteConnectionsGroup); Group repoChangeScannerGroup = new Group(main, SWT.SHADOW_ETCHED_IN); diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties index dbc7ada864..e06b885aa5 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/uitext.properties @@ -250,6 +250,8 @@ GitPreferenceRoot_CloningRepoGroupHeader=Cloning repositories GitPreferenceRoot_DefaultRepoFolderLabel=Default repository &folder: GitPreferenceRoot_DefaultRepoFolderTooltip=This folder will be suggested as parent folder when cloning a remote repository GitPreferenceRoot_DefaultRepoFolderVariableButton=&Variable... +GitPreferenceRoot_HttpClient_Jdk_Label=Java built-in HTTP +GitPreferenceRoot_HttpClient_Apache_Label=Apache HTTP GitPreferenceRoot_MergeGroupHeader=Merge GitPreferenceRoot_MergeMode_0_Label=Prompt when starting tool GitPreferenceRoot_MergeMode_1_Label=Workspace (pre-merged by Git) @@ -1765,6 +1767,7 @@ NotesEditorPage_Title=Notes GitPreferenceRoot_MaxPullThreadsCount=&Maximum number of parallel pulls: GitPreferenceRoot_MaxPullThreadsCountTooltip=1 disables parallel pulls +RemoteConnectionPreferencePage_HttpClientLabel=&HTTP client: RemoteConnectionPreferencePage_SshClientLabel=&SSH client: RemoteConnectionPreferencePage_TimeoutLabel=&Connection timeout (seconds): RemoteConnectionPreferencePage_ZeroValueTooltip=0 is equivalent to no timeout |