MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

avoid linear search — added/removed modules

Browse Source
This commit is contained in:
Vladimir Krivosheev
2016-12-18 18:17:00 +01:00
parent 8cddb9a432
commit b556edfa97
1 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/projectModel-impl/src/com/intellij/openapi/module/impl/ModuleManagerImpl.java
+22 -9
View File
@@ -934,10 +934,21 @@ public abstract class ModuleManagerImpl extends ModuleManager implements Project
ApplicationManager.getApplication().assertWriteAccessAllowed();
final Collection<Module> oldModules = myModuleModel.myModules.values();
final Collection<Module> newModules = moduleModel.myModules.values();
final List<Module> removedModules = new ArrayList<>(oldModules);
removedModules.removeAll(newModules);
final List<Module> addedModules = new ArrayList<>(newModules);
addedModules.removeAll(oldModules);
final Collection<Module> addedModules;
final Collection<Module> removedModules;
if (oldModules.isEmpty()) {
// create immutable copy
addedModules = new ArrayList<>(newModules);
removedModules = Collections.emptyList();
}
else {
addedModules = new THashSet<>(newModules);
addedModules.removeAll(oldModules);
removedModules = new THashSet<>(oldModules);
removedModules.removeAll(newModules);
}
ProjectRootManagerEx.getInstanceEx(myProject).makeRootsChange(() -> {
for (Module removedModule : removedModules) {
@@ -945,11 +956,13 @@ public abstract class ModuleManagerImpl extends ModuleManager implements Project
cleanCachedStuff();
}
List<Module> neverAddedModules = new ArrayList<>(moduleModel.myModulesToDispose);
neverAddedModules.removeAll(myModuleModel.myModules.values());
for (final Module neverAddedModule : neverAddedModules) {
neverAddedModule.putUserData(DISPOSED_MODULE_NAME, neverAddedModule.getName());
Disposer.dispose(neverAddedModule);
if (!moduleModel.myModulesToDispose.isEmpty()) {
List<Module> neverAddedModules = new ArrayList<>(moduleModel.myModulesToDispose);
neverAddedModules.removeAll(myModuleModel.myModules.values());
for (final Module neverAddedModule : neverAddedModules) {
neverAddedModule.putUserData(DISPOSED_MODULE_NAME, neverAddedModule.getName());
Disposer.dispose(neverAddedModule);
}
}
if (runnable != null) {