Add support to search bundles in the host by version range

Currently PDE#findPluginInHost assumes that a bundle is unique by its id
what is not true in all cases.

This now do the following:

- index the plugins by id but keep them in a list to support multiple
- if more than one version is found return the highest
- allow to further restrict by version range

Author: laeubi

ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PDECore.java

@@ -15,9 +15,12 @@
 
 import java.lang.reflect.InvocationTargetException;
 import java.net.URI;
+import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.Hashtable;
+import java.util.List;
 import java.util.Map;
 import java.util.stream.Stream;
 
@@ -37,6 +40,7 @@
 import org.eclipse.osgi.service.debug.DebugOptions;
 import org.eclipse.osgi.service.debug.DebugOptionsListener;
 import org.eclipse.osgi.service.debug.DebugTrace;
+import org.eclipse.osgi.service.resolver.BundleDescription;
 import org.eclipse.pde.core.IBundleClasspathResolver;
 import org.eclipse.pde.core.IClasspathContributor;
 import org.eclipse.pde.core.plugin.IPluginModelBase;
@@ -56,6 +60,8 @@
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.framework.ServiceReference;
 import org.osgi.framework.ServiceRegistration;
+import org.osgi.framework.Version;
+import org.osgi.framework.VersionRange;
 import org.osgi.util.tracker.ServiceTracker;
 
 import aQute.bnd.build.Workspace;
@@ -109,7 +115,7 @@ public class PDECore extends Plugin implements DebugOptionsListener {
 	 */
 	private static PDEPreferencesManager fPreferenceManager;
 
-	private Map<String, IPluginModelBase> fHostPlugins;
+	private Map<String, List<IPluginModelBase>> fHostPlugins;
 
 	public static PDECore getDefault() {
 		return inst;
@@ -222,9 +228,12 @@ public PDECore() {
 	}
 
 	public synchronized IPluginModelBase findPluginInHost(String id) {
+		return findPluginInHost(id, null);
+	}
+
+	public synchronized IPluginModelBase findPluginInHost(String id, VersionRange version) {
 		if (fHostPlugins == null) {
 			fHostPlugins = new HashMap<>();
-
 			ITargetDefinition defaultTarget = TargetPlatformService.getDefault().newDefaultTarget();
 			IStatus status = defaultTarget.resolve(new NullProgressMonitor());
 			if (!status.isOK()) {
@@ -240,11 +249,33 @@ public synchronized IPluginModelBase findPluginInHost(String id) {
 			state.resolveState(false);
 
 			for (IPluginModelBase plugin : state.getTargetModels()) {
-				fHostPlugins.put(plugin.getPluginBase().getId(), plugin);
+				fHostPlugins.computeIfAbsent(plugin.getPluginBase().getId(), nil -> new ArrayList<>(1)).add(plugin);
 			}
 		}
+		List<IPluginModelBase> list = fHostPlugins.get(id);
+		if (list.isEmpty()) {
+			return null;
+		}
+		if (version == null) {
+			if (list.size() == 1) {
+				return list.get(0);
+			}
+			return list.stream().max(Comparator.comparing(plugin -> {
+				return getOSGiVersion(plugin);
+			})).get();
+		}
+		return list.stream().filter(plugin -> version.includes(getOSGiVersion(plugin)))
+				.max(Comparator.comparing(plugin -> {
+			return getOSGiVersion(plugin);
+		})).orElse(null);
+	}
 
-		return fHostPlugins.get(id);
+	public static Version getOSGiVersion(IPluginModelBase plugin) {
+		BundleDescription description = plugin.getBundleDescription();
+		if (description == null) {
+			return Version.emptyVersion;
+		}
+		return description.getVersion();
 	}
 
 	public PluginModelManager getModelManager() {