Merge branch 'master' of git.labs.intellij.net:idea/community

This commit is contained in:
Kirill Likhodedov
2010-05-31 19:21:04 +04:00
149 changed files with 3872 additions and 3751 deletions
@@ -15,23 +15,15 @@
*/
package com.intellij.execution.configurations;
import com.intellij.execution.ExecutionBundle;
import com.intellij.execution.JavaExecutionUtil;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleManager;
import com.intellij.openapi.module.ModuleUtil;
import com.intellij.openapi.project.Project;
import com.intellij.psi.JavaPsiFacade;
import com.intellij.psi.PsiClass;
import com.intellij.psi.PsiDocumentManager;
import com.intellij.psi.search.GlobalSearchScope;
import gnu.trove.THashSet;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import com.intellij.execution.*;
import com.intellij.openapi.module.*;
import com.intellij.openapi.project.*;
import com.intellij.psi.*;
import com.intellij.psi.search.*;
import gnu.trove.*;
import org.jetbrains.annotations.*;
import java.util.Arrays;
import java.util.Collection;
import java.util.Set;
import java.util.*;
/**
* @author spleaner
@@ -77,7 +69,11 @@ public class JavaRunConfigurationModule extends RunConfigurationModule {
return Arrays.asList(ModuleManager.getInstance(project).getModules());
}
else {
return ModuleUtil.collectModulesDependsOn(modules);
final Set<Module> result = new HashSet<Module>();
for (Module module : modules) {
ModuleUtil.collectModulesDependsOn(module, result);
}
return result;
}
}