335701 the button enablement logic was not entirely correct

2 files changed, 3 insertions, 2 deletions

diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/LifecycleMappingPage.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/LifecycleMappingPage.java
index 6cb02604..eb34b89f 100644
--- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/LifecycleMappingPage.java
+++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/LifecycleMappingPage.java
@@ -94,6 +94,8 @@ public class LifecycleMappingPage extends WizardPage {
     setTitle("Setup Maven plugin connectors");
     setDescription("Discover and map Eclipse plugins to Maven plugin goal executions.");
     adapterManager = Platform.getAdapterManager();
+    setPageComplete(true);
+
   }
 
   /**
@@ -392,7 +394,6 @@ public class LifecycleMappingPage extends WizardPage {
     loading  = false;
     treeViewer.refresh();
 
-    setPageComplete(mappingConfiguration.isMappingComplete());
   }
 
 //  protected String getMojoExecutionColumnText(MojoExecutionMappingConfiguration execution, int columnIndex) {
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenImportWizard.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenImportWizard.java
index 1b44f509..eeb73f29 100644
--- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenImportWizard.java
+++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenImportWizard.java
@@ -132,7 +132,7 @@ public class MavenImportWizard extends AbstractMavenProjectWizard implements IIm
     //in here make sure that the lifecycle page is hidden from view when the mappings are fine
     //but disable finish when there are some problems (thus force people to at least look at the other page)
     boolean complete = page.isPageComplete();
-    if (complete) {
+    if (complete && getContainer().getCurrentPage() == page) { //only apply this logic on the first page
        LifecycleMappingConfiguration mapping = getMappingConfiguration();
        if (mapping == null || !mapping.isMappingComplete()) {
          return false;