Lines 200-206
Link Here
|
200 |
return retval; |
200 |
return retval; |
201 |
} |
201 |
} |
202 |
|
202 |
|
203 |
public static Set<Dependency> findBrokenDependencies(UpdateElement element) { |
203 |
public static Set<Dependency> findBrokenDependencies(UpdateElement element, List<ModuleInfo> infos) { |
204 |
UpdateElementImpl el = Trampoline.API.impl (element); |
204 |
UpdateElementImpl el = Trampoline.API.impl (element); |
205 |
assert el != null : "UpdateElementImpl found for UpdateElement " + element; |
205 |
assert el != null : "UpdateElementImpl found for UpdateElement " + element; |
206 |
Set<Dependency> retval = Collections.emptySet (); |
206 |
Set<Dependency> retval = Collections.emptySet (); |
Lines 215-220
Link Here
|
215 |
} |
215 |
} |
216 |
final Set<Dependency> deps = info.getDependencies(); |
216 |
final Set<Dependency> deps = info.getDependencies(); |
217 |
List<ModuleInfo> extendedModules = getInstalledModules(); |
217 |
List<ModuleInfo> extendedModules = getInstalledModules(); |
|
|
218 |
extendedModules.addAll(infos); |
218 |
final Set<Dependency> brokenDeps = DependencyChecker.findBrokenDependencies(deps, extendedModules); |
219 |
final Set<Dependency> brokenDeps = DependencyChecker.findBrokenDependencies(deps, extendedModules); |
219 |
List<UpdateElement> reqs = findRequiredModules(brokenDeps, extendedModules); |
220 |
List<UpdateElement> reqs = findRequiredModules(brokenDeps, extendedModules); |
220 |
extendedModules.addAll (getModuleInfos (reqs)); |
221 |
extendedModules.addAll (getModuleInfos (reqs)); |
Lines 222-231
Link Here
|
222 |
return retval; |
223 |
return retval; |
223 |
} |
224 |
} |
224 |
|
225 |
|
225 |
static Set<String> getBrokenDependencies (UpdateElement element) { |
226 |
static Set<String> getBrokenDependencies (UpdateElement element, List<ModuleInfo> infos) { |
226 |
assert element != null : "UpdateElement cannot be null"; |
227 |
assert element != null : "UpdateElement cannot be null"; |
227 |
Set<String> retval = new HashSet<String> (); |
228 |
Set<String> retval = new HashSet<String> (); |
228 |
for (Dependency dep : findBrokenDependencies (element)) { |
229 |
for (Dependency dep : findBrokenDependencies (element, infos)) { |
229 |
retval.add (dep.toString ()); |
230 |
retval.add (dep.toString ()); |
230 |
} |
231 |
} |
231 |
return retval; |
232 |
return retval; |