Attachment #77737 for bug #170941

Lines 183-189 Link Here

(-)src/org/eclipse/pde/ui/launcher/MainTab.java (-1 / +4 lines)
183	* @see org.eclipse.pde.ui.launcher.AbstractLauncherTab#validateTab()	183	* @see org.eclipse.pde.ui.launcher.AbstractLauncherTab#validateTab()
184	*/	184	*/
185	public void validateTab() {	185	public void validateTab() {
186	setErrorMessage(fDataBlock.validate());	186	String error = fDataBlock.validate();
		187	if (error == null)
		188	error = fJreBlock.validate();
		189	setErrorMessage(error);
187	}	190	}
188		191
189	}	192	}

Lines 73-78 Link Here

(-)src/org/eclipse/pde/ui/launcher/IPDELauncherConstants.java (+12 lines)
73	String APP_TO_TEST = "testApplication"; //$NON-NLS-1$	73	String APP_TO_TEST = "testApplication"; //$NON-NLS-1$
74		74
75	/**	75	/**
		76	* Indicates whether the <code>VMINSTALL</code> or the <code>EXECUTION_ENVIRONMENT</code>
		77	* setting should be used to launch.
		78	*/
		79	String VM_OR_EE = "vmOrEe"; //$NON-NLS-1$
		80
		81	/**
76	* Launch configuration attribute key. The value is a string specifying	82	* Launch configuration attribute key. The value is a string specifying
77	* the name of the VM to launch with. If the value is <code>null</code>,	83	* the name of the VM to launch with. If the value is <code>null</code>,
78	* the default workspace VM is used.	84	* the default workspace VM is used.
Lines 81-86 Link Here
81		87
82	/**	88	/**
83	* Launch configuration attribute key. The value is a string specifying	89	* Launch configuration attribute key. The value is a string specifying
		90	* the name of the EE to launch with.
		91	*/
		92	String EXECUTION_ENVIRONMENT = "execEnvironment"; //$NON-NLS-1$
		93
		94	/**
		95	* Launch configuration attribute key. The value is a string specifying
84	* the user-entered bootstrap classpath entries.	96	* the user-entered bootstrap classpath entries.
85	*/	97	*/
86	String BOOTSTRAP_ENTRIES = "bootstrap"; //$NON-NLS-1$	98	String BOOTSTRAP_ENTRIES = "bootstrap"; //$NON-NLS-1$




	public static IVMInstall createLauncher(
			ILaunchConfiguration configuration)
	throws CoreException {
		boolean vmSelected = configuration.getAttribute(IPDELauncherConstants.VM_OR_EE, "vm").equals("vm"); //$NON-NLS-1$ //$NON-NLS-2$
		String vm;
		if (vmSelected)
			vm = configuration.getAttribute(IPDELauncherConstants.VMINSTALL, (String) null);
		else {
			String id = configuration.getAttribute(IPDELauncherConstants.EXECUTION_ENVIRONMENT, (String)null);
			if (id != null) {
				IExecutionEnvironment ee = getExecutionEnvironment(id);
				if (ee == null)
					throw new CoreException(
						LauncherUtils.createErrorStatus(NLS.bind(PDEUIMessages.VMHelper_cannotFindExecEnv, id)));
				vm = getVMInstallName(ee);
			}
			else
				vm = getDefaultVMInstallName();
		}
		IVMInstall launcher = getVMInstall(vm);
		if (launcher == null) 
			throw new CoreException(

		return manager.getExecutionEnvironments();
	}

	public static IExecutionEnvironment getExecutionEnvironment(String id) {
		IExecutionEnvironmentsManager manager = 
			JavaRuntime.getExecutionEnvironmentsManager();
		return manager.getEnvironment(id);
	}

	public static String getVMInstallName(IExecutionEnvironment ee) throws CoreException {
		IVMInstall vmi = ee.getDefaultVM();
		if (vmi == null) {
			IVMInstall[] vmis = ee.getCompatibleVMs();
			for (int i = 0; i < vmis.length; i++) {
				if (ee.isStrictlyCompatible(vmis[i])) {
					vmi = vmis[i];
					break;
				}
				if (vmi == null)
					vmi = vmis[i];
			}
			if (vmi == null)
				throw new CoreException(
					LauncherUtils.createErrorStatus(NLS.bind(PDEUIMessages.VMHelper_noJreForExecEnv, ee.getId())));
		}
		return vmi.getName();
	}
}

