MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

new framework detection: migrating facet detectors, part 2

Browse Source
This commit is contained in:
nik
2011-08-08 13:18:54 +04:00
parent f4be3f2a23
commit 97dabbe2f5
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/lang-impl/src/com/intellij/framework/detection/FacetBasedFrameworkDetector.java
+2 -1
View File
@@ -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
platform/lang-impl/src/com/intellij/framework/detection/impl/FacetBasedDetectedFrameworkDescription.java
+4 -1
View File
@@ -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
plugins/android/src/org/jetbrains/android/facet/AndroidFrameworkDetector.java
+2 -1
View File
@@ -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();