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

[java] extends project model modifier API with an ability to add exported dependencies

Browse Source
This commit is contained in:
Roman Shevchenko
2017-09-12 15:11:51 +03:00
parent 20e840af37
commit 9b6947ff11
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-impl/src/com/intellij/openapi/roots/impl/IdeaProjectModelModifier.java
+1 -1
View File
@@ -64,7 +64,7 @@ public class IdeaProjectModelModifier extends JavaProjectModelModifier {
@Override
public Promise<Void> addLibraryDependency(@NotNull Module from, @NotNull Library library, @NotNull DependencyScope scope, boolean exported) {
OrderEntryUtil.addLibraryToRoots(from, library);
OrderEntryUtil.addLibraryToRoots(from, library, scope, exported);
return Promises.resolvedPromise(null);
}
platform/lang-impl/src/com/intellij/openapi/roots/impl/OrderEntryUtil.java
+16 -7
View File
@@ -1,5 +1,5 @@
/*
* Copyright 2000-2016 JetBrains s.r.o.
* Copyright 2000-2017 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.intellij.openapi.roots.impl;
import com.intellij.openapi.module.Module;
@@ -32,8 +31,7 @@ import java.util.ArrayList;
import java.util.List;
public class OrderEntryUtil {
private OrderEntryUtil() {
}
private OrderEntryUtil() { }
@Nullable
public static LibraryOrderEntry findLibraryOrderEntry(@NotNull ModuleRootModel model, @Nullable Library library) {
@@ -137,9 +135,13 @@ public class OrderEntryUtil {
}
public static void addLibraryToRoots(@NotNull Module module, @NotNull Library library) {
final ModuleRootManager manager = ModuleRootManager.getInstance(module);
final ModifiableRootModel rootModel = manager.getModifiableModel();
addLibraryToRoots(module, library, DependencyScope.COMPILE, false);
}
public static void addLibraryToRoots(@NotNull Module module, @NotNull Library library, @NotNull DependencyScope scope, boolean exported) {
final ModifiableRootModel rootModel = ModuleRootManager.getInstance(module).getModifiableModel();
final LibraryOrderEntry entry;
if (library.getTable() == null) {
final Library jarLibrary = rootModel.getModuleLibraryTable().createLibrary();
final Library.ModifiableModel libraryModel = jarLibrary.getModifiableModel();
@@ -150,10 +152,17 @@ public class OrderEntryUtil {
}
}
libraryModel.commit();
entry = rootModel.findLibraryOrderEntry(jarLibrary);
}
else {
rootModel.addLibraryEntry(library);
entry = rootModel.addLibraryEntry(library);
}
if (entry != null) {
entry.setScope(scope);
entry.setExported(exported);
}
rootModel.commit();
}