From 97dabbe2f530494027c7f7dc26dc6e1090166b45 Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Fri, 5 Aug 2011 12:42:39 +0400
Subject: [PATCH] new framework detection: migrating facet detectors, part 2

---
 .../framework/detection/FacetBasedFrameworkDetector.java     | 3 ++-
 .../impl/FacetBasedDetectedFrameworkDescription.java         | 5 ++++-
 .../jetbrains/android/facet/AndroidFrameworkDetector.java    | 3 ++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/framework/detection/FacetBasedFrameworkDetector.java b/platform/lang-impl/src/com/intellij/framework/detection/FacetBasedFrameworkDetector.java
index 83c4ac7a5ddb..3bb9345a4dbd 100644
--- a/platform/lang-impl/src/com/intellij/framework/detection/FacetBasedFrameworkDetector.java
+++ b/platform/lang-impl/src/com/intellij/framework/detection/FacetBasedFrameworkDetector.java
@@ -21,6 +21,7 @@ import com.intellij.facet.FacetType;
 import com.intellij.framework.FrameworkType;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.fileTypes.StdFileTypes;
+import com.intellij.openapi.roots.ModifiableRootModel;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NotNull;
@@ -56,7 +57,7 @@ public abstract class FacetBasedFrameworkDetector<F extends Facet, C extends Fac
     return getFacetType().createDefaultConfiguration();
   }
 
-  public void setupFacet(@NotNull F facet) {
+  public void setupFacet(@NotNull F facet, ModifiableRootModel model) {
   }
 
   @Override
diff --git a/platform/lang-impl/src/com/intellij/framework/detection/impl/FacetBasedDetectedFrameworkDescription.java b/platform/lang-impl/src/com/intellij/framework/detection/impl/FacetBasedDetectedFrameworkDescription.java
index 59947462fb90..fd09de6216b2 100644
--- a/platform/lang-impl/src/com/intellij/framework/detection/impl/FacetBasedDetectedFrameworkDescription.java
+++ b/platform/lang-impl/src/com/intellij/framework/detection/impl/FacetBasedDetectedFrameworkDescription.java
@@ -22,6 +22,7 @@ import com.intellij.framework.detection.FacetBasedFrameworkDetector;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.roots.ModifiableModelsProvider;
+import com.intellij.openapi.roots.ModifiableRootModel;
 import com.intellij.openapi.util.Condition;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.util.text.UniqueNameGenerator;
@@ -126,7 +127,9 @@ public abstract class FacetBasedDetectedFrameworkDescription<F extends Facet, C
                                                                  findUnderlyingFacet(module));
     model.addFacet(facet);
     modifiableModelsProvider.commitFacetModifiableModel(module, model);
-    myDetector.setupFacet(facet);
+    final ModifiableRootModel rootModel = modifiableModelsProvider.getModuleModifiableModel(module);
+    myDetector.setupFacet(facet, rootModel);
+    modifiableModelsProvider.commitModuleModifiableModel(rootModel);
   }
 
   @Nullable
diff --git a/plugins/android/src/org/jetbrains/android/facet/AndroidFrameworkDetector.java b/plugins/android/src/org/jetbrains/android/facet/AndroidFrameworkDetector.java
index 58bd3afe5318..984203961ed8 100644
--- a/plugins/android/src/org/jetbrains/android/facet/AndroidFrameworkDetector.java
+++ b/plugins/android/src/org/jetbrains/android/facet/AndroidFrameworkDetector.java
@@ -23,6 +23,7 @@ import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.roots.ModifiableRootModel;
 import com.intellij.openapi.startup.StartupManager;
 import com.intellij.patterns.ElementPattern;
 import com.intellij.util.indexing.FileContent;
@@ -41,7 +42,7 @@ public class AndroidFrameworkDetector extends FacetBasedFrameworkDetector<Androi
   }
 
   @Override
-  public void setupFacet(@NotNull final AndroidFacet facet) {
+  public void setupFacet(@NotNull final AndroidFacet facet, ModifiableRootModel model) {
     final Module module = facet.getModule();
     final Project project = module.getProject();