Skip to content

Add support to search bundles in the host by version range #2036

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
laeubi wants to merge 1 commit into from
Closed

Add support to search bundles in the host by version range #2036

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 27 additions & 6 deletions ui/org.eclipse.pde.core/src/org/eclipse/pde/internal/core/PDECore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -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;
Expand All @@ -56,6 +60,7 @@
import org.osgi.framework.FrameworkUtil;
import org.osgi.framework.ServiceReference;
import org.osgi.framework.ServiceRegistration;
import org.osgi.framework.Version;
import org.osgi.util.tracker.ServiceTracker;

import aQute.bnd.build.Workspace;
Expand Down Expand Up @@ -109,7 +114,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;
Expand Down Expand Up @@ -221,15 +226,20 @@ public PDECore() {
inst = this;
}

public synchronized IPluginModelBase findPluginInHost(String id) {
public IPluginModelBase findPluginInHost(String id) {
return findPluginsInHost(id).max(Comparator.comparing(plugin -> {
return getOSGiVersion(plugin);
})).orElse(null);
}

public synchronized Stream<IPluginModelBase> findPluginsInHost(String id) {
if (fHostPlugins == null) {
fHostPlugins = new HashMap<>();

ITargetDefinition defaultTarget = TargetPlatformService.getDefault().newDefaultTarget();
IStatus status = defaultTarget.resolve(new NullProgressMonitor());
if (!status.isOK()) {
log(status);
return null;
return Stream.empty();
}

URI[] pluginPaths = Arrays.stream(defaultTarget.getBundles()) //
Expand All @@ -240,11 +250,22 @@ 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 == null) {
return Stream.empty();
}
return list.stream();
}

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() {
Expand Down
Loading