Attachment 168987 Details for Bug 313409 – patch

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

[patch] patch

313409.txt (text/plain), 2.31 KB, created by Andrew Niefer

on 2010-05-18 14:07:14 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Niefer

Created: 2010-05-18 14:07:14 EDT

Size: 2.31 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.core
>Index: src/org/eclipse/pde/internal/core/target/IUBundleContainer.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/target/IUBundleContainer.java,v
>retrieving revision 1.23
>diff -u -r1.23 IUBundleContainer.java
>--- src/org/eclipse/pde/internal/core/target/IUBundleContainer.java	5 May 2010 16:13:43 -0000	1.23
>+++ src/org/eclipse/pde/internal/core/target/IUBundleContainer.java	18 May 2010 18:06:43 -0000
>@@ -414,9 +414,11 @@
> 			slicer = new PermissiveSlicer(allMetadata, props, true, false, false, true, false);
> 		}
> 		IQueryable slice = slicer.slice(units, new SubProgressMonitor(subMonitor, 10));
>-		IQueryResult queryResult = slice.query(QueryUtil.createIUAnyQuery(), new SubProgressMonitor(subMonitor, 10));
>+		IQueryResult queryResult = null;
>+		if (slice != null)
>+			queryResult = slice.query(QueryUtil.createIUAnyQuery(), new SubProgressMonitor(subMonitor, 10));
> 
>-		if (subMonitor.isCanceled() || queryResult.isEmpty()) {
>+		if (!slicer.getStatus().isOK() || subMonitor.isCanceled() || queryResult == null || queryResult.isEmpty()) {
> 			return new IResolvedBundle[0];
> 		}
> 
>#P org.eclipse.pde.ui
>Index: src/org/eclipse/pde/internal/ui/search/dialogs/TargetRepositorySearchHandler.java
>===================================================================
>RCS file: /cvsroot/eclipse/pde/ui/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/search/dialogs/TargetRepositorySearchHandler.java,v
>retrieving revision 1.5
>diff -u -r1.5 TargetRepositorySearchHandler.java
>--- src/org/eclipse/pde/internal/ui/search/dialogs/TargetRepositorySearchHandler.java	22 Mar 2010 16:52:45 -0000	1.5
>+++ src/org/eclipse/pde/internal/ui/search/dialogs/TargetRepositorySearchHandler.java	18 May 2010 18:06:44 -0000
>@@ -81,6 +81,7 @@
> 		IUBundleContainer container = (IUBundleContainer) service.newIUContainer(units, repositories);
> 		// Force the target into slicer mode as all requirements may not be available
> 		container.setIncludeAllRequired(false, definition);
>+		container.setIncludeAllEnvironments(true, definition);
> 		IBundleContainer[] oldContainers = definition.getBundleContainers();
> 		if (oldContainers == null) {
> 			definition.setBundleContainers(new IBundleContainer[] {container});

Actions: View | Diff

Attachments on bug 313409: 168987