Attachment 88234 Details for Bug 212763 – partial solution + code refactoring

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

[patch] partial solution + code refactoring

patch_pde_212763.txt (text/plain), 2.03 KB, created by bartosz michalik

on 2008-01-29 21:52:56 EST

(hide)

Description:

Filename:

MIME Type:

Creator: bartosz michalik

Created: 2008-01-29 21:52:56 EST

Size: 2.03 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.pde.ui
>Index: src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizard.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.pde.ui/src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizard.java,v
>retrieving revision 1.52
>diff -u -r1.52 PluginImportWizard.java
>--- src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizard.java	11 Jan 2008 20:00:06 -0000	1.52
>+++ src/org/eclipse/pde/internal/ui/wizards/imports/PluginImportWizard.java	30 Jan 2008 02:24:30 -0000
>@@ -10,7 +10,7 @@
>  *******************************************************************************/
> package org.eclipse.pde.internal.ui.wizards.imports;
> 
>-import java.util.*;
>+import java.util.HashSet;
> import org.eclipse.core.runtime.*;
> import org.eclipse.core.runtime.jobs.Job;
> import org.eclipse.debug.core.*;
>@@ -108,17 +108,19 @@
> 				if (configuration == null)
> 					continue;
> 				try {
>-					Map workspaceBundleMap = BundleLauncherHelper.getWorkspaceBundleMap(configuration, null);
>-					for (Iterator iter = workspaceBundleMap.keySet().iterator(); iter.hasNext();) {
>-						IPluginModelBase bm = (IPluginModelBase) iter.next();
>-						BundleDescription description = bm.getBundleDescription();
>-						if (description != null) {
>-							if (imported.contains(description.getSymbolicName())) {
>-								++count;
>-								break;
>+					ILaunchConfigurationType type = configuration.getType();
>+					if (type.getIdentifier().startsWith("org.eclipse.pde.ui")) { //$NON-NLS-1$
>+						IPluginModelBase[] bundles = BundleLauncherHelper.getWorkspaceBundles(configuration);
>+						for (int j = 0; j < bundles.length; ++j) {
>+							BundleDescription description = bundles[j].getBundleDescription();
>+							if (description != null) {
>+								if (imported.contains(description.getSymbolicName())) {
>+									++count;
>+									break;
>+								}
> 							}
>-						}
> 
>+						}
> 					}
> 				} catch (CoreException e) {
> 					++count;

Actions: View | Diff

Attachments on bug 212763: 88234