mirrors/Terra
1
0
Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-02-16 10:30:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix circular dependency checking

Browse Source
This commit is contained in:
dfsek
2021-11-18 21:45:12 -07:00
parent 84537e2f99
commit 7bf1ba13c8
4 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/addons/config-distributors

Submodule common/addons/config-distributors updated: 63f9078601...56bac92799

2
common/addons/config-feature

Submodule common/addons/config-feature updated: 648e8a7006...d2cd833fcf

2
common/addons/config-locators

Submodule common/addons/config-locators updated: 9aca4dad90...bf177a6c93

22
common/implementation/src/main/java/com/dfsek/terra/addon/DependencySorter.java
View File

@@ -42,25 +42,31 @@ public class DependencySorter {
sortDependencies(dependency, sort);
if(sort.contains(dependency)) {
throw new CircularDependencyException(
"Addon " + addon.getID() + " has circular dependency beginning with " + dependency.getID());
}
sort.add(dependency); // add it to the list.
}
});
}
private void checkDependencies(BaseAddon base, BaseAddon current) {
current.getDependencies().forEach((id, range) -> {
BaseAddon dependency = addons.get(id);
if(dependency.getID().equals(base.getID())) {
throw new CircularDependencyException(
"Addon " + base.getID() + " has circular dependency beginning with " + dependency.getID());
}
checkDependencies(base, dependency);
});
}
public List<BaseAddon> sort() {
List<BaseAddon> sorted = new ArrayList<>();
for(int i = addonList.size() - 1; i >= 0; i--) {
BaseAddon addon = addonList.get(i);
checkDependencies(addon, addon);
addonList.remove(i);
System.out.println(addon.getID() + ": " + visited.get(addon.getID()));
if(!visited.get(addon.getID())) {
sortDependencies(addon, sorted);
}