summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Zarna2012-02-28 07:34:16 (EST)
committerDani Megert2012-02-28 07:34:16 (EST)
commit7f995f33c29c4fff54b6c6faa0930da7e6d0c17f (patch)
treefa7d43c7944dda29d4912c90eecb90e2888442d8
parenta069542034321f8f065b7fc41da5b3a082d21370 (diff)
downloadeclipse.pde.ui-7f995f33c29c4fff54b6c6faa0930da7e6d0c17f.zip
eclipse.pde.ui-7f995f33c29c4fff54b6c6faa0930da7e6d0c17f.tar.gz
eclipse.pde.ui-7f995f33c29c4fff54b6c6faa0930da7e6d0c17f.tar.bz2
Fixed bug 372020: TeamUI#getPages expects fileSystemScheme to be defined
when importing via SCM URL
-rw-r--r--ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardFirstPage.java8
-rw-r--r--ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/RepositoryImportWizard.java5
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 6432d46..25239a3 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 b4870e5..ab9eff5 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);
}