From 4eabefdbb519c6308a7b3fa9933340cbe9211e9c Mon Sep 17 00:00:00 2001
From: Maxim Shafirov <max@jetbrains.com>
Date: Sun, 27 Feb 2005 19:15:50 +0300
Subject: [PATCH] Loading modules moved from project opening to project
 initialization.

---
 source/com/intellij/openapi/project/impl/ProjectImpl.java       | 2 ++
 .../com/intellij/openapi/project/impl/ProjectManagerImpl.java   | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/com/intellij/openapi/project/impl/ProjectImpl.java b/source/com/intellij/openapi/project/impl/ProjectImpl.java
index f1ab1313458d..716791eef7e2 100644
--- a/source/com/intellij/openapi/project/impl/ProjectImpl.java
+++ b/source/com/intellij/openapi/project/impl/ProjectImpl.java
@@ -19,6 +19,7 @@ import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleManager;
 import com.intellij.openapi.module.impl.ModuleImpl;
+import com.intellij.openapi.module.impl.ModuleManagerImpl;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.ProjectManagerListener;
 import com.intellij.openapi.project.ex.ProjectEx;
@@ -362,6 +363,7 @@ public class ProjectImpl extends BaseFileConfigurable implements ProjectEx, Area
   public void init() {
     super.init();
 
+    ((ModuleManagerImpl)ModuleManager.getInstance(this)).loadModules();
     myProjectManagerListener = new ProjectImpl.MyProjectManagerListener();
     myManager.addProjectManagerListener(this, myProjectManagerListener);
   }
diff --git a/source/com/intellij/openapi/project/impl/ProjectManagerImpl.java b/source/com/intellij/openapi/project/impl/ProjectManagerImpl.java
index cce4e4a7364e..e5f773c9be23 100644
--- a/source/com/intellij/openapi/project/impl/ProjectManagerImpl.java
+++ b/source/com/intellij/openapi/project/impl/ProjectManagerImpl.java
@@ -14,7 +14,6 @@ import com.intellij.openapi.fileEditor.impl.FileDocumentManagerImpl;
 import com.intellij.openapi.help.HelpManager;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleManager;
-import com.intellij.openapi.module.impl.ModuleManagerImpl;
 import com.intellij.openapi.options.ex.SingleConfigurableEditor;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.project.ProjectManagerListener;
@@ -261,7 +260,6 @@ public class ProjectManagerImpl extends ProjectManagerEx implements NamedJDOMExt
     if (myOpenProjects.contains(project)) return;
     if (!ApplicationManager.getApplication().isUnitTestMode() && !checkVersion(project)) return;
 
-    ((ModuleManagerImpl)ModuleManager.getInstance(project)).loadModules();
 
     myCountOfProjectsBeingOpen++;
     myOpenProjects.add(project);