Allow ref name prepopulation in gerrit fetch wizard

Mylyn Reviews Gerrit connector plans to use this functionality
to allow fetching changes from the task editor.

Change-Id: Ida2465e16bc92b8620f7d76b8428d68e30227ddb

2 files changed, 26 insertions, 2 deletions

diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchGerritChangePage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchGerritChangePage.java
index 6a50dde576..13a70271f4 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchGerritChangePage.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchGerritChangePage.java
@@ -96,12 +96,16 @@ public class FetchGerritChangePage extends WizardPage {
 
 	private Text branchText;
 
+	private String refName;
+
 	/**
 	 * @param repository
+	 * @param refName initial value for the ref field
 	 */
-	public FetchGerritChangePage(Repository repository) {
+	public FetchGerritChangePage(Repository repository, String refName) {
 		super(FetchGerritChangePage.class.getName());
 		this.repository = repository;
+		this.refName = refName;
 		setTitle(NLS
 				.bind(UIText.FetchGerritChangePage_PageTitle,
 						Activator.getDefault().getRepositoryUtil()
@@ -148,6 +152,8 @@ public class FetchGerritChangePage extends WizardPage {
 		});
 
 		branchTextlabel = new Label(checkoutGroup, SWT.NONE);
+		GridDataFactory.defaultsFor(branchTextlabel).exclude(false)
+				.applyTo(branchTextlabel);
 		branchTextlabel.setText(UIText.FetchGerritChangePage_BranchNameText);
 		branchText = new Text(checkoutGroup, SWT.SINGLE | SWT.BORDER);
 		GridDataFactory.fillDefaults().grab(true, false).applyTo(branchText);
@@ -243,6 +249,13 @@ public class FetchGerritChangePage extends WizardPage {
 		setControl(main);
 	}
 
+	@Override
+	public void setVisible(boolean visible) {
+		super.setVisible(visible);
+		if (visible && refName != null)
+			refText.setText(refName);
+	}
+
 	private void checkPage() {
 		boolean createBranchSelected = createBranch.getSelection();
 		branchText.setEnabled(createBranchSelected);
diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchGerritChangeWizard.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchGerritChangeWizard.java
index c70b85f413..b59133ea47 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchGerritChangeWizard.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/fetch/FetchGerritChangeWizard.java
@@ -22,6 +22,8 @@ public class FetchGerritChangeWizard extends Wizard {
 
 	FetchGerritChangePage page;
 
+	private String refName;
+
 	/**
 	 * @param repository
 	 *            the repository
@@ -33,9 +35,18 @@ public class FetchGerritChangeWizard extends Wizard {
 		setWindowTitle(UIText.FetchGerritChangeWizard_WizardTitle);
 	}
 
+	/**
+	 * @param repository
+	 * @param refName initial value for the ref field
+	 */
+	public FetchGerritChangeWizard(Repository repository, String refName) {
+		this(repository);
+		this.refName = refName;
+	}
+
 	@Override
 	public void addPages() {
-		page = new FetchGerritChangePage(repository);
+		page = new FetchGerritChangePage(repository, refName);
 		addPage(page);
 	}