felix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rickh...@apache.org
Subject svn commit: r916145 - /felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java
Date Thu, 25 Feb 2010 06:10:27 GMT
Author: rickhall
Date: Thu Feb 25 06:10:26 2010
New Revision: 916145

URL: http://svn.apache.org/viewvc?rev=916145&view=rev
Log:
Remove unnecessary method parameter and reorder parameters.

Modified:
    felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java

Modified: felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java
URL: http://svn.apache.org/viewvc/felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java?rev=916145&r1=916144&r2=916145&view=diff
==============================================================================
--- felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java
(original)
+++ felix/sandbox/rickhall/framework-proto/src/main/java/org/apache/felix/framework/resolver/ResolverImpl.java
Thu Feb 25 06:10:26 2010
@@ -94,8 +94,8 @@
             Map<Requirement, Set<Capability>> candidateMap =
                 new HashMap<Requirement, Set<Capability>>();
 
-            populateCandidates(state, null, module, candidateMap,
-                m_fwkExecEnvStr, m_fwkExecEnvSet, new HashMap<Module, Object>());
+            populateCandidates(state, module, m_fwkExecEnvStr, m_fwkExecEnvSet,
+                candidateMap, new HashMap<Module, Object>());
             m_candidatePermutations.add(candidateMap);
 
             ResolveException rethrow = null;
@@ -165,8 +165,8 @@
             Map<Module, Packages> modulePkgMap = new HashMap<Module, Packages>();
 
 //System.out.println("+++ DYNAMICALLY RESOLVING " + module + " - " + pkgName);
-            populateDynamicCandidates(state, module, candidateMap,
-                m_fwkExecEnvStr, m_fwkExecEnvSet);
+            populateDynamicCandidates(state, module,
+                m_fwkExecEnvStr, m_fwkExecEnvSet, candidateMap);
             m_candidatePermutations.add(candidateMap);
             ResolveException rethrow = null;
 
@@ -364,9 +364,8 @@
     }
 
     private static void populateCandidates(
-        ResolverState state, Module instigator, Module module,
-        Map<Requirement, Set<Capability>> candidateMap,
-        String fwkExecEnvStr, Set fwkExecEnvSet, Map<Module, Object> resultCache)
+        ResolverState state, Module module, String fwkExecEnvStr, Set fwkExecEnvSet,
+        Map<Requirement, Set<Capability>> candidateMap, Map<Module, Object>
resultCache)
     {
         if (m_isInvokeCount)
         {
@@ -466,8 +465,8 @@
                 {
                     try
                     {
-                        populateCandidates(state, module, candCap.getModule(),
-                            candidateMap, fwkExecEnvStr, fwkExecEnvSet, resultCache);
+                        populateCandidates(state, candCap.getModule(),
+                            fwkExecEnvStr, fwkExecEnvSet, candidateMap, resultCache);
                     }
                     catch (ResolveException ex)
                     {
@@ -519,8 +518,8 @@
 
     private static void populateDynamicCandidates(
         ResolverState state, Module module,
-        Map<Requirement, Set<Capability>> candidateMap,
-        String fwkExecEnvStr, Set fwkExecEnvSet)
+        String fwkExecEnvStr, Set fwkExecEnvSet,
+        Map<Requirement, Set<Capability>> candidateMap)
     {
         if (m_isInvokeCount)
         {
@@ -543,8 +542,9 @@
             {
                 try
                 {
-                    populateCandidates(state, module, candCap.getModule(), candidateMap,
-                        fwkExecEnvStr, fwkExecEnvSet, new HashMap<Module, Object>());
+                    populateCandidates(state, candCap.getModule(),
+                        fwkExecEnvStr, fwkExecEnvSet, candidateMap,
+                        new HashMap<Module, Object>());
                 }
                 catch (ResolveException ex)
                 {



Mime
View raw message