Fixed bug 372020: TeamUI#getPages expects fileSystemScheme to be defined

when importing via SCM URL

2 files changed, 7 insertions, 6 deletions

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 6432d4622b..25239a31db 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
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2003, 2011 IBM Corporation and others.
+ * Copyright (c) 2003, 2012 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -10,8 +10,6 @@
  *******************************************************************************/
 package org.eclipse.pde.internal.ui.wizards.imports;
 
-import org.eclipse.pde.core.target.*;
-
 import java.io.File;
 import java.lang.reflect.InvocationTargetException;
 import java.net.MalformedURLException;
@@ -27,6 +25,7 @@ import org.eclipse.jface.preference.*;
 import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.*;
 import org.eclipse.pde.core.plugin.*;
+import org.eclipse.pde.core.target.*;
 import org.eclipse.pde.internal.core.*;
 import org.eclipse.pde.internal.core.project.BundleProjectService;
 import org.eclipse.pde.internal.ui.*;
@@ -658,8 +657,9 @@ public class PluginImportWizardFirstPage extends WizardPage {
 					ScmUrlImportDescription[] descriptions = (ScmUrlImportDescription[]) entry.getValue();
 					IScmUrlImportWizardPage page = (IScmUrlImportWizardPage) importIdToWizardPage.get(importer.getId());
 					if (page == null) {
-						page = TeamUI.getPages(descriptions)[0];
+						page = TeamUI.getPages(importer.getId())[0];
 						if (page != null) {
+							page.setSelection(descriptions);
 							importIdToWizardPage.put(importer.getId(), page);
 							((Wizard) getWizard()).addPage(page);
 						}
diff --git a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/RepositoryImportWizard.java b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/RepositoryImportWizard.java
index b4870e53b9..ab9eff5190 100644
--- a/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/RepositoryImportWizard.java
+++ b/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/RepositoryImportWizard.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2011 IBM Corporation and others.
+ * Copyright (c) 2011, 2012 IBM Corporation and others.
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
@@ -68,11 +68,12 @@ public class RepositoryImportWizard extends Wizard {
 			IScmUrlImportWizardPage page = (IScmUrlImportWizardPage) fIdToPages.get(importer.getId());
 			if (page == null) {
 				try {
-					page = TeamUI.getPages(descriptions)[0];
+					page = TeamUI.getPages(importer.getId())[0];
 				} catch (CoreException e) {
 					PDEPlugin.log(e);
 				}
 				if (page != null) {
+					page.setSelection(descriptions);
 					fIdToPages.put(importer.getId(), page);
 					addPage(page);
 				}