Lines 17-22 Link Here

(-)src/org/eclipse/pde/internal/ui/launcher/JREBlock.java (-31 / +136 lines)
17	import org.eclipse.debug.core.ILaunchConfiguration;	17	import org.eclipse.debug.core.ILaunchConfiguration;
18	import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;	18	import org.eclipse.debug.core.ILaunchConfigurationWorkingCopy;
19	import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;	19	import org.eclipse.jdt.launching.IJavaLaunchConfigurationConstants;
		20	import org.eclipse.jdt.launching.environments.IExecutionEnvironment;
		21	import org.eclipse.osgi.util.NLS;
20	import org.eclipse.pde.internal.ui.PDEUIMessages;	22	import org.eclipse.pde.internal.ui.PDEUIMessages;
21	import org.eclipse.pde.internal.ui.preferences.PDEPreferencesUtil;	23	import org.eclipse.pde.internal.ui.preferences.PDEPreferencesUtil;
22	import org.eclipse.pde.internal.ui.util.SWTUtil;	24	import org.eclipse.pde.internal.ui.util.SWTUtil;
Lines 42-53 Link Here
42	private Listener fListener = new Listener();	44	private Listener fListener = new Listener();
43	private Button fJavawButton;	45	private Button fJavawButton;
44	private Button fJavaButton;	46	private Button fJavaButton;
		47	private Button fJreButton;
		48	private Button fEeButton;
		49	private Button fJrePrefButton;
		50	private Button fEePrefButton;
45	private Combo fJreCombo;	51	private Combo fJreCombo;
		52	private Combo fEeCombo;
