resolver: add ResolveContext getSubstitutionWires method

Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
Change-Id: I44f6400ec2b37603299bed60750383177f968ada

2 files changed, 7 insertions, 7 deletions

diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolver.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolver.java
index 9d0b7872f..6861703da 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolver.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleResolver.java
@@ -472,7 +472,7 @@ final class ModuleResolver {
 		return version instanceof Version ? (Version) version : Version.emptyVersion;
 	}
 
-	class ResolveProcess extends ResolveContext implements Comparator<Capability>, FelixResolveContext, Executor {
+	class ResolveProcess extends ResolveContext implements Comparator<Capability>, Executor {
 
 		class ResolveLogger extends Logger {
 			private Map<Resource, ResolutionException> errors = null;
@@ -1033,8 +1033,8 @@ final class ModuleResolver {
 				}
 			} catch (ResolutionException resolutionException) {
 				if (resolutionException.getCause() instanceof CancellationException) {
-				// revert back to single bundle resolves
-				resolveRevisionsIndividually(isMandatory, logger, result, toResolve, revisions);
+					// revert back to single bundle resolves
+					resolveRevisionsIndividually(isMandatory, logger, result, toResolve, revisions);
 				} else {
 					throw resolutionException;
 				}
@@ -1091,7 +1091,7 @@ final class ModuleResolver {
 				}
 			} catch (ResolutionException resolutionException) {
 				if (resolutionException.getCause() instanceof CancellationException) {
-				applyTransitiveFailures = false;
+					applyTransitiveFailures = false;
 				}
 				throw resolutionException;
 			} catch (OutOfMemoryError memoryError) {
@@ -1607,7 +1607,7 @@ final class ModuleResolver {
 		}
 
 		@Override
-		public Collection<Wire> getSubstitutionWires(Wiring wiring) {
+		public List<Wire> getSubstitutionWires(Wiring wiring) {
 			return ((ModuleWiring) wiring).getSubstitutionWires();
 		}
 	}
diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleWiring.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleWiring.java
index ce85e5074..2aa1442e9 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleWiring.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleWiring.java
@@ -459,12 +459,12 @@ public final class ModuleWiring implements BundleWiring {
 		return revision.toString();
 	}
 
-	Collection<Wire> getSubstitutionWires() {
+	List<Wire> getSubstitutionWires() {
 		if (substitutedPkgNames.isEmpty()) {
 			return Collections.emptyList();
 		}
 		// Could cache this, but seems unnecessary since it will only be used by the resolver
-		Collection<Wire> substitutionWires = new ArrayList<>(substitutedPkgNames.size());
+		List<Wire> substitutionWires = new ArrayList<>(substitutedPkgNames.size());
 		List<ModuleWire> current = requiredWires;
 		for (ModuleWire wire : current) {
 			Capability cap = wire.getCapability();