Attachment #165142 for bug #195729

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.




/*******************************************************************************
 *  Copyright (c) 2000, 2010 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

 *******************************************************************************/
package org.eclipse.pde.internal.ui.wizards.imports;

import java.util.*;
import java.util.Iterator;
import java.util.Map;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.debug.core.*;
import org.eclipse.jface.dialogs.*;
import org.eclipse.debug.core.ILaunchConfiguration;
import org.eclipse.debug.core.ILaunchManager;
import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.wizard.*;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.osgi.service.resolver.BundleDescription;
import org.eclipse.pde.core.plugin.IPluginModelBase;
import org.eclipse.pde.internal.core.SourceLocationManager;
import org.eclipse.pde.internal.launching.launcher.BundleLauncherHelper;
import org.eclipse.pde.internal.ui.*;
import org.eclipse.pde.internal.ui.provisional.IBundeImportWizardPage;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.IImportWizard;
import org.eclipse.ui.IWorkbench;

public class PluginImportWizard extends Wizard implements IImportWizard, IPageChangingListener {

	private static final String STORE_SECTION = "PluginImportWizard"; //$NON-NLS-1$


		this.selection = selection;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.jface.wizard.Wizard#createPageControls(org.eclipse.swt.widgets.Composite)
	 */
	public void createPageControls(Composite pageContainer) {
		super.createPageControls(pageContainer);
		IWizardContainer container = getContainer();
		if (container instanceof WizardDialog) {
			WizardDialog dialog = (WizardDialog) container;
			dialog.addPageChangingListener(this);
		}
	}

	public void addPages() {
		setNeedsProgressMonitor(true);
		page1 = new PluginImportWizardFirstPage("first"); //$NON-NLS-1$

				return false;

		}
		if (page1.getImportType() == PluginImportOperation.IMPORT_FROM_REPOSITORY) {
			if (getContainer().getCurrentPage() == page3) {
				// ensure to set the models to import when finished is pressed without advancing to the repository pages
				page1.configureBundleImportPages(models);
			}
		}
		// finish contributed pages
		if (!page1.finishPages()) {
			return false;

	public boolean canFinish() {
		return !page1.isCurrentPage() && page1.getNextPage().isPageComplete() && page1.arePagesComplete();
	}

	/* (non-Javadoc)
	 * @see org.eclipse.jface.dialogs.IPageChangingListener#handlePageChanging(org.eclipse.jface.dialogs.PageChangingEvent)
	 */
	public void handlePageChanging(PageChangingEvent event) {
		if (event.getCurrentPage() == page3 && event.getTargetPage() instanceof IBundeImportWizardPage) {
			IPluginModelBase[] models = getModelsToImport();
			page1.configureBundleImportPages(models);
		}
	}
}