46	private Text fBootstrap;	53	private Text fBootstrap;
47		54
48	class Listener extends SelectionAdapter implements ModifyListener {	55	class Listener extends SelectionAdapter implements ModifyListener {
49	public void widgetSelected(SelectionEvent e) {	56	public void widgetSelected(SelectionEvent e) {
50	fTab.updateLaunchConfigurationDialog();	57	fTab.updateLaunchConfigurationDialog();
		58	updateJREEnablement();
51	}	59	}
52	public void modifyText(ModifyEvent e) {	60	public void modifyText(ModifyEvent e) {
53	fTab.updateLaunchConfigurationDialog();	61	fTab.updateLaunchConfigurationDialog();
Lines 62-68 Link Here
62	Group group = new Group(parent, SWT.NONE);	70	Group group = new Group(parent, SWT.NONE);
63	group.setText(PDEUIMessages.MainTab_jreSection);	71	group.setText(PDEUIMessages.MainTab_jreSection);
64	GridLayout layout = new GridLayout();	72	GridLayout layout = new GridLayout();
65	layout.numColumns = 2;	73	layout.numColumns = 3;
66	group.setLayout(layout);	74	group.setLayout(layout);
67	group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));	75	group.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
68		76
Lines 72-96 Link Here
72	}	80	}
73		81
74	protected void createJRESection(Composite parent) {	82	protected void createJRESection(Composite parent) {
75	Label label = new Label(parent, SWT.NONE);	83	fJreButton = new Button(parent, SWT.RADIO);
76	label.setText(PDEUIMessages.BasicLauncherTab_jre);	84	fJreButton.setText(PDEUIMessages.BasicLauncherTab_jre);
77		85	fJreButton.addSelectionListener(fListener);
78	Composite composite = new Composite(parent, SWT.NONE);
79	GridLayout layout = new GridLayout();
80	layout.numColumns = 2;
81	layout.marginHeight = layout.marginWidth = 0;
82	composite.setLayout(layout);
83	composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
84		86
85	fJreCombo = new Combo(composite, SWT.DROP_DOWN \| SWT.READ_ONLY);	87	fJreCombo = new Combo(parent, SWT.DROP_DOWN \| SWT.READ_ONLY);
86	fJreCombo.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));	88	fJreCombo.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
87	fJreCombo.addSelectionListener(fListener);	89	fJreCombo.addSelectionListener(fListener);
88		90
89	Button button = new Button(composite, SWT.PUSH);	91	fJrePrefButton = new Button(parent, SWT.PUSH);
90	button.setText(PDEUIMessages.BasicLauncherTab_installedJREs);	92	fJrePrefButton.setText(PDEUIMessages.BasicLauncherTab_installedJREs);
91	button.addSelectionListener(new SelectionAdapter() {	93	fJrePrefButton.addSelectionListener(new SelectionAdapter() {
92	public void widgetSelected(SelectionEvent e) {	94	public void widgetSelected(SelectionEvent e) {
93	String currentVM = fJreCombo.getText();	95	String currentVM = fJreCombo.getText();
		96	String currentEE = parseEESelection(fEeCombo.getText());
94	boolean useDefault = VMHelper.getDefaultVMInstallName().equals(currentVM);	97	boolean useDefault = VMHelper.getDefaultVMInstallName().equals(currentVM);
95	String[] pageIDs = new String[] {"org.eclipse.jdt.debug.ui.preferences.VMPreferencePage"}; //$NON-NLS-1$	98	String[] pageIDs = new String[] {"org.eclipse.jdt.debug.ui.preferences.VMPreferencePage"}; //$NON-NLS-1$
96	if (PDEPreferencesUtil.showPreferencePage(pageIDs, fTab.getControl().getShell())) {	99	if (PDEPreferencesUtil.showPreferencePage(pageIDs, fTab.getControl().getShell())) {
Lines 99-109 Link Here
99	fJreCombo.setText(VMHelper.getDefaultVMInstallName());	102	fJreCombo.setText(VMHelper.getDefaultVMInstallName());
100	else	103	else
101	fJreCombo.setText(currentVM);	104	fJreCombo.setText(currentVM);
		105	setEECombo();
		106	setEEComboSelection(currentEE);
102	}	107	}
103	}	108	}
104	});	109	});
105	button.setLayoutData(new GridData(GridData.HORIZONTAL_ALIGN_END));	110	fJrePrefButton.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));
106	SWTUtil.setButtonDimensionHint(button);	111	SWTUtil.setButtonDimensionHint(fJrePrefButton);
		112
		113	fEeButton = new Button(parent, SWT.RADIO);
		114	fEeButton.setText(PDEUIMessages.BasicLauncherTab_ee);
		115	fEeButton.addSelectionListener(fListener);
		116
		117	fEeCombo = new Combo(parent, SWT.DROP_DOWN \| SWT.READ_ONLY);
		118	fEeCombo.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, false));
		119	fEeCombo.addSelectionListener(fListener);
		120
		121	fEePrefButton = new Button(parent, SWT.PUSH);
		122	fEePrefButton.setText(PDEUIMessages.BasicLauncherTab_environments);
		123	fEePrefButton.addSelectionListener(new SelectionAdapter() {
		124	public void widgetSelected(SelectionEvent e) {
		125	String currentEE = parseEESelection(fEeCombo.getText());
		126	String[] pageIDs = new String[] {"org.eclipse.jdt.debug.ui.jreProfiles"}; //$NON-NLS-1$
		127	if (PDEPreferencesUtil.showPreferencePage(pageIDs, fTab.getControl().getShell())) {
		128	setEECombo();
		129	setEEComboSelection(currentEE);
		130	}
		131	}
		132	});
		133	fEePrefButton.setLayoutData(new GridData(SWT.FILL, SWT.FILL, false, false));
		134	SWTUtil.setButtonDimensionHint(fEePrefButton);
107	}	135	}
108		136
109	protected void createJavaExecutableSection(Composite parent) {	137	protected void createJavaExecutableSection(Composite parent) {
Lines 116-122 Link Here
116	layout.marginHeight = layout.marginWidth = 0;	144	layout.marginHeight = layout.marginWidth = 0;
117	layout.horizontalSpacing = 20;	145	layout.horizontalSpacing = 20;
118	composite.setLayout(layout);	146	composite.setLayout(layout);
119	composite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));	147	GridData gd = new GridData(GridData.FILL_HORIZONTAL);
		148	gd.horizontalSpan = 2;
		149	composite.setLayoutData(gd);
