From e0e2622efd37bf34d604322ffdbf0f9b4f4f17c6 Mon Sep 17 00:00:00 2001 From: "kirill.safonov" Date: Mon, 12 Mar 2012 15:05:51 +0400 Subject: [PATCH] Flex project structure: force configurable reset after apply(), otherwise we would hold references to disposed order entries (AS-324) --- .../projectRoot/ModuleStructureConfigurable.java | 4 ++++ .../configuration/projectRoot/ModuleStructureExtension.java | 3 +++ 2 files changed, 7 insertions(+) diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleStructureConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleStructureConfigurable.java index c1e9408f5c84..41546503f757 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleStructureConfigurable.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleStructureConfigurable.java @@ -366,6 +366,10 @@ public class ModuleStructureConfigurable extends BaseStructureConfigurable imple if (myContext.myModulesConfigurator.isModified()) { myContext.myModulesConfigurator.apply(); } + + for (final ModuleStructureExtension extension : ModuleStructureExtension.EP_NAME.getExtensions()) { + extension.afterModelCommit(); + } } public boolean isModified() { diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleStructureExtension.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleStructureExtension.java index dd17ab3ac246..76ba8231c1fe 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleStructureExtension.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleStructureExtension.java @@ -82,4 +82,7 @@ public abstract class ModuleStructureExtension { public ActionCallback selectOrderEntry(@NotNull final Module module, @Nullable final OrderEntry entry) { return null; } + + public void afterModelCommit() { + } }