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

cleanup

Browse Source 
GitOrigin-RevId: 2c46061ce7c1de9bbc6fd9c4b58d075add5e5ac5
This commit is contained in:
Vladimir Krivosheev
2020-11-02 15:04:43 +00:00
committed by intellij-monorepo-bot
parent 10f8b605b9
commit 378f89e27d
2 changed files with 20 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/gradle/java/src/integrations/javaee/JavaEEGradleProjectResolverExtension.java
+13 -17
View File
@@ -1,4 +1,4 @@
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package org.jetbrains.plugins.gradle.integrations.javaee;
import com.intellij.openapi.externalSystem.model.DataNode;
@@ -49,19 +49,15 @@ public class JavaEEGradleProjectResolverExtension extends AbstractProjectResolve
@Override
public void populateModuleExtraModels(@NotNull IdeaModule gradleModule, @NotNull final DataNode<ModuleData> ideModule) {
DataNode<ProjectData> projectDataNode = ideModule.getParent(ProjectData.class);
NotNullLazyValue<DataNode<? extends ModuleData>> findTargetModuleNode = new NotNullLazyValue<DataNode<? extends ModuleData>>() {
@NotNull
@Override
protected DataNode<? extends ModuleData> compute() {
final String mainSourceSetModuleId = ideModule.getData().getId() + ":main";
DataNode<? extends ModuleData> targetModuleNode =
ExternalSystemApiUtil.find(ideModule, GradleSourceSetData.KEY, node -> mainSourceSetModuleId.equals(node.getData().getId()));
if (targetModuleNode == null) {
targetModuleNode = ideModule;
}
return targetModuleNode;
NotNullLazyValue<DataNode<? extends ModuleData>> findTargetModuleNode = NotNullLazyValue.createValue(() -> {
final String mainSourceSetModuleId = ideModule.getData().getId() + ":main";
DataNode<? extends ModuleData> targetModuleNode =
ExternalSystemApiUtil.find(ideModule, GradleSourceSetData.KEY, node -> mainSourceSetModuleId.equals(node.getData().getId()));
if (targetModuleNode == null) {
targetModuleNode = ideModule;
}
};
return targetModuleNode;
});
Map<String/* artifact path */, String /* module id*/> archivesMap;
if (projectDataNode != null) {
@@ -139,9 +135,9 @@ public class JavaEEGradleProjectResolverExtension extends AbstractProjectResolve
return ear;
});
final Collection<DependencyData> deployDependencies = getDependencies(
final Collection<DependencyData<?>> deployDependencies = getDependencies(
resolverCtx, projectDataNode, moduleNode, earConfiguration.getDeployDependencies());
final Collection<DependencyData> earlibDependencies = getDependencies(
final Collection<DependencyData<?>> earlibDependencies = getDependencies(
resolverCtx, projectDataNode, moduleNode, earConfiguration.getEarlibDependencies());
moduleNode.createChild(EarConfigurationModelData.KEY,
new EarConfigurationModelData(GradleConstants.SYSTEM_ID, warModels, deployDependencies, earlibDependencies));
@@ -167,7 +163,7 @@ public class JavaEEGradleProjectResolverExtension extends AbstractProjectResolve
@SuppressWarnings("unchecked")
private static Collection<DependencyData> getDependencies(@NotNull ProjectResolverContext resolverCtx,
private static Collection<DependencyData<?>> getDependencies(@NotNull ProjectResolverContext resolverCtx,
@NotNull DataNode<ProjectData> ideProject,
@NotNull DataNode<? extends ModuleData> moduleDataNode,
@NotNull Collection<ExternalDependency> dependencies)
@@ -206,6 +202,6 @@ public class JavaEEGradleProjectResolverExtension extends AbstractProjectResolve
}
final Collection<DataNode<?>> dataNodes = findAllRecursively(fakeNode, node -> node.getData() instanceof DependencyData);
return ContainerUtil.map(dataNodes, node -> (DependencyData)node.getData());
return ContainerUtil.map(dataNodes, node -> (DependencyData<?>)node.getData());
}
}
plugins/gradle/src/org/jetbrains/plugins/gradle/model/data/EarConfigurationModelData.java
+7 -7
View File
@@ -1,4 +1,4 @@
// Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
// Copyright 2000-2020 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file.
package org.jetbrains.plugins.gradle.model.data;
import com.intellij.openapi.externalSystem.model.Key;
@@ -20,15 +20,15 @@ public final class EarConfigurationModelData extends AbstractExternalEntityData
@NotNull
private final List<Ear> ears;
@NotNull
private final Collection<DependencyData> deployDependencies;
private final Collection<DependencyData<?>> deployDependencies;
@NotNull
private final Collection<DependencyData> earlibDependencies;
private final Collection<DependencyData<?>> earlibDependencies;
@PropertyMapping({"owner", "ears", "deployDependencies", "earlibDependencies"})
public EarConfigurationModelData(@NotNull ProjectSystemId owner,
@NotNull List<Ear> ears,
@NotNull Collection<DependencyData> deployDependencies,
@NotNull Collection<DependencyData> earlibDependencies) {
@NotNull Collection<DependencyData<?>> deployDependencies,
@NotNull Collection<DependencyData<?>> earlibDependencies) {
super(owner);
this.ears = ears;
@@ -52,12 +52,12 @@ public final class EarConfigurationModelData extends AbstractExternalEntityData
}
@NotNull
public Collection<DependencyData> getDeployDependencies() {
public Collection<DependencyData<?>> getDeployDependencies() {
return deployDependencies;
}
@NotNull
public Collection<DependencyData> getEarlibDependencies() {
public Collection<DependencyData<?>> getEarlibDependencies() {
return earlibDependencies;
}