120		150
121	fJavawButton = new Button(composite, SWT.RADIO);	151	fJavawButton = new Button(composite, SWT.RADIO);
122	fJavawButton.setText(PDEUIMessages.BasicLauncherTab_javaExecDefault); //	152	fJavawButton.setText(PDEUIMessages.BasicLauncherTab_javaExecDefault); //
Lines 134-139 Link Here
134	fBootstrap = new Text(parent, SWT.BORDER);	164	fBootstrap = new Text(parent, SWT.BORDER);
135	GridData gd = new GridData(GridData.FILL_HORIZONTAL);	165	GridData gd = new GridData(GridData.FILL_HORIZONTAL);
136	gd.widthHint = 300;	166	gd.widthHint = 300;
		167	gd.horizontalSpan = 2;
137	fBootstrap.setLayoutData(gd);	168	fBootstrap.setLayoutData(gd);
138	fBootstrap.addModifyListener(fListener);	169	fBootstrap.addModifyListener(fListener);
139	}	170	}
Lines 142-159 Link Here
142	initializeJRESection(config);	173	initializeJRESection(config);
143	initializeBootstrapEntriesSection(config);	174	initializeBootstrapEntriesSection(config);
144	}	175	}
145		176
146	private void initializeJRESection(ILaunchConfiguration config) throws CoreException {	177	private void initializeJRESection(ILaunchConfiguration config) throws CoreException {
147	String javaCommand = config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_JAVA_COMMAND, "javaw"); //$NON-NLS-1$	178	String javaCommand = config.getAttribute(IJavaLaunchConfigurationConstants.ATTR_JAVA_COMMAND, "javaw"); //$NON-NLS-1$
148	fJavawButton.setSelection(javaCommand.equals("javaw")); //$NON-NLS-1$	179	fJavawButton.setSelection(javaCommand.equals("javaw")); //$NON-NLS-1$
149	fJavaButton.setSelection(!fJavawButton.getSelection());	180	fJavaButton.setSelection(!fJavawButton.getSelection());
150		181
		182	String vmEe = config.getAttribute(IPDELauncherConstants.VM_OR_EE, "vm"); //$NON-NLS-1$
		183	fJreButton.setSelection(vmEe.equals("vm")); //$NON-NLS-1$
		184	fEeButton.setSelection(!fJreButton.getSelection());
		185
151	setJRECombo();	186	setJRECombo();
152	String vmInstallName =	187	String vmInstallName =
153	config.getAttribute(IPDELauncherConstants.VMINSTALL, VMHelper.getDefaultVMInstallName());	188	config.getAttribute(IPDELauncherConstants.VMINSTALL, VMHelper.getDefaultVMInstallName());
154	fJreCombo.setText(vmInstallName);	189	fJreCombo.setText(vmInstallName);
155	if (fJreCombo.getSelectionIndex() == -1)	190	if (fJreCombo.getSelectionIndex() == -1)
156	fJreCombo.setText(VMHelper.getDefaultVMInstallName());	191	fJreCombo.setText(VMHelper.getDefaultVMInstallName());
		192
		193	setEECombo();
		194	String eeId =
		195	config.getAttribute(IPDELauncherConstants.EXECUTION_ENVIRONMENT, (String) null);
		196	setEEComboSelection(eeId);
		197
		198	updateJREEnablement();
		199	}
		200
		201	private void setEEComboSelection (String eeId) {
		202	if (eeId != null) {
		203	String[] items = fEeCombo.getItems();
		204	for (int i = 0; i < items.length; i++) {
		205	if (parseEESelection(items[i]).equals(eeId)) {
		206	fEeCombo.select(i);
		207	break;
		208	}
		209	}
		210	}
		211	if (fEeCombo.getItemCount() > 0 && fEeCombo.getSelectionIndex() == -1)
		212	fEeCombo.select(0);
		213	}
		214
		215	private void updateJREEnablement() {
		216	fJreCombo.setEnabled(fJreButton.getSelection());
		217	fJrePrefButton.setEnabled(fJreButton.getSelection());
		218	fEeCombo.setEnabled(fEeButton.getSelection());
		219	fEePrefButton.setEnabled(fEeButton.getSelection());
157	}	220	}
158		221
159	private void initializeBootstrapEntriesSection(ILaunchConfiguration config) throws CoreException {	222	private void initializeBootstrapEntriesSection(ILaunchConfiguration config) throws CoreException {
Lines 170-185 Link Here
170	String javaCommand = fJavawButton.getSelection() ? null : "java"; //$NON-NLS-1$	233	String javaCommand = fJavawButton.getSelection() ? null : "java"; //$NON-NLS-1$
171	config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_JAVA_COMMAND, javaCommand);	234	config.setAttribute(IJavaLaunchConfigurationConstants.ATTR_JAVA_COMMAND, javaCommand);
172		235
173	if (fJreCombo.getSelectionIndex() == -1)	236	String vmEe = fJreButton.getSelection() ? "vm" : "ee"; //$NON-NLS-1$ //$NON-NLS-2$
174	return;	237	config.setAttribute(IPDELauncherConstants.VM_OR_EE, vmEe);
175		238	if (fJreButton.getSelection()) {
176	String jre = fJreCombo.getText();	239	if (fJreCombo.getSelectionIndex() == -1)
177	if (config.getAttribute(IPDELauncherConstants.VMINSTALL, (String) null) != null) {	240	return;
178	config.setAttribute(IPDELauncherConstants.VMINSTALL, jre);	241
		242	String jre = fJreCombo.getText();
		243	if (config.getAttribute(IPDELauncherConstants.VMINSTALL, (String) null) != null) {
		244	config.setAttribute(IPDELauncherConstants.VMINSTALL, jre);
		245	} else {
		246	config.setAttribute(
		247	IPDELauncherConstants.VMINSTALL,
		248	jre.equals(VMHelper.getDefaultVMInstallName()) ? null : jre);
		249	}
179	} else {	250	} else {
180	config.setAttribute(	251	if (fEeCombo.getSelectionIndex() == -1)
181	IPDELauncherConstants.VMINSTALL,	252	return;
182	jre.equals(VMHelper.getDefaultVMInstallName()) ? null : jre);	253
		254	config.setAttribute(IPDELauncherConstants.EXECUTION_ENVIRONMENT, parseEESelection(fEeCombo.getText()));
183	}	255	}
184	} catch (CoreException e) {	256	} catch (CoreException e) {
185	}	257	}
Lines 195-205 Link Here
195		267
196	private void setJRECombo() {	268	private void setJRECombo() {
197	String[] jres = VMHelper.getVMInstallNames();	269	String[] jres = VMHelper.getVMInstallNames();
198	Arrays.sort(jres, new Comparator() {	270	Arrays.sort(jres, getComparator());
		271	fJreCombo.setItems(jres);
		272	}
		273
		274	private void setEECombo() {
		275	IExecutionEnvironment[] eeObjects = VMHelper.getExecutionEnvironments();
		276	String[] ees = new String[eeObjects.length];
		277	for (int i = 0; i < eeObjects.length; i++) {
		278	String vm;
		279	try {
		280	vm = VMHelper.getVMInstallName(eeObjects[i]);
		281	} catch (CoreException e) {
		282	vm = PDEUIMessages.BasicLauncherTab_unbound;
		283	}
		284	ees[i] = NLS.bind(PDEUIMessages.BasicLauncherTab_2, new String[] { eeObjects[i].getId(), vm });
		285	}
		286	Arrays.sort(ees, getComparator());
		287	fEeCombo.setItems(ees);
		288	}
		289
		290	private Comparator getComparator() {
		291	return new Comparator() {
199	public int compare(Object arg0, Object arg1) {	292	public int compare(Object arg0, Object arg1) {
200	return arg0.toString().compareTo(arg1.toString());	293	return arg0.toString().compareTo(arg1.toString());
201	}	294	}
202	});	295	};
203	fJreCombo.setItems(jres);	296	}
		297
		298	public String validate() {
		299	if (fEeButton.getSelection() && fEeCombo.getText().indexOf(PDEUIMessages.BasicLauncherTab_unbound) != -1)
		300	return NLS.bind(PDEUIMessages.BasicLauncherTab_noJreForEeMessage, parseEESelection(fEeCombo.getText()));
		301	return null;
		302	}
		303
		304	private String parseEESelection (String selection) {
		305	int index = selection.indexOf(" ("); //$NON-NLS-1$
		306	if (index == -1)
		307	return selection;
		308	return selection.substring(0, index);
204	}	309	}
205	}	310	}