 *******************************************************************************/
package org.eclipse.pde.internal.ui.wizards.imports;

import org.eclipse.pde.internal.ui.provisional.IBundeImportWizardPage;

import org.eclipse.pde.internal.core.importing.provisional.BundleImportDescription;

import org.eclipse.pde.internal.core.importing.IBundleImporter;

import java.io.File;
import java.lang.reflect.InvocationTargetException;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.*;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.List;
import org.eclipse.core.runtime.*;
import org.eclipse.core.runtime.IConfigurationElement;
import org.eclipse.core.runtime.IExtensionPoint;
import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.SubProgressMonitor;
import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.jface.preference.*;
import org.eclipse.jface.preference.PreferenceDialog;
import org.eclipse.jface.preference.PreferenceManager;
import org.eclipse.jface.window.Window;
import org.eclipse.jface.wizard.*;
import org.eclipse.pde.core.plugin.*;
import org.eclipse.pde.internal.core.*;
import org.eclipse.pde.internal.core.importing.IBundleImporter;
import org.eclipse.pde.internal.core.importing.provisional.BundleImportDescription;
import org.eclipse.pde.core.plugin.PluginRegistry;
import org.eclipse.pde.core.plugin.TargetPlatform;
import org.eclipse.pde.internal.core.ICoreConstants;
import org.eclipse.pde.internal.core.PDECore;
import org.eclipse.pde.internal.core.PDEPreferencesManager;
import org.eclipse.pde.internal.core.PDEState;
import org.eclipse.pde.internal.core.SourceLocationKey;
import org.eclipse.pde.internal.core.SourceLocationManager;
import org.eclipse.pde.internal.core.project.BundleProjectService;
import org.eclipse.pde.internal.core.target.provisional.*;
import org.eclipse.pde.internal.ui.*;
import org.eclipse.pde.internal.core.target.provisional.ITargetDefinition;
import org.eclipse.pde.internal.core.target.provisional.ITargetHandle;
import org.eclipse.pde.internal.core.target.provisional.ITargetPlatformService;
import org.eclipse.pde.internal.ui.IHelpContextIds;
import org.eclipse.pde.internal.ui.IPDEUIConstants;
import org.eclipse.pde.internal.ui.PDEPlugin;
import org.eclipse.pde.internal.ui.PDEUIMessages;
import org.eclipse.pde.internal.ui.SWTFactory;
import org.eclipse.pde.internal.ui.preferences.TargetPlatformPreferenceNode;
import org.eclipse.pde.internal.ui.provisional.IBundeImportWizardPage;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.BusyIndicator;
import org.eclipse.swt.events.*;
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.events.SelectionEvent;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.*;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.DirectoryDialog;
import org.eclipse.swt.widgets.Group;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.PlatformUI;
import org.osgi.framework.Version;


					}
					if (page != null) {
						nextPages.add(page);
//						page.setSelection((BundleImportDescription[]) entry.getValue());
					}
				}
			}

				return getDropLocation();
		}
	}

	/**
	 * Notifies the contributed bundle import pages of the bundles to import.
	 * 
	 * @param models the models selected for import
	 */
	public void configureBundleImportPages(IPluginModelBase[] models) {
		// make a set of the models to import for quick lookup
		Set modelsSet = new HashSet();
		for (int i = 0; i < models.length; i++) {
			modelsSet.add(models[i]);
		}
		Map importerToImportees = new HashMap();
		Iterator iterator = importerToInstructions.entrySet().iterator();
		while (iterator.hasNext()) {
			Entry entry = (Entry) iterator.next();
			IBundleImporter importer = (IBundleImporter) entry.getKey();
			BundleImportDescription[] descriptions = (BundleImportDescription[]) entry.getValue();
			for (int i = 0; i < descriptions.length; i++) {
				IPluginModelBase model = (IPluginModelBase) descriptions[i].getProperty(BundleProjectService.PLUGIN);
				if (modelsSet.contains(model)) {
					List importees = (List) importerToImportees.get(importer);
					if (importees == null) {
						importees = new ArrayList();
						importerToImportees.put(importer, importees);
					}
					importees.add(descriptions[i]);
				}
			}
		}
		iterator = importerToImportees.entrySet().iterator();
		while (iterator.hasNext()) {
			Entry entry = (Entry) iterator.next();
			IBundleImporter importer = (IBundleImporter) entry.getKey();
			List list = (List) entry.getValue();
			BundleImportDescription[] descriptions = (BundleImportDescription[]) list.toArray(new BundleImportDescription[list.size()]);
			IBundeImportWizardPage page = (IBundeImportWizardPage) importIdToWizardPage.get(importer.getId());
			if (page != null) {
				page.setSelection(descriptions);
			}
		}
	}
}

Return to bug 195729

Lines 10-89 Link Here

