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

gradle: fix orphaned data computation

Browse Source
This commit is contained in:
Vladislav.Soroka
2016-03-03 17:48:04 +03:00
parent 740046c457
commit f714d40f7b
3 changed files with 8 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/AbstractModuleDataService.java
+4
View File
@@ -354,6 +354,10 @@ public abstract class AbstractModuleDataService<E extends ModuleData> extends Ab
}
setBytecodeTargetLevel(project, module, moduleDataNode.getData());
}
for (Module module : modelsProvider.getModules()) {
module.putUserData(MODULE_DATA_KEY, null);
}
}
@Override
platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/ModuleDataService.java
+3 -16
View File
@@ -19,7 +19,6 @@ import com.intellij.openapi.externalSystem.model.DataNode;
import com.intellij.openapi.externalSystem.model.Key;
import com.intellij.openapi.externalSystem.model.ProjectKeys;
import com.intellij.openapi.externalSystem.model.project.ModuleData;
import com.intellij.openapi.externalSystem.model.project.OrderAware;
import com.intellij.openapi.externalSystem.model.project.ProjectData;
import com.intellij.openapi.externalSystem.service.project.IdeModifiableModelsProvider;
import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil;
@@ -28,12 +27,11 @@ import com.intellij.openapi.externalSystem.util.Order;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Computable;
import com.intellij.openapi.util.Condition;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import java.util.*;
import java.util.Collection;
import java.util.List;
/**
* Encapsulates functionality of importing external system module to the intellij project.
@@ -67,18 +65,7 @@ public class ModuleDataService extends AbstractModuleDataService<ModuleData> {
final String rootProjectPath = ExternalSystemApiUtil.getExternalRootProjectPath(module);
if (projectData.getLinkedExternalProjectPath().equals(rootProjectPath)) {
final String projectPath = ExternalSystemApiUtil.getExternalProjectPath(module);
final String projectId = ExternalSystemApiUtil.getExternalProjectId(module);
final DataNode<ModuleData> found = ContainerUtil.find(toImport, new Condition<DataNode<ModuleData>>() {
@Override
public boolean value(DataNode<ModuleData> node) {
final ModuleData moduleData = node.getData();
return moduleData.getId().equals(projectId) && moduleData.getLinkedExternalProjectPath().equals(projectPath);
}
});
if (found == null || !FileUtil.pathsEqual(module.getModuleFilePath(), found.getData().getModuleFilePath())) {
if (module.getUserData(AbstractModuleDataService.MODULE_DATA_KEY) == null) {
orphanIdeModules.add(module);
}
}
plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/data/GradleSourceSetDataService.java
+1 -11
View File
@@ -26,7 +26,6 @@ import com.intellij.openapi.externalSystem.util.Order;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Computable;
import com.intellij.openapi.util.Condition;
import com.intellij.util.containers.ContainerUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.plugins.gradle.model.data.GradleSourceSetData;
@@ -66,16 +65,7 @@ public class GradleSourceSetDataService extends AbstractModuleDataService<Gradle
final String rootProjectPath = ExternalSystemApiUtil.getExternalRootProjectPath(module);
if (projectData.getLinkedExternalProjectPath().equals(rootProjectPath)) {
final String projectId = ExternalSystemApiUtil.getExternalProjectId(module);
final DataNode<GradleSourceSetData> found = ContainerUtil.find(toImport, new Condition<DataNode<GradleSourceSetData>>() {
@Override
public boolean value(DataNode<GradleSourceSetData> node) {
return node.getData().getId().equals(projectId);
}
});
if (found == null) {
if (module.getUserData(AbstractModuleDataService.MODULE_DATA_KEY) == null) {
orphanIdeModules.add(module);
}
}