mirror of
https://gitflic.ru/project/openide/openide.git
synced 2026-09-27 10:03:11 +07:00
Loading modules moved from project opening to project initialization.
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user