MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-21 22:11:40 +07:00
Code Issues Packages Projects Releases Wiki Activity

[maven] IDEA-352520 processSkinnyWars: avoid using packagingResolvingContext

Browse Source 
GitOrigin-RevId: 69e5f160c19072f39450cda20ebaa793cbc49794
This commit is contained in:
Dmitry Kichinsky
2024-06-08 22:35:05 +02:00
committed by intellij-monorepo-bot
parent e3fd643f2b
commit 3531f75298
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
java/compiler/impl/src/com/intellij/packaging/impl/elements/LibraryPackagingElement.java
View File

@@ -256,11 +256,20 @@ public class LibraryPackagingElement extends ComplexPackagingElement<LibraryPack
@Nullable
public Library findLibrary(@NotNull PackagingElementResolvingContext context) {
return findLibrary(
context.getModulesProvider(),
(level, libraryName) -> {
return context.findLibrary(level, libraryName);
});
}
@Nullable
public Library findLibrary(@NotNull ModulesProvider modulesProvider,
@NotNull PackagingElementResolvingContext.LibraryFinder libraryFinder) {
String level = myLevel;
String myLibraryName1 = myLibraryName;
String moduleName = myModuleName;
if (myStorage != null) {
LibraryFilesPackagingElementEntity entity = (LibraryFilesPackagingElementEntity)getThisEntity();
level = getMyLevel(entity);
@@ -269,9 +278,8 @@ public class LibraryPackagingElement extends ComplexPackagingElement<LibraryPack
}
if (moduleName == null && level != null && myLibraryName1 != null) {
return context.findLibrary(level, myLibraryName1);
return libraryFinder.find(level, myLibraryName1);
}
final ModulesProvider modulesProvider = context.getModulesProvider();
final Module module;
if (moduleName != null) {
module = modulesProvider.getModule(moduleName);

5
java/compiler/openapi/src/com/intellij/packaging/elements/PackagingElementResolvingContext.java
View File

@@ -41,4 +41,9 @@ public interface PackagingElementResolvingContext {
@NotNull
ManifestFileProvider getManifestFileProvider();
@FunctionalInterface
interface LibraryFinder {
@Nullable Library find(@NotNull String level, @NotNull String libraryName);
}
}