Add Repository: use "Add" instead of "Finish" for default button

Also disable the button initially.

Change-Id: If7ab3908000e075156efde4a45124ffb3c102d07
Signed-off-by: Thomas Wolf <thomas.wolf@paranor.ch>

4 files changed, 20 insertions, 2 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 73f5ee70bd..72f42a9d05 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
@@ -89,6 +89,9 @@ public class UIText extends NLS {
 	public static String Activator_setupFocusListener;
 
 	/** */
+	public static String AddCommand_AddButtonLabel;
+
+	/** */
 	public static String AddConfigEntryDialog_AddConfigTitle;
 
 	/** */
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositorySearchDialog.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositorySearchDialog.java
index 251bb78f8b..7bd52ef380 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositorySearchDialog.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/RepositorySearchDialog.java
@@ -444,7 +444,7 @@ public class RepositorySearchDialog extends WizardPage {
 		fTreeViewer.setLabelProvider(new RepositoryLabelProvider());
 
 		setControl(main);
-
+		enableOk();
 		if (fillSearch)
 			PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable() {
 
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/command/AddCommand.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/command/AddCommand.java
index b80b04f7b9..9ece8eb88a 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/command/AddCommand.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/repository/tree/command/AddCommand.java
@@ -37,12 +37,16 @@ import org.eclipse.egit.core.internal.job.JobUtil;
 import org.eclipse.egit.core.op.ConnectProviderOperation;
 import org.eclipse.egit.core.project.RepositoryFinder;
 import org.eclipse.egit.core.project.RepositoryMapping;
+import org.eclipse.egit.ui.internal.UIText;
 import org.eclipse.egit.ui.internal.repository.RepositorySearchWizard;
 import org.eclipse.egit.ui.internal.repository.tree.RepositoryTreeNode;
+import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.WizardDialog;
 import org.eclipse.jgit.lib.Repository;
 import org.eclipse.jgit.util.FileUtils;
+import org.eclipse.swt.widgets.Button;
+import org.eclipse.swt.widgets.Composite;
 import org.eclipse.team.core.RepositoryProvider;
 
 /**
@@ -54,7 +58,17 @@ public class AddCommand extends
 	public Object execute(ExecutionEvent event) throws ExecutionException {
 		RepositorySearchWizard wizard = new RepositorySearchWizard(
 				util.getConfiguredRepositories(), true);
-		WizardDialog dialog = new WizardDialog(getShell(event), wizard);
+		WizardDialog dialog = new WizardDialog(getShell(event), wizard) {
+			@Override
+			protected Button createButton(Composite parent, int id,
+					String label, boolean defaultButton) {
+				if (id == IDialogConstants.FINISH_ID) {
+					return super.createButton(parent, id,
+							UIText.AddCommand_AddButtonLabel, defaultButton);
+				}
+				return super.createButton(parent, id, label, defaultButton);
+			}
+		};
 		if (dialog.open() == Window.OK) {
 			for (String dir : wizard.getDirectories()) {
 				File repositoryDir = FileUtils.canonicalize(new File(dir));
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 c64a5cf479..457bfb0bae 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
@@ -38,6 +38,7 @@ Activator_scanError=An error occurred while scanning for changes. Scanning abort
 Activator_scanningRepositories=Scanning Git repositories for changes
 Activator_refreshFailed=Failed to refresh projects from index changes
 Activator_setupFocusListener=Setting up the focus listener
+AddCommand_AddButtonLabel=&Add
 AddConfigEntryDialog_AddConfigTitle=Add a configuration entry
 AddConfigEntryDialog_ConfigKeyTooltip=Use "." to separate section/subsection/name, e.g. "core.bare", "remote.origin.url"
 AddConfigEntryDialog_DialogMessage=Please enter a key, e.g. "user.name" and a value.