From 77d0db7ac11039295937bc4e6503aae040138b11 Mon Sep 17 00:00:00 2001 From: Evgeny Pasynkov Date: Wed, 6 Jun 2012 13:50:12 +0200 Subject: [PATCH] do not initialize Directoryindex in CoreProjectLoader. Do it later, after jdk init --- .../src/com/intellij/core/CoreApplicationEnvironment.java | 3 ++- .../src/com/intellij/core/CoreProjectLoader.java | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/platform/core-impl/src/com/intellij/core/CoreApplicationEnvironment.java b/platform/core-impl/src/com/intellij/core/CoreApplicationEnvironment.java index 1b60f4f871c6..9581a190a341 100644 --- a/platform/core-impl/src/com/intellij/core/CoreApplicationEnvironment.java +++ b/platform/core-impl/src/com/intellij/core/CoreApplicationEnvironment.java @@ -108,7 +108,8 @@ public class CoreApplicationEnvironment { } ) ); - registerApplicationComponent(VirtualFilePointerManager.class, new CoreVirtualFilePointerManager()); + //registerApplicationComponent(VirtualFilePointerManager.class, new CoreVirtualFilePointerManager()); + myApplication.registerService(VirtualFilePointerManager.class, new CoreVirtualFilePointerManager()); myApplication.registerService(DefaultASTFactory.class, new CoreASTFactory()); myApplication.registerService(PsiBuilderFactory.class, new PsiBuilderFactoryImpl()); diff --git a/platform/projectModel-impl/src/com/intellij/core/CoreProjectLoader.java b/platform/projectModel-impl/src/com/intellij/core/CoreProjectLoader.java index 635f9fa27352..3e0319b3522a 100644 --- a/platform/projectModel-impl/src/com/intellij/core/CoreProjectLoader.java +++ b/platform/projectModel-impl/src/com/intellij/core/CoreProjectLoader.java @@ -23,8 +23,6 @@ import com.intellij.openapi.components.impl.stores.StorageData; import com.intellij.openapi.module.ModuleManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ProjectRootManager; -import com.intellij.openapi.roots.impl.DirectoryIndex; -import com.intellij.openapi.roots.impl.DirectoryIndexImpl; import com.intellij.openapi.roots.impl.ProjectRootManagerImpl; import com.intellij.openapi.roots.impl.libraries.LibraryTableBase; import com.intellij.openapi.roots.impl.libraries.ProjectLibraryTable; @@ -86,7 +84,7 @@ public class CoreProjectLoader { } moduleManager.loadModules(); - ((DirectoryIndexImpl) DirectoryIndex.getInstance(project)).initialize(); + //((DirectoryIndexImpl) DirectoryIndex.getInstance(project)).initialize(); } public static StorageData loadStorageFile(ComponentManager componentManager, VirtualFile modulesXml) throws JDOMException, IOException {