Fixed bug 372726: scm bundle importer must reset pages before setting

selection

2 files changed, 9 insertions, 1 deletions

diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportOperation.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportOperation.java
index ea11d7139b..df82d8d382 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportOperation.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportOperation.java
@@ -200,8 +200,10 @@ public class PluginImportOperation extends WorkspaceJob {
 					Entry entry = (Entry) iterator.next();
 					IBundleImporter importer = (IBundleImporter) entry.getKey();
 					ScmUrlImportDescription[] descriptions = (ScmUrlImportDescription[]) entry.getValue();
+					if (descriptions.length == 0)
+						continue;
 					IProject[] importedProjects = importer.performImport(descriptions, new SubProgressMonitor(monitor, descriptions.length));
-					if (importedProjects.length == descriptions.length)
+					if (importedProjects != null && importedProjects.length == descriptions.length)
 						continue;
 
 					ArrayList namesOfImportedProjects = new ArrayList(importedProjects.length);
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardFirstPage.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardFirstPage.java
index ba28520b03..c9c534ccf9 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardFirstPage.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardFirstPage.java
@@ -873,6 +873,12 @@ public class PluginImportWizardFirstPage extends WizardPage {
 				}
 			}
 		}
+
+		// First clear the selection for all pages
+		iterator = importIdToWizardPage.values().iterator();
+		while (iterator.hasNext())
+			((IScmUrlImportWizardPage) iterator.next()).setSelection(new ScmUrlImportDescription[0]);
+
 		iterator = importerToImportees.entrySet().iterator();
 		while (iterator.hasNext()) {
 			Entry entry = (Entry) iterator.next();