From 0dcbff3a776ea3f8341a7176d3f774032b589616 Mon Sep 17 00:00:00 2001 From: Mykola Nikishov Date: Wed, 25 Nov 2009 22:50:21 +0200 Subject: [PATCH] Replace hard-coded remote name with Constants.DEFAULT_REMOTE_NAME Change-Id: I66419ffab7078f623f2942a75a01274699825b19 Signed-off-by: Shawn O. Pearce --- .../org/eclipse/egit/ui/internal/clone/CloneDestinationPage.java | 2 +- .../egit/ui/internal/components/RepositorySelectionPage.java | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/CloneDestinationPage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/CloneDestinationPage.java index 71572f38..e5a5f38a 100644 --- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/CloneDestinationPage.java +++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/CloneDestinationPage.java @@ -163,7 +163,7 @@ class CloneDestinationPage extends WizardPage { newLabel(g, UIText.CloneDestinationPage_promptRemoteName + ":"); //$NON-NLS-1$ remoteText = new Text(g, SWT.BORDER); - remoteText.setText("origin"); //$NON-NLS-1$ + remoteText.setText(Constants.DEFAULT_REMOTE_NAME); remoteText.setLayoutData(createFieldGridData()); remoteText.addModifyListener(new ModifyListener() { public void modifyText(ModifyEvent e) { 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 f9ff9d70..192a11fc 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 @@ -36,6 +36,7 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Group; import org.eclipse.swt.widgets.Label; import org.eclipse.swt.widgets.Text; +import org.eclipse.jgit.lib.Constants; import org.eclipse.jgit.transport.RemoteConfig; import org.eclipse.jgit.transport.URIish; import org.eclipse.jgit.util.FS; @@ -47,8 +48,6 @@ import org.eclipse.jgit.util.FS; public class RepositorySelectionPage extends BaseWizardPage { private static final int REMOTE_CONFIG_TEXT_MAX_LENGTH = 80; - private static final String DEFAULT_REMOTE_NAME = "origin"; //$NON-NLS-1$ - private static final int S_GIT = 0; private static final int S_SSH = 1; @@ -132,7 +131,7 @@ public class RepositorySelectionPage extends BaseWizardPage { * @param configuredRemotes * list of configured remotes that user may select as an * alternative to manual URI specification. Remotes appear in - * given order in GUI, with {@value #DEFAULT_REMOTE_NAME} as the + * given order in GUI, with {@value Constants#DEFAULT_REMOTE_NAME} as the * default choice. List may be null or empty - no remotes * configurations appear in this case. Note that the provided * list may be changed by this constructor. @@ -495,7 +494,7 @@ public class RepositorySelectionPage extends BaseWizardPage { private RemoteConfig selectDefaultRemoteConfig() { for (final RemoteConfig rc : configuredRemotes) - if (getTextForRemoteConfig(rc) == DEFAULT_REMOTE_NAME) + if (Constants.DEFAULT_REMOTE_NAME.equals(getTextForRemoteConfig(rc))) return rc; return configuredRemotes.get(0); } -- 2.11.4.GIT