From af6ecf90bcbf11ab883e33db518bfffbbe92b23e Mon Sep 17 00:00:00 2001 From: Dennis Ushakov Date: Mon, 30 Nov 2015 15:45:42 +0300 Subject: [PATCH] find same-named module in case of multi-module project --- .../renameProject/RenameProjectAction.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/platform/lang-impl/src/com/intellij/platform/renameProject/RenameProjectAction.java b/platform/lang-impl/src/com/intellij/platform/renameProject/RenameProjectAction.java index 1cc9bb910a13..31b8985d000c 100644 --- a/platform/lang-impl/src/com/intellij/platform/renameProject/RenameProjectAction.java +++ b/platform/lang-impl/src/com/intellij/platform/renameProject/RenameProjectAction.java @@ -3,7 +3,6 @@ package com.intellij.platform.renameProject; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.CommonDataKeys; import com.intellij.openapi.actionSystem.DataContext; -import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; @@ -11,7 +10,9 @@ import com.intellij.openapi.project.DumbAwareAction; import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ex.ProjectEx; import com.intellij.openapi.ui.Messages; +import com.intellij.openapi.util.Condition; import com.intellij.refactoring.RefactoringBundle; +import com.intellij.util.containers.ContainerUtil; /** * @author lene @@ -37,14 +38,13 @@ public class RenameProjectAction extends DumbAwareAction { final DataContext dataContext = e.getDataContext(); final Project project = CommonDataKeys.PROJECT.getData(dataContext); LOG.assertTrue(project instanceof ProjectEx); - Module module; - Module[] modules = ModuleManager.getInstance(project).getModules(); - if (modules.length == 1 && project.getName().equals(modules[0].getName())) { - module = modules[0]; - } - else { - module = null; - } + final Module[] modules = ModuleManager.getInstance(project).getModules(); + final Module module = ContainerUtil.find(modules, new Condition() { + @Override + public boolean value(Module module) { + return project.getName().equals(module.getName()); + } + }); Messages.showInputDialog(project, RefactoringBundle.message("enter.new.project.name"), RefactoringBundle.message("rename.project"), Messages.getQuestionIcon(), project.getName(),