From 5faefc98f0774b6ed6c7f2acff7a7f03e6cbce91 Mon Sep 17 00:00:00 2001 From: nik Date: Tue, 9 Aug 2011 10:33:16 +0400 Subject: [PATCH] really enable framework detection in detection tests only --- .../framework/detection/impl/FrameworkDetectionManager.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/framework/detection/impl/FrameworkDetectionManager.java b/platform/lang-impl/src/com/intellij/framework/detection/impl/FrameworkDetectionManager.java index c8de3b616a0e..a42b9fc44439 100644 --- a/platform/lang-impl/src/com/intellij/framework/detection/impl/FrameworkDetectionManager.java +++ b/platform/lang-impl/src/com/intellij/framework/detection/impl/FrameworkDetectionManager.java @@ -79,11 +79,12 @@ public class FrameworkDetectionManager extends AbstractProjectComponent implemen @Override public void initComponent() { - doInitialize(); + if (!myProject.isDefault() && !ApplicationManager.getApplication().isUnitTestMode()) { + doInitialize(); + } } public void doInitialize() { - if (myProject.isDefault()) return; myDetectionQueue = new MergingUpdateQueue("FrameworkDetectionQueue", 500, true, null, myProject); if (ApplicationManager.getApplication().isUnitTestMode()) { myDetectionQueue.setPassThrough(false); @@ -122,6 +123,7 @@ public class FrameworkDetectionManager extends AbstractProjectComponent implemen public void doDispose() { if (myDetectedFrameworksData != null) { myDetectedFrameworksData.saveDetected(); + myDetectedFrameworksData = null; } }