Bug 74437 Import wizard should not enable "Finish" until the operation can be completed

2 files changed, 16 insertions, 0 deletions

diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutWizard.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutWizard.java
index fe80e78b4..3f8c1710d 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutWizard.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/CheckoutWizard.java
@@ -191,6 +191,7 @@ public class CheckoutWizard extends Wizard implements ICVSWizard, INewWizard {
 						// Only allow configuration if one module is selected
 						hasMetafile = hasProjectMetafile(selectedModules[0]);
 					}
+					resetSubwizard();
 					wizard = new CheckoutAsWizard(getPart(), selectedModules, ! hasMetafile /* allow configuration */);
 					wizard.addPages();
 					return wizard.getStartingPage();
@@ -284,4 +285,14 @@ public class CheckoutWizard extends Wizard implements ICVSWizard, INewWizard {
 	 */
 	public void init(IWorkbench workbench, IStructuredSelection selection) {
 	}
+
+	/*
+	 * Reset the sub-wizard
+	 */
+	/* package */ void resetSubwizard() {
+		if (wizard != null) {
+			wizard.dispose();
+			wizard = null;
+		}
+	}
 }
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ModuleSelectionPage.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ModuleSelectionPage.java
index 7df778ff7..d98791efa 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ModuleSelectionPage.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/ModuleSelectionPage.java
@@ -21,6 +21,7 @@ import org.eclipse.jface.dialogs.Dialog;
 import org.eclipse.jface.operation.IRunnableWithProgress;
 import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.jface.viewers.*;
+import org.eclipse.jface.wizard.IWizard;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.MouseAdapter;
 import org.eclipse.swt.events.MouseEvent;
@@ -104,6 +105,10 @@ public class ModuleSelectionPage extends CVSWizardPage {
 	public void setVisible(boolean visible) {
 		super.setVisible(visible);
 		if (visible) {
+			IWizard w = getWizard();
+			if (w instanceof CheckoutWizard) {
+				((CheckoutWizard)w).resetSubwizard();
+			}
 			if (useProjectNameButton != null && useProjectNameButton.getSelection()) {
 				useProjectNameButton.setFocus();
 			} else if (useSpecifiedNameButton.getSelection()) {