Lines 444-453 Link Here

(-)src/org/eclipse/pde/internal/ui/pderesources.properties (+7 lines)
444	ProgramBlock_programToRun=Program to Run	444	ProgramBlock_programToRun=Program to Run
445	ProgramBlock_runApplication=Run an &application:	445	ProgramBlock_runApplication=Run an &application:
446	BasicLauncherTab_javaExec=Java Executable:	446	BasicLauncherTab_javaExec=Java Executable:
		447	BasicLauncherTab_unbound=unbound
		448	BasicLauncherTab_2={0} ({1})
		449	BasicLauncherTab_ee=E&xecution Environment:
447	BasicLauncherTab_jre =Runtim&e JRE:	450	BasicLauncherTab_jre =Runtim&e JRE:
		451	BasicLauncherTab_environments=En&vironments...
448	BasicLauncherTab_installedJREs = In&stalled JREs...	452	BasicLauncherTab_installedJREs = In&stalled JREs...
449	BasicLauncherTab_bootstrap=B&ootstrap Entries:	453	BasicLauncherTab_bootstrap=B&ootstrap Entries:
450	BasicLauncherTab_javaExecDefault=defa&ult	454	BasicLauncherTab_javaExecDefault=defa&ult
		455	BasicLauncherTab_noJreForEeMessage=No JREs in workspace compatible with specified execution environment: {0}
