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

getModules() should not show modifiable model to clients who asks for manager

Browse Source
This commit is contained in:
anna
2009-10-21 13:38:33 +04:00
parent a4a26e7c4f
commit 5ae593b5af
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/openapi/module/impl/ModuleManagerImpl.java
+17 -16
View File
@@ -74,7 +74,7 @@ public class ModuleManagerImpl extends ModuleManager implements ProjectComponent
private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.module.impl.ModuleManagerImpl");
public static final Key<String> DISPOSED_MODULE_NAME = Key.create("DisposedNeverAddedModuleName");
private final Project myProject;
private ModuleModelImpl myModuleModel = new ModuleModelImpl();
private volatile ModuleModelImpl myModuleModel = new ModuleModelImpl();
@NonNls public static final String COMPONENT_NAME = "ProjectModuleManager";
private static final String MODULE_GROUP_SEPARATOR = "/";
@@ -798,7 +798,6 @@ public class ModuleManagerImpl extends ModuleManager implements ProjectComponent
public void commitWithRunnable(Runnable runnable) {
commitModel(this, runnable);
myIsWritable = false;
clearRenamingStuff();
}
@@ -908,12 +907,25 @@ public class ModuleManagerImpl extends ModuleManager implements ProjectComponent
Disposer.dispose(module);
}
myModuleModel = moduleModel;
if (runnable != null) {
runnable.run();
}
final Map<Module, String> modulesToNewNamesMap = moduleModel.myModuleToNewName;
final Set<Module> modulesToBeRenamed = modulesToNewNamesMap.keySet();
modulesToBeRenamed.removeAll(moduleModel.myModulesToDispose);
final List<Module> modules = new ArrayList<Module>();
for (final Module aModulesToBeRenamed : modulesToBeRenamed) {
ModuleImpl module = (ModuleImpl)aModulesToBeRenamed;
moduleModel.myPathToModule.remove(module.getModuleFilePath());
modules.add(module);
module.rename(modulesToNewNamesMap.get(module));
moduleModel.myPathToModule.put(module.getModuleFilePath(), module);
}
moduleModel.myIsWritable = false;
myModuleModel = moduleModel;
for (Module module : removedModules) {
fireModuleRemoved(module);
cleanCachedStuff();
@@ -927,18 +939,7 @@ public class ModuleManagerImpl extends ModuleManager implements ProjectComponent
fireModuleAdded(addedModule);
cleanCachedStuff();
}
final Map<Module, String> modulesToNewNamesMap = moduleModel.myModuleToNewName;
final Set<Module> modulesToBeRenamed = modulesToNewNamesMap.keySet();
modulesToBeRenamed.removeAll(moduleModel.myModulesToDispose);
final List<Module> modules = new ArrayList<Module>();
for (final Module aModulesToBeRenamed : modulesToBeRenamed) {
ModuleImpl module = (ModuleImpl)aModulesToBeRenamed;
moduleModel.myPathToModule.remove(module.getModuleFilePath());
modules.add(module);
module.rename(modulesToNewNamesMap.get(module));
moduleModel.myPathToModule.put(module.getModuleFilePath(), module);
cleanCachedStuff();
}
cleanCachedStuff();
fireModulesRenamed(modules);
cleanCachedStuff();
}