(-)src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizardFirstPage.java (-60 / +57 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.pde.internal.ui.wizards.imports;	11	package org.eclipse.pde.internal.ui.wizards.imports;
12		12
13	import org.eclipse.pde.internal.ui.provisional.IBundeImportWizardPage;
14
15	import org.eclipse.pde.internal.core.importing.provisional.BundleImportDescription;
16
17	import org.eclipse.pde.internal.core.importing.IBundleImporter;
18
19	import java.io.File;	13	import java.io.File;
20	import java.lang.reflect.InvocationTargetException;	14	import java.lang.reflect.InvocationTargetException;
21	import java.net.MalformedURLException;	15	import java.net.MalformedURLException;
22	import java.net.URL;	16	import java.net.URL;
23	import java.util.ArrayList;	17	import java.util.*;
24	import java.util.Collections;
25	import java.util.Comparator;
26	import java.util.HashMap;
27	import java.util.HashSet;
28	import java.util.Iterator;
29	import java.util.List;
30	import java.util.Map;
31	import java.util.Map.Entry;	18	import java.util.Map.Entry;
32	import java.util.Set;	19	import java.util.List;
33	import org.eclipse.core.runtime.CoreException;	20	import org.eclipse.core.runtime.*;
34	import org.eclipse.core.runtime.IConfigurationElement;
35	import org.eclipse.core.runtime.IExtensionPoint;
36	import org.eclipse.core.runtime.IPath;
37	import org.eclipse.core.runtime.IProgressMonitor;
38	import org.eclipse.core.runtime.Path;
39	import org.eclipse.core.runtime.Platform;
40	import org.eclipse.core.runtime.SubProgressMonitor;
41	import org.eclipse.jface.dialogs.Dialog;	21	import org.eclipse.jface.dialogs.Dialog;
42	import org.eclipse.jface.dialogs.IDialogSettings;	22	import org.eclipse.jface.dialogs.IDialogSettings;
43	import org.eclipse.jface.operation.IRunnableWithProgress;	23	import org.eclipse.jface.operation.IRunnableWithProgress;
44	import org.eclipse.jface.preference.IPreferenceNode;	24	import org.eclipse.jface.preference.*;
45	import org.eclipse.jface.preference.PreferenceDialog;
46	import org.eclipse.jface.preference.PreferenceManager;
47	import org.eclipse.jface.window.Window;	25	import org.eclipse.jface.window.Window;
48	import org.eclipse.jface.wizard.IWizardPage;	26	import org.eclipse.jface.wizard.*;
49	import org.eclipse.jface.wizard.Wizard;	27	import org.eclipse.pde.core.plugin.*;
50	import org.eclipse.jface.wizard.WizardPage;	28	import org.eclipse.pde.internal.core.*;
51	import org.eclipse.pde.core.plugin.IPluginBase;	29	import org.eclipse.pde.internal.core.importing.IBundleImporter;
52	import org.eclipse.pde.core.plugin.IPluginModelBase;	30	import org.eclipse.pde.internal.core.importing.provisional.BundleImportDescription;
53	import org.eclipse.pde.core.plugin.PluginRegistry;
54	import org.eclipse.pde.core.plugin.TargetPlatform;
55	import org.eclipse.pde.internal.core.ICoreConstants;
56	import org.eclipse.pde.internal.core.PDECore;
57	import org.eclipse.pde.internal.core.PDEPreferencesManager;
58	import org.eclipse.pde.internal.core.PDEState;
59	import org.eclipse.pde.internal.core.SourceLocationKey;
60	import org.eclipse.pde.internal.core.SourceLocationManager;
61	import org.eclipse.pde.internal.core.project.BundleProjectService;	31	import org.eclipse.pde.internal.core.project.BundleProjectService;
62	import org.eclipse.pde.internal.core.target.provisional.IBundleContainer;	32	import org.eclipse.pde.internal.core.target.provisional.*;
63	import org.eclipse.pde.internal.core.target.provisional.IResolvedBundle;	33	import org.eclipse.pde.internal.ui.*;
64	import org.eclipse.pde.internal.core.target.provisional.ITargetDefinition;
65	import org.eclipse.pde.internal.core.target.provisional.ITargetHandle;
66	import org.eclipse.pde.internal.core.target.provisional.ITargetPlatformService;
67	import org.eclipse.pde.internal.ui.IHelpContextIds;
68	import org.eclipse.pde.internal.ui.IPDEUIConstants;
69	import org.eclipse.pde.internal.ui.PDEPlugin;
70	import org.eclipse.pde.internal.ui.PDEUIMessages;
71	import org.eclipse.pde.internal.ui.SWTFactory;
72	import org.eclipse.pde.internal.ui.preferences.TargetPlatformPreferenceNode;	34	import org.eclipse.pde.internal.ui.preferences.TargetPlatformPreferenceNode;
		35	import org.eclipse.pde.internal.ui.provisional.IBundeImportWizardPage;
73	import org.eclipse.swt.SWT;	36	import org.eclipse.swt.SWT;
74	import org.eclipse.swt.custom.BusyIndicator;	37	import org.eclipse.swt.custom.BusyIndicator;
75	import org.eclipse.swt.events.ModifyEvent;	38	import org.eclipse.swt.events.*;
76	import org.eclipse.swt.events.ModifyListener;
77	import org.eclipse.swt.events.SelectionAdapter;
78	import org.eclipse.swt.events.SelectionEvent;
79	import org.eclipse.swt.layout.GridData;	39	import org.eclipse.swt.layout.GridData;
80	import org.eclipse.swt.layout.GridLayout;	40	import org.eclipse.swt.layout.GridLayout;
81	import org.eclipse.swt.widgets.Button;	41	import org.eclipse.swt.widgets.*;
82	import org.eclipse.swt.widgets.Combo;
83	import org.eclipse.swt.widgets.Composite;
84	import org.eclipse.swt.widgets.DirectoryDialog;
85	import org.eclipse.swt.widgets.Group;
86	import org.eclipse.swt.widgets.Shell;
87	import org.eclipse.ui.PlatformUI;	42	import org.eclipse.ui.PlatformUI;
88	import org.osgi.framework.Version;	43	import org.osgi.framework.Version;
89		44
Lines 728-734 Link Here
728	}	683	}
729	if (page != null) {	684	if (page != null) {
730	nextPages.add(page);	685	nextPages.add(page);
731	page.setSelection((BundleImportDescription[]) entry.getValue());	686	// page.setSelection((BundleImportDescription[]) entry.getValue());
732	}	687	}
733	}	688	}
734	}	689	}
Lines 931-934 Link Here
931	return getDropLocation();	886	return getDropLocation();
932	}	887	}
933	}	888	}
		889
		890	/**
		891	* Notifies the contributed bundle import pages of the bundles to import.
		892	*
		893	* @param models the models selected for import
		894	*/
		895	public void configureBundleImportPages(IPluginModelBase[] models) {
		896	// make a set of the models to import for quick lookup
		897	Set modelsSet = new HashSet();
		898	for (int i = 0; i < models.length; i++) {
		899	modelsSet.add(models[i]);
		900	}
		901	Map importerToImportees = new HashMap();
		902	Iterator iterator = importerToInstructions.entrySet().iterator();
		903	while (iterator.hasNext()) {
		904	Entry entry = (Entry) iterator.next();
		905	IBundleImporter importer = (IBundleImporter) entry.getKey();
		906	BundleImportDescription[] descriptions = (BundleImportDescription[]) entry.getValue();
		907	for (int i = 0; i < descriptions.length; i++) {
		908	IPluginModelBase model = (IPluginModelBase) descriptions[i].getProperty(BundleProjectService.PLUGIN);
		909	if (modelsSet.contains(model)) {
		910	List importees = (List) importerToImportees.get(importer);
		911	if (importees == null) {
		912	importees = new ArrayList();
		913	importerToImportees.put(importer, importees);
		914	}
		915	importees.add(descriptions[i]);
		916	}
		917	}
		918	}
		919	iterator = importerToImportees.entrySet().iterator();
		920	while (iterator.hasNext()) {
		921	Entry entry = (Entry) iterator.next();
		922	IBundleImporter importer = (IBundleImporter) entry.getKey();
		923	List list = (List) entry.getValue();
		924	BundleImportDescription[] descriptions = (BundleImportDescription[]) list.toArray(new BundleImportDescription[list.size()]);
		925	IBundeImportWizardPage page = (IBundeImportWizardPage) importIdToWizardPage.get(importer.getId());
		926	if (page != null) {
		927	page.setSelection(descriptions);
		928	}
		929	}
		930	}