451	JUnitProgramBlock_headless=[No Application] - Headless Mode	456	JUnitProgramBlock_headless=[No Application] - Headless Mode
452		457
453	AdvancedLauncherTab_name = Plu&g-ins	458	AdvancedLauncherTab_name = Plu&g-ins
Lines 2370-2375 Link Here
2370	StateViewPage_showLeaves=Show leaf plug-ins	2375	StateViewPage_showLeaves=Show leaf plug-ins
2371	StateViewPage_openItem=Open	2376	StateViewPage_openItem=Open
2372	StateViewPage_focusOnTitle=Focus On	2377	StateViewPage_focusOnTitle=Focus On
		2378	VMHelper_cannotFindExecEnv=Cannot locate Execution Environment definition: "{0}". Launch aborted.
		2379	VMHelper_noJreForExecEnv=No installed JREs satisfy this Execution Environment: "{0}". Launch aborted.
2373	StateViewPage_title=Current PDE State Environment	2380	StateViewPage_title=Current PDE State Environment
2374	StateViewPage_showOnlyUnresolved_label=Show only unresolved plug-ins	2381	StateViewPage_showOnlyUnresolved_label=Show only unresolved plug-ins
2375	StateViewPage_focusActionDescription=Focus on selected item	2382	StateViewPage_focusActionDescription=Focus on selected item

Return to bug 170941

Lines 80-86 Link Here

