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

EA-23288 EA-2387 fix assertion

Browse Source
This commit is contained in:
Eugene Kudelevsky
2010-11-10 16:40:49 +03:00
parent 2033791ad8
commit e742940a5a
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/android/src/org/jetbrains/android/facet/AndroidFacet.java
+5 -2
View File
@@ -37,6 +37,8 @@ import com.intellij.openapi.module.ModuleUtil;
import com.intellij.openapi.project.IndexNotReadyException;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.*;
import com.intellij.openapi.roots.impl.libraries.LibraryEx;
import com.intellij.openapi.roots.libraries.Library;
import com.intellij.openapi.startup.StartupManager;
import com.intellij.openapi.ui.Messages;
import com.intellij.openapi.util.Comparing;
@@ -336,8 +338,9 @@ public class AndroidFacet extends Facet<AndroidFacetConfiguration> {
AndroidPlatform platform = getConfiguration().getAndroidPlatform();
if (platform != null) {
final ModifiableRootModel model = ModuleRootManager.getInstance(getModule()).getModifiableModel();
if (model.findLibraryOrderEntry(platform.getLibrary()) == null) {
LibraryOrderEntry entry = model.addLibraryEntry(platform.getLibrary());
Library library = platform.getLibrary();
if (!((LibraryEx)library).isDisposed() && model.findLibraryOrderEntry(library) == null) {
LibraryOrderEntry entry = model.addLibraryEntry(library);
entry.setScope(DependencyScope.PROVIDED);
}
ApplicationManager.getApplication().runWriteAction(new Runnable() {