934	}	931	}

Lines 1-5 Link Here

(-)src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizard.java (-17 / +37 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2009 IBM Corporation and others.	2	* Copyright (c) 2000, 2010 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 10-42 Link Here
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.pde.internal.ui.wizards.imports;	11	package org.eclipse.pde.internal.ui.wizards.imports;
12		12
13	import java.util.HashSet;	13	import java.util.*;
14	import java.util.Iterator;
15	import java.util.Map;
16	import org.eclipse.core.resources.ResourcesPlugin;	14	import org.eclipse.core.resources.ResourcesPlugin;
17	import org.eclipse.core.runtime.CoreException;	15	import org.eclipse.core.runtime.CoreException;
18	import org.eclipse.debug.core.DebugPlugin;	16	import org.eclipse.debug.core.*;
19	import org.eclipse.debug.core.ILaunch;	17	import org.eclipse.jface.dialogs.*;
20	import org.eclipse.debug.core.ILaunchConfiguration;
21	import org.eclipse.debug.core.ILaunchManager;
22	import org.eclipse.jface.dialogs.IDialogConstants;
23	import org.eclipse.jface.dialogs.IDialogSettings;
24	import org.eclipse.jface.dialogs.MessageDialog;
25	import org.eclipse.jface.viewers.IStructuredSelection;	18	import org.eclipse.jface.viewers.IStructuredSelection;
26	import org.eclipse.jface.wizard.IWizardPage;	19	import org.eclipse.jface.wizard.*;
27	import org.eclipse.jface.wizard.Wizard;
28	import org.eclipse.osgi.service.resolver.BundleDescription;	20	import org.eclipse.osgi.service.resolver.BundleDescription;
29	import org.eclipse.pde.core.plugin.IPluginModelBase;	21	import org.eclipse.pde.core.plugin.IPluginModelBase;
30	import org.eclipse.pde.internal.core.SourceLocationManager;	22	import org.eclipse.pde.internal.core.SourceLocationManager;
31	import org.eclipse.pde.internal.launching.launcher.BundleLauncherHelper;	23	import org.eclipse.pde.internal.launching.launcher.BundleLauncherHelper;
32	import org.eclipse.pde.internal.ui.PDEPlugin;	24	import org.eclipse.pde.internal.ui.*;
33	import org.eclipse.pde.internal.ui.PDEPluginImages;	25	import org.eclipse.pde.internal.ui.provisional.IBundeImportWizardPage;
34	import org.eclipse.pde.internal.ui.PDEUIMessages;	26	import org.eclipse.swt.widgets.Composite;
35	import org.eclipse.swt.widgets.Shell;	27	import org.eclipse.swt.widgets.Shell;
36	import org.eclipse.ui.IImportWizard;	28	import org.eclipse.ui.IImportWizard;
37	import org.eclipse.ui.IWorkbench;	29	import org.eclipse.ui.IWorkbench;
38		30
39	public class PluginImportWizard extends Wizard implements IImportWizard {	31	public class PluginImportWizard extends Wizard implements IImportWizard, IPageChangingListener {
40		32
41	private static final String STORE_SECTION = "PluginImportWizard"; //$NON-NLS-1$	33	private static final String STORE_SECTION = "PluginImportWizard"; //$NON-NLS-1$
42		34
Lines 56-61 Link Here
56	this.selection = selection;	48	this.selection = selection;
57	}	49	}
58		50
		51	/* (non-Javadoc)
		52	* @see org.eclipse.jface.wizard.Wizard#createPageControls(org.eclipse.swt.widgets.Composite)
		53	*/
		54	public void createPageControls(Composite pageContainer) {
		55	super.createPageControls(pageContainer);
		56	IWizardContainer container = getContainer();
		57	if (container instanceof WizardDialog) {
		58	WizardDialog dialog = (WizardDialog) container;
		59	dialog.addPageChangingListener(this);
		60	}
		61	}
		62
59	public void addPages() {	63	public void addPages() {
60	setNeedsProgressMonitor(true);	64	setNeedsProgressMonitor(true);
61	page1 = new PluginImportWizardFirstPage("first"); //$NON-NLS-1$	65	page1 = new PluginImportWizardFirstPage("first"); //$NON-NLS-1$
Lines 92-97 Link Here
92	return false;	96	return false;
93		97
94	}	98	}
		99	if (page1.getImportType() == PluginImportOperation.IMPORT_FROM_REPOSITORY) {
		100	if (getContainer().getCurrentPage() == page3) {
		101	// ensure to set the models to import when finished is pressed without advancing to the repository pages
		102	page1.configureBundleImportPages(models);
		103	}
		104	}
95	// finish contributed pages	105	// finish contributed pages
96	if (!page1.finishPages()) {	106	if (!page1.finishPages()) {
97	return false;	107	return false;
Lines 195-198 Link Here
195	public boolean canFinish() {	205	public boolean canFinish() {
196	return !page1.isCurrentPage() && page1.getNextPage().isPageComplete() && page1.arePagesComplete();	206	return !page1.isCurrentPage() && page1.getNextPage().isPageComplete() && page1.arePagesComplete();
197	}	207	}
		208
		209	/* (non-Javadoc)
		210	* @see org.eclipse.jface.dialogs.IPageChangingListener#handlePageChanging(org.eclipse.jface.dialogs.PageChangingEvent)
		211	*/
		212	public void handlePageChanging(PageChangingEvent event) {
		213	if (event.getCurrentPage() == page3 && event.getTargetPage() instanceof IBundeImportWizardPage) {
		214	IPluginModelBase[] models = getModelsToImport();
		215	page1.configureBundleImportPages(models);
		216	}
		217	}
198	}	218	}