MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-04-20 13:31:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

[maven] IDEA-313767 code cleanup

Browse Source 
GitOrigin-RevId: d57ecea9e6f91bfaab850825eecba3f53d38c91d
This commit is contained in:
Dmitry Kichinsky
2023-05-10 11:58:23 +02:00
committed by intellij-monorepo-bot
parent ba3640debe
commit 77b34660f3
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectReader.java
View File

@@ -522,6 +522,7 @@ public final class MavenProjectReader {
throws MavenProcessCanceledException {
return resolveProject(generalSettings, embedder, files, explicitProfiles, locator, null);
}
public Collection<MavenProjectReaderResult> resolveProject(MavenGeneralSettings generalSettings,
MavenEmbedderWrapper embedder,
Collection<VirtualFile> files,

16
plugins/maven/src/main/java/org/jetbrains/idea/maven/server/MavenEmbedderWrapper.java
View File

@@ -130,12 +130,12 @@ public abstract class MavenEmbedderWrapper extends MavenRemoteObjectWrapper<Mave
@NotNull
public Collection<MavenServerExecutionResult> resolveProject(@NotNull Collection<VirtualFile> files,
@NotNull MavenExplicitProfiles explicitProfiles,
@NotNull MavenProgressIndicator progressIndicator)
@Nullable MavenProgressIndicator progressIndicator)
throws MavenProcessCanceledException {
Transformer transformer = files.isEmpty() ?
Transformer.ID :
RemotePathTransformerFactory.createForProject(myProject);
final List<File> ioFiles = ContainerUtil.map(files, file -> new File(transformer.toRemotePath(file.getPath())));
List<File> ioFiles = ContainerUtil.map(files, file -> new File(transformer.toRemotePath(file.getPath())));
var results = runLongRunningTask(
(embedder, longRunningTaskId) ->
@@ -158,16 +158,16 @@ public abstract class MavenEmbedderWrapper extends MavenRemoteObjectWrapper<Mave
}
@Nullable
public String evaluateEffectivePom(@NotNull final VirtualFile file,
@NotNull final Collection<String> activeProfiles,
@NotNull final Collection<String> inactiveProfiles) throws MavenProcessCanceledException {
public String evaluateEffectivePom(@NotNull VirtualFile file,
@NotNull Collection<String> activeProfiles,
@NotNull Collection<String> inactiveProfiles) throws MavenProcessCanceledException {
return evaluateEffectivePom(new File(file.getPath()), activeProfiles, inactiveProfiles);
}
@Nullable
public String evaluateEffectivePom(@NotNull final File file,
@NotNull final Collection<String> activeProfiles,
@NotNull final Collection<String> inactiveProfiles) throws MavenProcessCanceledException {
public String evaluateEffectivePom(@NotNull File file,
@NotNull Collection<String> activeProfiles,
@NotNull Collection<String> inactiveProfiles) throws MavenProcessCanceledException {
return performCancelable(() -> getOrCreateWrappee()
.evaluateEffectivePom(file, new ArrayList<>(activeProfiles), new ArrayList<>(inactiveProfiles), ourToken));
}