Attachment #129367 for bug #245782




/*******************************************************************************
 * Copyright (c) 2005, 2009 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

 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *     EclipseSource Corporation - ongoing enhancements
 *******************************************************************************/
package org.eclipse.pde.internal.ui.wizards.product;

import java.util.*;
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.*;

import org.eclipse.pde.internal.core.iproduct.*;
import org.eclipse.pde.internal.core.iproduct.IProduct;
import org.eclipse.pde.internal.ui.PDEPlugin;
import org.eclipse.pde.internal.ui.launcher.BundleLauncherHelper;
import org.eclipse.pde.ui.launcher.IPDELauncherConstants;

/**

				product.setJREInfo(jreInfo);
			}

			// fetch the plug-ins models
			String workspaceId = IPDELauncherConstants.SELECTED_WORKSPACE_PLUGINS;
			String targetId = IPDELauncherConstants.SELECTED_TARGET_PLUGINS;
			if (fLaunchConfiguration.getType().getIdentifier().equals(IPDELauncherConstants.OSGI_CONFIGURATION_TYPE)) {
				workspaceId = IPDELauncherConstants.WORKSPACE_BUNDLES;
				targetId = IPDELauncherConstants.TARGET_BUNDLES;
			}
			Set set = new HashSet();
			Map map = BundleLauncherHelper.getWorkspaceBundleMap(fLaunchConfiguration, set, workspaceId);
			map.putAll(BundleLauncherHelper.getTargetBundleMap(fLaunchConfiguration, set, targetId));

			addPlugins(factory, product, map);

			if (fLaunchConfiguration.getAttribute(IPDELauncherConstants.CONFIG_GENERATE_DEFAULT, true)) {
				super.initializeProduct(product);
			} else {

				}
			}
		} catch (CoreException e) {
			PDEPlugin.logException(e);
		}
	}

}




package org.eclipse.pde.internal.ui.wizards.product;

import java.lang.reflect.InvocationTargetException;
import java.util.*;
import java.util.StringTokenizer;
import org.eclipse.core.resources.IFile;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;

		}
	}

	protected void addPlugins(IProductModelFactory factory, IProduct product, Map plugins) {
		IProductPlugin[] pplugins = new IProductPlugin[plugins.size()];
		List configurations = new ArrayList(3);
		IPluginModelBase[] models = (IPluginModelBase[]) plugins.keySet().toArray(new IPluginModelBase[plugins.size()]);
		for (int i = 0; i < models.length; i++) {
			IPluginModelBase model = models[i];

			// create plug-in model
			IProductPlugin pplugin = factory.createPlugin();
			pplugin.setId(model.getPluginBase().getId());
			pplugins[i] = pplugin;

			// create plug-in configuration model
			String sl = (String) plugins.get(model);
			if (!model.isFragmentModel() && !sl.equals("default:default")) { //$NON-NLS-1$
				IPluginConfiguration configuration = factory.createPluginConfiguration();
				configuration.setId(model.getPluginBase().getId());
				// TODO do we want to set the version here?
				String[] slinfo = sl.split(":"); //$NON-NLS-1$
				configuration.setStartLevel(Integer.valueOf(slinfo[0]).intValue());
				configuration.setAutoStart(slinfo[0].equals("true")); //$NON-NLS-1$
				configurations.add(configuration);
			}
		}
		product.addPlugins(pplugins);
		int size = configurations.size();
		if (size > 0)
			product.addPluginConfigurations((IPluginConfiguration[]) configurations.toArray(new IPluginConfiguration[size]));
	}

	protected void addPlugins(IProductModelFactory factory, IProduct product, String[] plugins) {

Lines 1-5 Link Here

(-)src/org/eclipse/pde/internal/ui/wizards/product/ProductFileWizardPage.java (-8 / +24 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2005, 2007 IBM Corporation and others.	2	* Copyright (c) 2005, 2009 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 7-12 Link Here
7	*	7	*
8	* Contributors:	8	* Contributors:
9	* IBM Corporation - initial API and implementation	9	* IBM Corporation - initial API and implementation
		10	* EclipseSource Corporation - ongoing enhancements
10	*******************************************************************************/	11	*******************************************************************************/
11	package org.eclipse.pde.internal.ui.wizards.product;	12	package org.eclipse.pde.internal.ui.wizards.product;
12		13
Lines 20-28 Link Here
20	import org.eclipse.jface.dialogs.Dialog;	21	import org.eclipse.jface.dialogs.Dialog;
21	import org.eclipse.jface.viewers.IStructuredSelection;	22	import org.eclipse.jface.viewers.IStructuredSelection;
22	import org.eclipse.pde.core.plugin.*;	23	import org.eclipse.pde.core.plugin.*;
23	import org.eclipse.pde.internal.ui.IHelpContextIds;	24	import org.eclipse.pde.internal.ui.*;
24	import org.eclipse.pde.internal.ui.PDEUIMessages;
25	import org.eclipse.pde.internal.ui.wizards.PDEWizardNewFileCreationPage;	25	import org.eclipse.pde.internal.ui.wizards.PDEWizardNewFileCreationPage;
		26	import org.eclipse.pde.ui.launcher.EclipseLaunchShortcut;
		27	import org.eclipse.pde.ui.launcher.IPDELauncherConstants;
