422008 honour preselected working set during project import

Signed-off-by: Igor Fedorenko <igor@ifedorenko.com>

2 files changed, 24 insertions, 0 deletions

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 74a473b9..7330ea56 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
@@ -89,6 +89,13 @@ public class MavenImportWizard extends AbstractMavenProjectWizard implements IIm
     page.setLocations(locations);
     page.setShowLocation(showLocation);
     page.setBasedirRemameRequired(basedirRemameRequired);
+    if(selection != null && selection.size() == 1) {
+      // can't use SelectionUtil.getSelectedWorkingSet because it also looks at selected IResource
+      IWorkingSet workingSet = SelectionUtil.getType(selection.getFirstElement(), IWorkingSet.class);
+      if(workingSet != null) {
+        page.setWorkingSetName(workingSet.getName());
+      }
+    }
     addPage(page);
 
   }
diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenImportWizardPage.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenImportWizardPage.java
index 000c2454..6ba7b898 100644
--- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenImportWizardPage.java
+++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenImportWizardPage.java
@@ -118,6 +118,8 @@ public class MavenImportWizardPage extends AbstractMavenWizardPage {
 
   private Combo workingSetName;
 
+  private String preselectedWorkingSetName;
+
   public MavenImportWizardPage(ProjectImportConfiguration importConfiguration) {
     super("MavenProjectImportWizardPage", importConfiguration); //$NON-NLS-1$
     setTitle(org.eclipse.m2e.core.ui.internal.Messages.MavenImportWizardPage_title);
@@ -501,6 +503,12 @@ public class MavenImportWizardPage extends AbstractMavenWizardPage {
       rootProject = projects.get(0);
     }
 
+    // check if working set name was preselected
+    if(preselectedWorkingSetName != null) {
+      updateWorkingSet(preselectedWorkingSetName, true);
+      return;
+    }
+
     // check if imported project(s) are nested inside existing workspace project
     String rootDirectory = rootDirectoryCombo != null ? rootDirectoryCombo.getText().trim() : null;
     if(rootDirectory != null && rootDirectory.length() > 0) {
@@ -803,4 +811,13 @@ public class MavenImportWizardPage extends AbstractMavenWizardPage {
     }
 
   }
+
+  /**
+   * Preselected default working set name.
+   * 
+   * @since 1.5
+   */
+  public void setWorkingSetName(String workingSetName) {
+    this.preselectedWorkingSetName = workingSetName;
+  }
 }