Attachment #82726 for bug #209594

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

View | Details | Raw Unified | Return to bug 209594
Collapse All | Expand All




		BundleDescription desc = fModel.getBundleDescription();
		if (desc == null)
			return;
		
		// if we aren't a java project, let's not check for a BREE
		try {
			if(!fProject.hasNature(JavaCore.NATURE_ID))
				return;
		} catch (CoreException e) {}
		
		String[] bundleEnvs = desc.getExecutionEnvironments();
		if (bundleEnvs == null || bundleEnvs.length == 0) {

			// No EE specified
			report(PDECoreMessages.BundleErrorReporter_noExecutionEnvironmentSet, 1, sev,
					PDEMarkerFactory.M_EXECUTION_ENVIRONMENT_NOT_SET, PDEMarkerFactory.CAT_EE);




				fSourceText.setEnabled(enabled);
				fOutputlabel.setEnabled(enabled);
				fOutputText.setEnabled(enabled);
				updateExecEnvSection();
				setPageComplete(validatePage());
			}
		});

	}
	
	private void updateExecEnvSection() {
		if (fTargetCombo.getText().equals(ICoreConstants.TARGET30) || !fJavaButton.getSelection()){
			fEEChoice.setEnabled(false);
			fExeEnvButton.setEnabled(false);
		} else {

		fData.setHasBundleStructure(fOSGIButton.getSelection() || Double.parseDouble(fTargetCombo.getText()) >= 3.1);	
		fData.setOSGiFramework(fOSGIButton.getSelection() ? fOSGiCombo.getText() : null);
		fData.setWorkingSets(getSelectedWorkingSets());
		if(fJavaButton.getSelection())
			fData.setExecutionEnvironment(fEEChoice.getText().trim());
	}
	
    protected boolean validatePage() {

Return to bug 209594

Lines 367-375 Link Here

(-)src/org/eclipse/pde/internal/core/builders/BundleErrorReporter.java (-1 / +7 lines)
367	BundleDescription desc = fModel.getBundleDescription();	367	BundleDescription desc = fModel.getBundleDescription();
368	if (desc == null)	368	if (desc == null)
369	return;	369	return;
		370
		371	// if we aren't a java project, let's not check for a BREE
		372	try {
		373	if(!fProject.hasNature(JavaCore.NATURE_ID))
		374	return;
		375	} catch (CoreException e) {}
		376
370	String[] bundleEnvs = desc.getExecutionEnvironments();	377	String[] bundleEnvs = desc.getExecutionEnvironments();
371	if (bundleEnvs == null \|\| bundleEnvs.length == 0) {	378	if (bundleEnvs == null \|\| bundleEnvs.length == 0) {
372
373	// No EE specified	379	// No EE specified
374	report(PDECoreMessages.BundleErrorReporter_noExecutionEnvironmentSet, 1, sev,	380	report(PDECoreMessages.BundleErrorReporter_noExecutionEnvironmentSet, 1, sev,
375	PDEMarkerFactory.M_EXECUTION_ENVIRONMENT_NOT_SET, PDEMarkerFactory.CAT_EE);	381	PDEMarkerFactory.M_EXECUTION_ENVIRONMENT_NOT_SET, PDEMarkerFactory.CAT_EE);

Lines 171-176 Link Here

(-)src/org/eclipse/pde/internal/ui/wizards/plugin/NewProjectCreationPage.java (-2 / +4 lines)
171	fSourceText.setEnabled(enabled);	171	fSourceText.setEnabled(enabled);
172	fOutputlabel.setEnabled(enabled);	172	fOutputlabel.setEnabled(enabled);
173	fOutputText.setEnabled(enabled);	173	fOutputText.setEnabled(enabled);
		174	updateExecEnvSection();
174	setPageComplete(validatePage());	175	setPageComplete(validatePage());
175	}	176	}
176	});	177	});
Lines 252-258 Link Here
252	}	253	}
253		254
254	private void updateExecEnvSection() {	255	private void updateExecEnvSection() {
255	if (fTargetCombo.getText().equals(ICoreConstants.TARGET30)){	256	if (fTargetCombo.getText().equals(ICoreConstants.TARGET30) \|\| !fJavaButton.getSelection()){
256	fEEChoice.setEnabled(false);	257	fEEChoice.setEnabled(false);
257	fExeEnvButton.setEnabled(false);	258	fExeEnvButton.setEnabled(false);
258	} else {	259	} else {
Lines 307-313 Link Here
307	fData.setHasBundleStructure(fOSGIButton.getSelection() \|\| Double.parseDouble(fTargetCombo.getText()) >= 3.1);	308	fData.setHasBundleStructure(fOSGIButton.getSelection() \|\| Double.parseDouble(fTargetCombo.getText()) >= 3.1);
308	fData.setOSGiFramework(fOSGIButton.getSelection() ? fOSGiCombo.getText() : null);	309	fData.setOSGiFramework(fOSGIButton.getSelection() ? fOSGiCombo.getText() : null);
309	fData.setWorkingSets(getSelectedWorkingSets());	310	fData.setWorkingSets(getSelectedWorkingSets());
310	fData.setExecutionEnvironment(fEEChoice.getText().trim());	311	if(fJavaButton.getSelection())
		312	fData.setExecutionEnvironment(fEEChoice.getText().trim());
311	}	313	}
312		314
313	protected boolean validatePage() {	315	protected boolean validatePage() {