Attachment 82726 Details for Bug 209594 – org.eclipse.pde.patch

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

[patch] org.eclipse.pde.patch

clipboard.txt (text/plain), 2.74 KB, created by Chris Aniszczyk

on 2007-11-13 00:11:02 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Aniszczyk

Created: 2007-11-13 00:11:02 EST

Size: 2.74 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.core
>Index: src/org/eclipse/pde/internal/core/builders/BundleErrorReporter.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/builders/BundleErrorReporter.java,v
>retrieving revision 1.53
>diff -u -r1.53 BundleErrorReporter.java
>--- src/org/eclipse/pde/internal/core/builders/BundleErrorReporter.java	23 Oct 2007 19:01:52 -0000	1.53
>+++ src/org/eclipse/pde/internal/core/builders/BundleErrorReporter.java	13 Nov 2007 05:09:52 -0000
>@@ -367,9 +367,15 @@
> 		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);
>#P org.eclipse.pde.ui
>Index: src/org/eclipse/pde/internal/ui/wizards/plugin/NewProjectCreationPage.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/plugin/NewProjectCreationPage.java,v
>retrieving revision 1.41
>diff -u -r1.41 NewProjectCreationPage.java
>--- src/org/eclipse/pde/internal/ui/wizards/plugin/NewProjectCreationPage.java	28 Sep 2007 21:01:35 -0000	1.41
>+++ src/org/eclipse/pde/internal/ui/wizards/plugin/NewProjectCreationPage.java	13 Nov 2007 05:09:53 -0000
>@@ -171,6 +171,7 @@
> 				fSourceText.setEnabled(enabled);
> 				fOutputlabel.setEnabled(enabled);
> 				fOutputText.setEnabled(enabled);
>+				updateExecEnvSection();
> 				setPageComplete(validatePage());
> 			}
> 		});
>@@ -252,7 +253,7 @@
> 	}
> 	
> 	private void updateExecEnvSection() {
>-		if (fTargetCombo.getText().equals(ICoreConstants.TARGET30)){
>+		if (fTargetCombo.getText().equals(ICoreConstants.TARGET30) || !fJavaButton.getSelection()){
> 			fEEChoice.setEnabled(false);
> 			fExeEnvButton.setEnabled(false);
> 		} else {
>@@ -307,7 +308,8 @@
> 		fData.setHasBundleStructure(fOSGIButton.getSelection() || Double.parseDouble(fTargetCombo.getText()) >= 3.1);	
> 		fData.setOSGiFramework(fOSGIButton.getSelection() ? fOSGiCombo.getText() : null);
> 		fData.setWorkingSets(getSelectedWorkingSets());
>-		fData.setExecutionEnvironment(fEEChoice.getText().trim());
>+		if(fJavaButton.getSelection())
>+			fData.setExecutionEnvironment(fEEChoice.getText().trim());
> 	}
> 	
>     protected boolean validatePage() {

Actions: View | Diff

Attachments on bug 209594: 82725 | 82726 | 82727