Check "Select Branch" page on filter change

Bug: 362051
Change-Id: I580d4c87461b3db90a3759f34429a66ad658cf8d

1 files changed, 23 insertions, 1 deletions

diff --git a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/SourceBranchPage.java b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/SourceBranchPage.java
index 120ad144aa..c819eefbf5 100644
--- a/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/SourceBranchPage.java
+++ b/org.eclipse.egit.ui/src/org/eclipse/egit/ui/internal/clone/SourceBranchPage.java
@@ -24,6 +24,8 @@ import java.util.List;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
+import org.eclipse.core.runtime.jobs.IJobChangeEvent;
+import org.eclipse.core.runtime.jobs.JobChangeAdapter;
 import org.eclipse.egit.core.op.ListRemoteOperation;
 import org.eclipse.egit.core.securestorage.UserPasswordCredentials;
 import org.eclipse.egit.ui.Activator;
@@ -62,6 +64,7 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.dialogs.PatternFilter;
+import org.eclipse.ui.progress.WorkbenchJob;
 
 class SourceBranchPage extends WizardPage {
 
@@ -124,7 +127,26 @@ class SourceBranchPage extends WizardPage {
 		label.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
 
 		FilteredCheckboxTree fTree = new FilteredCheckboxTree(panel, null,
-				SWT.NONE, new PatternFilter());
+				SWT.NONE, new PatternFilter()) {
+			/*
+			 * Overridden to check page when refreshing is done.
+			 */
+			protected WorkbenchJob doCreateRefreshJob() {
+				WorkbenchJob refreshJob = super.doCreateRefreshJob();
+				refreshJob.addJobChangeListener(new JobChangeAdapter() {
+					public void done(IJobChangeEvent event) {
+						if (event.getResult().isOK()) {
+							getDisplay().asyncExec(new Runnable() {
+								public void run() {
+									checkPage();
+								}
+							});
+						}
+					}
+				});
+				return refreshJob;
+			}
+		};
 		refsViewer = fTree.getCheckboxTreeViewer();
 
 		ITreeContentProvider provider = new ITreeContentProvider() {