Merge pull request #5710 from pkriens/feature/resolution-view

biz.aQute.bndlib/src/aQute/bnd/build/model/EE.java

@@ -13,13 +13,16 @@
 import java.util.TreeSet;
 
 import org.osgi.framework.namespace.ExecutionEnvironmentNamespace;
+import org.osgi.resource.Resource;
 
 import aQute.bnd.exceptions.Exceptions;
 import aQute.bnd.header.Attrs;
 import aQute.bnd.header.Parameters;
 import aQute.bnd.osgi.Analyzer;
+import aQute.bnd.osgi.Processor;
 import aQute.bnd.osgi.resource.FilterParser;
 import aQute.bnd.osgi.resource.FilterParser.Expression;
+import aQute.bnd.osgi.resource.ResourceBuilder;
 import aQute.bnd.version.Version;
 import aQute.lib.utf8properties.UTF8Properties;
 
@@ -84,6 +87,7 @@ public enum EE {
 	private transient Parameters	packages				= null;
 	private transient Parameters	modules					= null;
 
+	private Resource				resource;
 	/**
 	 * For use by JavaSE_9 and later.
 	 */
@@ -338,4 +342,22 @@ public static EE getEEFromReleaseVersion(int releaseVersion) {
 	public static SortedSet<EE> all() {
 		return all;
 	}
+
+	/**
+	 * Return a list of capabilities associated with this EE
+	 */
+	public Resource getResource() {
+		if (resource != null)
+			return resource;
+
+		ResourceBuilder rb = new ResourceBuilder();
+		getPackages()
+			.forEach((k, v) -> {
+				String name = Processor.removeDuplicateMarker(k);
+				rb.addExportPackage(name, v);
+			});
+
+		rb.addEE(this);
+		return resource = rb.build();
+	}
 }

bndtools.core/icons.properties

@@ -6,13 +6,15 @@ icons.service=icons/service.png
 icons.capreq=icons/connections.png
 
 # Java Things
+icons.java=icons/java.png
 icons.jar=icons/jar.gif
 icons.multijar=icons/multijar.gif
 icons.class=icons/class.gif
 icons.interface=icons/interface.gif
 icons.package=icons/package.gif
 icons.packages=icons/packages.gif
 icons.projects=icons/projects.gif
+icons.osgi.ee=icons/java.png
 
 # Bnd Things
 icons.bndrun=icons/bndrun.gif

bndtools.core/src/bndtools/model/resolution/RequirementWrapper.java

@@ -8,6 +8,7 @@ public class RequirementWrapper {
 
 	public Requirement					requirement;
 	public boolean						resolved;
+	public boolean						java;
 	public Collection<? extends Object>	requirers;
 
 }

bndtools.core/src/bndtools/model/resolution/RequirementWrapperLabelProvider.java

@@ -33,7 +33,7 @@ public void update(ViewerCell cell) {
 			cell.setImage(icon);
 
 			StyledString label = getLabel(rw.requirement);
-			if (rw.resolved)
+			if (rw.resolved || rw.java)
 				label.setStyle(0, label.length(), resolved);
 
 			cell.setText(label.getString());
@@ -71,6 +71,12 @@ public String getToolTipText(Object element) {
 			StringBuilder buf = new StringBuilder();
 			if (rw.resolved)
 				buf.append("RESOLVED:\n");
+			if (rw.java)
+				buf.append("JAVA:\n");
+
+			buf.append("FROM: ")
+				.append(req.getResource())
+				.append("\n");
 
 			Resource r = rw.requirement.getResource();
 			if (r instanceof SupportingResource sr) {
@@ -100,6 +106,8 @@ public String getToolTipText(Object element) {
 					.append(" := ")
 					.append(directive.getValue());
 
+			Resource resource = req.getResource();
+
 			return buf.toString();
 		}
 

bndtools.core/src/bndtools/tasks/AnalyseBundleResolutionJob.java

@@ -1,5 +1,7 @@
 package bndtools.tasks;
 
+import static java.util.Collections.emptyList;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -18,6 +20,7 @@
 import org.osgi.resource.Capability;
 import org.osgi.resource.Namespace;
 
+import aQute.bnd.build.model.EE;
 import aQute.bnd.osgi.resource.ResourceUtils;
 import aQute.lib.io.IO;
 import bndtools.model.resolution.RequirementWrapper;
@@ -30,10 +33,16 @@ public class AnalyseBundleResolutionJob extends Job {
 
 	private Map<String, List<RequirementWrapper>>	requirements;
 	private Map<String, List<Capability>>			capabilities;
+	private EE										ee;
 
 	public AnalyseBundleResolutionJob(String name, Set<? extends CapReqLoader> loaders) {
+		this(name, loaders, null);
+	}
+
+	public AnalyseBundleResolutionJob(String name, Set<? extends CapReqLoader> loaders, EE ee) {
 		super(name);
 		this.loaders = loaders;
+		this.ee = ee;
 	}
 
 	private static <K, V> void mergeMaps(Map<K, List<V>> from, Map<K, List<V>> into) {
@@ -53,6 +62,8 @@ private static <K, V> void mergeMaps(Map<K, List<V>> from, Map<K, List<V>> into)
 	@Override
 	protected IStatus run(IProgressMonitor monitor) {
 		try {
+
+
 			// Load all the capabilities and requirements
 			Map<String, List<Capability>> allCaps = new HashMap<>();
 			Map<String, List<RequirementWrapper>> allReqs = new HashMap<>();
@@ -72,13 +83,14 @@ protected IStatus run(IProgressMonitor monitor) {
 
 			// Check for resolved requirements
 			for (String namespace : allReqs.keySet()) {
-				List<RequirementWrapper> rws = allReqs.get(namespace);
-				List<Capability> candidates = allCaps.get(namespace);
+				List<RequirementWrapper> rws = allReqs.getOrDefault(namespace, emptyList());
+				List<Capability> candidates = allCaps.getOrDefault(namespace, emptyList());
 
-				if (candidates == null)
-					continue;
+				List<Capability> javaCandidates = ee == null ? emptyList()
+					: ee.getResource()
+						.getCapabilities(namespace);
 
-				for (RequirementWrapper rw : rws) {
+				outer: for (RequirementWrapper rw : rws) {
 					String filterDirective = rw.requirement.getDirectives()
 						.get(Namespace.REQUIREMENT_FILTER_DIRECTIVE);
 					if (filterDirective == null) {
@@ -88,7 +100,13 @@ protected IStatus run(IProgressMonitor monitor) {
 					for (Capability cand : candidates) {
 						if (predicate.test(cand)) {
 							rw.resolved = true;
-							break;
+							continue outer;
+						}
+					}
+					for (Capability cand : javaCandidates) {
+						if (predicate.test(cand)) {
+							rw.java = true;
+							continue outer;
 						}
 					}
 				}