[Bug 420067] Debug booleans should be non-static

 - Too allow isolation of configuration between framework instances the debug boolean fields need to be non-static.  This forced a few static methods to become non-static.

2 files changed, 11 insertions, 11 deletions

diff --git a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleContainer.java b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleContainer.java
index 46f7c3c5e..1abed355f 100644
--- a/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleContainer.java
+++ b/bundles/org.eclipse.osgi/container/src/org/eclipse/osgi/container/ModuleContainer.java
@@ -470,7 +470,7 @@ public final class ModuleContainer {
 
 		ModuleResolutionReport report = moduleResolver.resolveDelta(triggerRevisions, triggersMandatory, unresolved, wiringClone, moduleDatabase);
 		Map<Resource, List<Wire>> resolutionResult = report.getResolutionResult();
-		Map<ModuleRevision, ModuleWiring> deltaWiring = resolutionResult == null ? Collections.<ModuleRevision, ModuleWiring> emptyMap() : ModuleResolver.generateDelta(resolutionResult, wiringClone);
+		Map<ModuleRevision, ModuleWiring> deltaWiring = resolutionResult == null ? Collections.<ModuleRevision, ModuleWiring> emptyMap() : moduleResolver.generateDelta(resolutionResult, wiringClone);
 		if (deltaWiring.isEmpty())
 			return report; // nothing to do
 
@@ -539,7 +539,7 @@ public final class ModuleContainer {
 			for (DynamicModuleRequirement dynamicReq : dynamicReqs) {
 				ModuleResolutionReport report = moduleResolver.resolveDynamicDelta(dynamicReq, unresolved, wiringClone, moduleDatabase);
 				Map<Resource, List<Wire>> resolutionResult = report.getResolutionResult();
-				deltaWiring = resolutionResult == null ? Collections.<ModuleRevision, ModuleWiring> emptyMap() : ModuleResolver.generateDelta(resolutionResult, wiringClone);
+				deltaWiring = resolutionResult == null ? Collections.<ModuleRevision, ModuleWiring> emptyMap() : moduleResolver.generateDelta(resolutionResult, wiringClone);
 				if (deltaWiring.get(revision) != null) {
 					break;
 				}
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 a4ad78467..f724c9fb8 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
@@ -46,12 +46,12 @@ final class ModuleResolver {
 	private static final String OPTION_WIRING = OPTION_RESOLVER + "/wiring"; //$NON-NLS-1$
 	private static final String OPTION_REPORT = OPTION_RESOLVER + "/report"; //$NON-NLS-1$
 
-	static boolean DEBUG_RESOLVER = false;
-	static boolean DEBUG_PROVIDERS = false;
-	static boolean DEBUG_HOOKS = false;
-	static boolean DEBUG_USES = false;
-	static boolean DEBUG_WIRING = false;
-	static boolean DEBUG_REPORT = false;
+	boolean DEBUG_RESOLVER = false;
+	boolean DEBUG_PROVIDERS = false;
+	boolean DEBUG_HOOKS = false;
+	boolean DEBUG_USES = false;
+	boolean DEBUG_WIRING = false;
+	boolean DEBUG_REPORT = false;
 
 	private void setDebugOptions() {
 		DebugOptions options = adaptor.getDebugOptions();
@@ -114,7 +114,7 @@ final class ModuleResolver {
 		return resolveProcess.resolve();
 	}
 
-	static Map<ModuleRevision, ModuleWiring> generateDelta(Map<Resource, List<Wire>> result, Map<ModuleRevision, ModuleWiring> wiringCopy) {
+	Map<ModuleRevision, ModuleWiring> generateDelta(Map<Resource, List<Wire>> result, Map<ModuleRevision, ModuleWiring> wiringCopy) {
 		Map<ModuleRevision, Map<ModuleCapability, List<ModuleWire>>> provided = new HashMap<ModuleRevision, Map<ModuleCapability, List<ModuleWire>>>();
 		Map<ModuleRevision, List<ModuleWire>> required = new HashMap<ModuleRevision, List<ModuleWire>>();
 		// First populate the list of provided and required wires for revision
@@ -163,7 +163,7 @@ final class ModuleResolver {
 		return delta;
 	}
 
-	private static ModuleWiring createNewWiring(ModuleRevision revision, Map<ModuleRevision, Map<ModuleCapability, List<ModuleWire>>> provided, Map<ModuleRevision, List<ModuleWire>> required) {
+	private ModuleWiring createNewWiring(ModuleRevision revision, Map<ModuleRevision, Map<ModuleCapability, List<ModuleWire>>> provided, Map<ModuleRevision, List<ModuleWire>> required) {
 		Map<ModuleCapability, List<ModuleWire>> providedWireMap = provided.get(revision);
 		if (providedWireMap == null)
 			providedWireMap = Collections.emptyMap();
@@ -272,7 +272,7 @@ final class ModuleResolver {
 		}
 	}
 
-	static void removeNonEffectiveCapabilities(ListIterator<ModuleCapability> iCapabilities) {
+	void removeNonEffectiveCapabilities(ListIterator<ModuleCapability> iCapabilities) {
 		rewind(iCapabilities);
 		while (iCapabilities.hasNext()) {
 			Capability capability = iCapabilities.next();