diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectConfigurable.java index c6fa2dc2b785..1ba65e91a35a 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectConfigurable.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectConfigurable.java @@ -155,8 +155,7 @@ public class ProjectConfigurable extends NamedConfigurable implements D public void run() { ApplicationManager.getApplication().runReadAction(new Runnable(){ public void run() { - final Graph originalGraph = myModulesConfigurator.createGraphGenerator(); - final Graph> graph = ModuleCompilerUtil.toChunkGraph(originalGraph); + final Graph> graph = ModuleCompilerUtil.toChunkGraph(myModulesConfigurator.createGraphGenerator()); final Collection> chunks = graph.getNodes(); String cycles = ""; int count = 0; @@ -183,9 +182,6 @@ public class ProjectConfigurable extends NamedConfigurable implements D myWarningLabel.repaint();} } ); - for (ModifiableRootModel model : originalGraph.getNodes()) { - model.dispose(); - } } }); } diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/StructureConfigurableContext.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/StructureConfigurableContext.java index 84e2651f7f40..5b17b815e8ed 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/StructureConfigurableContext.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/StructureConfigurableContext.java @@ -59,7 +59,6 @@ public class StructureConfigurableContext implements Disposable { } public void dispose() { - clear(); } public ModulesConfigurator getModulesConfigurator() { @@ -78,7 +77,8 @@ public class StructureConfigurableContext implements Disposable { public void resetLibraries() { final LibraryTablesRegistrar tablesRegistrar = LibraryTablesRegistrar.getInstance(); - clear(); + + myLevel2Providers.clear(); myLevel2Providers.put(LibraryTablesRegistrar.APPLICATION_LEVEL, new LibrariesModifiableModel(tablesRegistrar.getLibraryTable(), myProject)); myLevel2Providers.put(LibraryTablesRegistrar.PROJECT_LEVEL, new LibrariesModifiableModel(tablesRegistrar.getLibraryTable(myProject), myProject)); for (final LibraryTable table : tablesRegistrar.getCustomLibraryTables()) { @@ -154,9 +154,6 @@ public class StructureConfigurableContext implements Disposable { } public void clear() { - for (LibrariesModifiableModel model : myLevel2Providers.values()) { - model.disposeUncommittedLibraries(); - } myLevel2Providers.clear(); } } \ No newline at end of file