(-)src/org/eclipse/pde/internal/ui/launcher/VMHelper.java (-1 / +40 lines)
80	public static IVMInstall createLauncher(	80	public static IVMInstall createLauncher(
81	ILaunchConfiguration configuration)	81	ILaunchConfiguration configuration)
82	throws CoreException {	82	throws CoreException {
83	String vm = configuration.getAttribute(IPDELauncherConstants.VMINSTALL, (String) null);	83	boolean vmSelected = configuration.getAttribute(IPDELauncherConstants.VM_OR_EE, "vm").equals("vm"); //$NON-NLS-1$ //$NON-NLS-2$
		84	String vm;
		85	if (vmSelected)
		86	vm = configuration.getAttribute(IPDELauncherConstants.VMINSTALL, (String) null);
		87	else {
		88	String id = configuration.getAttribute(IPDELauncherConstants.EXECUTION_ENVIRONMENT, (String)null);
		89	if (id != null) {
		90	IExecutionEnvironment ee = getExecutionEnvironment(id);
		91	if (ee == null)
		92	throw new CoreException(
		93	LauncherUtils.createErrorStatus(NLS.bind(PDEUIMessages.VMHelper_cannotFindExecEnv, id)));
		94	vm = getVMInstallName(ee);
		95	}
		96	else
		97	vm = getDefaultVMInstallName();
		98	}
84	IVMInstall launcher = getVMInstall(vm);	99	IVMInstall launcher = getVMInstall(vm);
85	if (launcher == null)	100	if (launcher == null)
86	throw new CoreException(	101	throw new CoreException(
Lines 99-102 Link Here
99	return manager.getExecutionEnvironments();	114	return manager.getExecutionEnvironments();
100	}	115	}
101		116
		117	public static IExecutionEnvironment getExecutionEnvironment(String id) {
		118	IExecutionEnvironmentsManager manager =
		119	JavaRuntime.getExecutionEnvironmentsManager();
		120	return manager.getEnvironment(id);
		121	}
		122
		123	public static String getVMInstallName(IExecutionEnvironment ee) throws CoreException {
		124	IVMInstall vmi = ee.getDefaultVM();
		125	if (vmi == null) {
		126	IVMInstall[] vmis = ee.getCompatibleVMs();
		127	for (int i = 0; i < vmis.length; i++) {
		128	if (ee.isStrictlyCompatible(vmis[i])) {
		129	vmi = vmis[i];
		130	break;
		131	}
		132	if (vmi == null)
		133	vmi = vmis[i];
		134	}
		135	if (vmi == null)
		136	throw new CoreException(
		137	LauncherUtils.createErrorStatus(NLS.bind(PDEUIMessages.VMHelper_noJreForExecEnv, ee.getId())));
		138	}
		139	return vmi.getName();
		140	}
102	}	141	}

Lines 1091-1102 Link Here

(-)src/org/eclipse/pde/internal/ui/PDEUIMessages.java (+14 lines)
1091	public static String WorkspaceDataBlock_clearLog;	1091	public static String WorkspaceDataBlock_clearLog;
1092	public static String WorkspaceDataBlock_clearWorkspace;	1092	public static String WorkspaceDataBlock_clearWorkspace;
1093	public static String BasicLauncherTab_javaExec;	1093	public static String BasicLauncherTab_javaExec;
		1094
		1095	public static String BasicLauncherTab_unbound;
1094	public static String ProgramBlock_runProduct;	1096	public static String ProgramBlock_runProduct;
		1097
		1098	public static String BasicLauncherTab_2;
		1099
		1100	public static String BasicLauncherTab_ee;
1095	public static String BasicLauncherTab_jre;	1101	public static String BasicLauncherTab_jre;
		1102
		1103	public static String BasicLauncherTab_environments;
1096	public static String BasicLauncherTab_installedJREs;	1104	public static String BasicLauncherTab_installedJREs;
1097	public static String ProgramBlock_programToRun;	1105	public static String ProgramBlock_programToRun;
1098	public static String BasicLauncherTab_bootstrap;	1106	public static String BasicLauncherTab_bootstrap;
1099	public static String BasicLauncherTab_javaExecDefault;	1107	public static String BasicLauncherTab_javaExecDefault;
		1108
		1109	public static String BasicLauncherTab_noJreForEeMessage;
1100	public static String ProgramBlock_runApplication;	1110	public static String ProgramBlock_runApplication;
1101	public static String JUnitProgramBlock_headless;	1111	public static String JUnitProgramBlock_headless;
1102		1112
Lines 2968-2973 Link Here
2968	public static String HyperlinkActionOpenDescription;	2978	public static String HyperlinkActionOpenDescription;
2969	public static String HyperlinkActionOpenBundle;	2979	public static String HyperlinkActionOpenBundle;
2970	public static String HyperlinkActionOpenPackage;	2980	public static String HyperlinkActionOpenPackage;
		2981
		2982	public static String VMHelper_cannotFindExecEnv;
		2983
		2984	public static String VMHelper_noJreForExecEnv;
2971	public static String HyperlinkActionOpenResource;	2985	public static String HyperlinkActionOpenResource;
2972	public static String HyperlinkActionOpenSchema;	2986	public static String HyperlinkActionOpenSchema;
2973	public static String HyperlinkActionOpenTranslation;	2987	public static String HyperlinkActionOpenTranslation;