Bug 477865 - API Baseline Wizard Finish Button Unconditionally disabledI20150922-0800

New instance of a page created every time the wizard is navigated and
so the Finish condition is never satisfied

Signed-off-by: Sergey Grant <sergeygrant@google.com>
Change-Id: I6ea5e2aba421cbba71fad00283515f6d533f6734

1 files changed, 12 insertions, 3 deletions

diff --git a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/wizards/SelectApiBaselineTypeWizardPage.java b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/wizards/SelectApiBaselineTypeWizardPage.java
index 8d826e0b23..4cd645e087 100644
--- a/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/wizards/SelectApiBaselineTypeWizardPage.java
+++ b/apitools/org.eclipse.pde.api.tools.ui/src/org/eclipse/pde/api/tools/ui/internal/wizards/SelectApiBaselineTypeWizardPage.java
@@ -29,6 +29,8 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.PlatformUI;
 
 public class SelectApiBaselineTypeWizardPage extends WizardPage {
+	private TargetBasedApiBaselineWizardPage targetPage;
+	private DirectoryBasedApiBaselineWizardPage directoryPage;
 
 	protected SelectApiBaselineTypeWizardPage() {
 		super(WizardMessages.ApiProfileWizardPage_1);
@@ -87,11 +89,18 @@ public class SelectApiBaselineTypeWizardPage extends WizardPage {
 	public IWizardPage getNextPage() {
 		IWizardPage next = null;
 		if (locationIsTarget.getSelection()) {
-			next = new TargetBasedApiBaselineWizardPage(null);
+			if (targetPage == null) {
+				targetPage = new TargetBasedApiBaselineWizardPage(null);
+				((Wizard) getWizard()).addPage(targetPage);
+			}
+			next = targetPage;
 		} else if (locationIsDirectory.getSelection()) {
-			next = new DirectoryBasedApiBaselineWizardPage(null);
+			if (directoryPage == null) {
+				directoryPage = new DirectoryBasedApiBaselineWizardPage(null);
+				((Wizard) getWizard()).addPage(directoryPage);
+			}
+			next = directoryPage;
 		}
-		((Wizard) getWizard()).addPage(next);
 		return next;
 	}