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

external system: fix dependency import for renamed modules

Browse Source
This commit is contained in:
Vladislav.Soroka
2016-01-28 19:33:35 +03:00
parent 7cc5ad9af3
commit d1f89dde8c
3 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/AbstractIdeModifiableModelsProvider.java
+7
View File
@@ -129,6 +129,13 @@ public abstract class AbstractIdeModifiableModelsProvider extends IdeModelsProvi
return module;
}
@Nullable
@Override
public Module findIdeModule(@NotNull String ideModuleName) {
Module module = getModifiableModuleModel().findModuleByName(ideModuleName);
return module == null ? getModifiableModuleModel().getModuleToBeRenamed(ideModuleName) : module;
}
@Nullable
@Override
public Library findIdeLibrary(@NotNull LibraryData libraryData) {
platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/AbstractDependencyDataService.java
+10 -5
View File
@@ -22,12 +22,14 @@ import com.intellij.openapi.externalSystem.service.project.IdeModifiableModelsPr
import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil;
import com.intellij.openapi.externalSystem.util.ExternalSystemConstants;
import com.intellij.openapi.externalSystem.util.Order;
import com.intellij.openapi.module.ModifiableModuleModel;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.project.ProjectBundle;
import com.intellij.openapi.roots.*;
import com.intellij.openapi.util.Computable;
import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.ObjectUtils;
import com.intellij.util.PathUtil;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.util.containers.ContainerUtilRt;
@@ -98,6 +100,7 @@ public abstract class AbstractDependencyDataService<E extends AbstractDependency
byModuleName.putValue(data.getOwnerModule().getInternalName(), getInternalName(data));
}
final ModifiableModuleModel modifiableModuleModel = modelsProvider.getModifiableModuleModel();
List<I> orphanEntries = ContainerUtil.newSmartList();
for (Module module : modelsProvider.getModules(projectData)) {
for (OrderEntry entry : modelsProvider.getOrderEntries(module)) {
@@ -107,11 +110,13 @@ public abstract class AbstractDependencyDataService<E extends AbstractDependency
entry.getUrls(OrderRootType.CLASSES).length == 0) {
continue;
}
//noinspection unchecked
if (getOrderEntryType().isInstance(entry) &&
!byModuleName.get(entry.getOwnerModule().getName()).contains(getOrderEntryName((I)entry))) {
if (getOrderEntryType().isInstance(entry)) {
final String moduleName = ObjectUtils.chooseNotNull(modifiableModuleModel.getNewName(entry.getOwnerModule()), entry.getOwnerModule().getName()) ;
//noinspection unchecked
orphanEntries.add((I)entry);
if (!byModuleName.get(moduleName).contains(getOrderEntryName(modelsProvider, (I)entry))) {
//noinspection unchecked
orphanEntries.add((I)entry);
}
}
}
}
@@ -124,7 +129,7 @@ public abstract class AbstractDependencyDataService<E extends AbstractDependency
@NotNull
protected abstract Class<I> getOrderEntryType();
protected String getOrderEntryName(@NotNull I orderEntry) {
protected String getOrderEntryName(@NotNull IdeModifiableModelsProvider modelsProvider, @NotNull I orderEntry) {
return orderEntry.getPresentableName();
}
platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/ModuleDependencyDataService.java
+10 -2
View File
@@ -57,8 +57,16 @@ public class ModuleDependencyDataService extends AbstractDependencyDataService<M
}
@Override
protected String getOrderEntryName(@NotNull ModuleOrderEntry orderEntry) {
return orderEntry.getModuleName();
protected String getOrderEntryName(@NotNull IdeModifiableModelsProvider modelsProvider, @NotNull ModuleOrderEntry orderEntry) {
String moduleName = orderEntry.getModuleName();
final Module orderEntryModule = orderEntry.getModule();
if(orderEntryModule != null) {
final String newName = modelsProvider.getModifiableModuleModel().getNewName(orderEntryModule);
if (newName != null) {
moduleName = newName;
}
}
return moduleName;
}
@Override