489390 Lifecycle discovery wizard issues

Change-Id: I998bcf6151fae906ef5adfbacf5ae1e3f2240bac
Signed-off-by: Anton Tanasenko <atg.sleepless@gmail.com>

2 files changed, 6 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 ae79aaa2..5abda768 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
@@ -189,7 +189,7 @@ public class LifecycleMappingPage extends WizardPage {
             ignoreAtDefinition.remove(element);
           } else if(ignoreWorkspace.contains(element)) {
             ignoreWorkspace.remove(element);
-          } else if(intVal == all.size() + NO_ACTION_IDX || shouldDeslectProposal(prov)) {
+          } else if(intVal >= all.size() + NO_ACTION_IDX || shouldDeslectProposal(prov)) {
             IMavenDiscoveryProposal prop = mappingConfiguration.getSelectedProposal(prov.getKey());
             mappingConfiguration.removeSelectedProposal(prop);
           }
diff --git a/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/wizards/MavenDiscoveryInstallWizard.java b/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/wizards/MavenDiscoveryInstallWizard.java
index 108f386a..321d47d4 100644
--- a/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/wizards/MavenDiscoveryInstallWizard.java
+++ b/org.eclipse.m2e.discovery/src/org/eclipse/m2e/internal/discovery/wizards/MavenDiscoveryInstallWizard.java
@@ -36,14 +36,18 @@ public class MavenDiscoveryInstallWizard extends PreselectedIUInstallWizard {
 
   private boolean waitingForOtherJobs;
 
+  private RestartInstallOperation originalOperation;
+
   public MavenDiscoveryInstallWizard(ProvisioningUI ui, RestartInstallOperation operation,
       Collection<IInstallableUnit> initialSelections, LoadMetadataRepositoryJob job) {
     super(ui, operation, initialSelections, job);
+    this.originalOperation = operation;
   }
 
   @Override
   protected ProfileChangeOperation getProfileChangeOperation(Object[] elements) {
-    RestartInstallOperation op = ((RestartInstallOperation) operation).copy(ElementUtils.elementsToIUs(elements));
+    RestartInstallOperation op = ((RestartInstallOperation) originalOperation)
+        .copy(ElementUtils.elementsToIUs(elements));
     op.setProfileId(getProfileId());
     return op;
   }