26	import org.eclipse.swt.SWT;	28	import org.eclipse.swt.SWT;
27	import org.eclipse.swt.events.SelectionAdapter;	29	import org.eclipse.swt.events.SelectionAdapter;
28	import org.eclipse.swt.events.SelectionEvent;	30	import org.eclipse.swt.events.SelectionEvent;
Lines 146-158 Link Here
146	ArrayList list = new ArrayList();	148	ArrayList list = new ArrayList();
147	try {	149	try {
148	ILaunchManager manager = DebugPlugin.getDefault().getLaunchManager();	150	ILaunchManager manager = DebugPlugin.getDefault().getLaunchManager();
149	ILaunchConfigurationType type = manager.getLaunchConfigurationType("org.eclipse.pde.ui.RuntimeWorkbench"); //$NON-NLS-1$	151	ILaunchConfigurationType type = manager.getLaunchConfigurationType(EclipseLaunchShortcut.CONFIGURATION_TYPE);
150	ILaunchConfiguration[] configs = manager.getLaunchConfigurations(type);	152	ILaunchConfiguration[] configs = manager.getLaunchConfigurations(type);
151	for (int i = 0; i < configs.length; i++) {	153	for (int i = 0; i < configs.length; i++) {
152	if (!DebugUITools.isPrivate(configs[i]))	154	if (!DebugUITools.isPrivate(configs[i]))
153	list.add(configs[i].getName());	155	list.add(configs[i].getName());
154	}	156	}
		157	// add osgi launch configs to the list
		158	type = manager.getLaunchConfigurationType(IPDELauncherConstants.OSGI_CONFIGURATION_TYPE);
		159	configs = manager.getLaunchConfigurations(type);
		160	for (int i = 0; i < configs.length; i++) {
		161	if (!DebugUITools.isPrivate(configs[i]))
		162	list.add(configs[i].getName());
		163	}
155	} catch (CoreException e) {	164	} catch (CoreException e) {
		165	PDEPlugin.logException(e);
156	}	166	}
157	return (String[]) list.toArray(new String[list.size()]);	167	return (String[]) list.toArray(new String[list.size()]);
158	}	168	}
Lines 164-176 Link Here
164	String configName = fLaunchConfigCombo.getText();	174	String configName = fLaunchConfigCombo.getText();
165	try {	175	try {
166	ILaunchManager manager = DebugPlugin.getDefault().getLaunchManager();	176	ILaunchManager manager = DebugPlugin.getDefault().getLaunchManager();
167	ILaunchConfigurationType type = manager.getLaunchConfigurationType("org.eclipse.pde.ui.RuntimeWorkbench"); //$NON-NLS-1$	177	ILaunchConfigurationType type = manager.getLaunchConfigurationType(EclipseLaunchShortcut.CONFIGURATION_TYPE);
		178	ILaunchConfigurationType type2 = manager.getLaunchConfigurationType(IPDELauncherConstants.OSGI_CONFIGURATION_TYPE);
168	ILaunchConfiguration[] configs = manager.getLaunchConfigurations(type);	179	ILaunchConfiguration[] configs = manager.getLaunchConfigurations(type);
169	for (int i = 0; i < configs.length; i++) {	180	ILaunchConfiguration[] configs2 = manager.getLaunchConfigurations(type2);
170	if (configs[i].getName().equals(configName) && !DebugUITools.isPrivate(configs[i]))	181	ILaunchConfiguration[] configurations = new ILaunchConfiguration[configs.length + configs2.length];
171	return configs[i];	182	System.arraycopy(configs, 0, configurations, 0, configs.length);
		183	System.arraycopy(configs2, 0, configurations, configs.length, configs2.length);
		184	for (int i = 0; i < configurations.length; i++) {
		185	if (configurations[i].getName().equals(configName) && !DebugUITools.isPrivate(configurations[i]))
		186	return configurations[i];
172	}	187	}
173	} catch (CoreException e) {	188	} catch (CoreException e) {
		189	PDEPlugin.logException(e);
174	}	190	}
175	return null;	191	return null;
176	}	192	}





	private void appendBundle(StringBuffer buffer, IPluginModelBase model) {
		IPluginConfiguration configuration = (IPluginConfiguration) fPluginConfigurations.get(model.getPluginBase().getId());
		String sl = "default"; //$NON-NLS-1$
		String autostart = "default"; //$NON-NLS-1$
		if (configuration != null) {
			sl = Integer.toString(configuration.getStartLevel());
			autostart = Boolean.toString(configuration.isAutoStart());
		}
		String entry = BundleLauncherHelper.writeBundleEntry(model, sl, autostart);
		buffer.append(entry);
		buffer.append(',');
	}

Return to bug 245782

Lines 111-123 Link Here

(-)src/org/eclipse/pde/internal/ui/launcher/LaunchAction.java (-4 / +4 lines)
111		111
112	private void appendBundle(StringBuffer buffer, IPluginModelBase model) {	112	private void appendBundle(StringBuffer buffer, IPluginModelBase model) {
113	IPluginConfiguration configuration = (IPluginConfiguration) fPluginConfigurations.get(model.getPluginBase().getId());	113	IPluginConfiguration configuration = (IPluginConfiguration) fPluginConfigurations.get(model.getPluginBase().getId());
114	int sl = 4;	114	String sl = "default"; //$NON-NLS-1$
115	String autostart = "false"; //$NON-NLS-1$	115	String autostart = "default"; //$NON-NLS-1$
116	if (configuration != null) {	116	if (configuration != null) {
117	sl = configuration.getStartLevel();	117	sl = Integer.toString(configuration.getStartLevel());
118	autostart = Boolean.toString(configuration.isAutoStart());	118	autostart = Boolean.toString(configuration.isAutoStart());
119	}	119	}
120	String entry = BundleLauncherHelper.writeBundleEntry(model, Integer.toString(sl), autostart);	120	String entry = BundleLauncherHelper.writeBundleEntry(model, sl, autostart);
121	buffer.append(entry);	121	buffer.append(entry);
122	buffer.append(',');	122	buffer.append(',');
123	}	123	}