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: check gradle settings for linked gradle projects instead of iterating over all modules to determine if there is at least one gradle module in the IDE project

Browse Source
This commit is contained in:
Vladislav.Soroka
2017-01-24 12:52:57 +03:00
parent 8f1de51a36
commit a765939281
2 changed files with 5 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/gradle/src/org/jetbrains/plugins/gradle/compiler/GradleBuildProcessParametersProvider.java
+3 -10
View File
@@ -17,9 +17,6 @@ package org.jetbrains.plugins.gradle.compiler;
import com.google.gson.Gson;
import com.intellij.compiler.server.BuildProcessParametersProvider;
import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil;
@@ -29,7 +26,7 @@ import groovy.lang.GroovyObject;
import org.apache.tools.ant.taskdefs.Ant;
import org.gradle.tooling.ProjectConnection;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.plugins.gradle.util.GradleConstants;
import org.jetbrains.plugins.gradle.settings.GradleSettings;
import org.slf4j.Logger;
import org.slf4j.impl.Log4jLoggerFactory;
@@ -56,12 +53,8 @@ public class GradleBuildProcessParametersProvider extends BuildProcessParameters
public List<String> getClassPath() {
List<String> result = ContainerUtil.newArrayList();
addGradleClassPath(result);
final ModuleManager moduleManager = ModuleManager.getInstance(myProject);
for (Module module : moduleManager.getModules()) {
if (ExternalSystemApiUtil.isExternalSystemAwareModule(GradleConstants.SYSTEM_ID, module)) {
addOtherClassPath(result);
break;
}
if (!GradleSettings.getInstance(myProject).getLinkedProjectsSettings().isEmpty()) {
addOtherClassPath(result);
}
return result;
}
plugins/gradle/src/org/jetbrains/plugins/gradle/execution/GradleConsoleFilterProvider.java
+2 -8
View File
@@ -18,9 +18,6 @@ package org.jetbrains.plugins.gradle.execution;
import com.intellij.execution.filters.ConsoleFilterProvider;
import com.intellij.execution.filters.Filter;
import com.intellij.execution.filters.RegexpFilter;
import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil;
import com.intellij.openapi.module.Module;
import com.intellij.openapi.module.ModuleManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.roots.ProjectRootModificationTracker;
import com.intellij.openapi.util.io.FileUtil;
@@ -29,7 +26,7 @@ import com.intellij.psi.util.CachedValue;
import com.intellij.psi.util.CachedValueProvider;
import com.intellij.util.CachedValueImpl;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.plugins.gradle.util.GradleConstants;
import org.jetbrains.plugins.gradle.settings.GradleSettings;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -60,10 +57,7 @@ public class GradleConsoleFilterProvider implements ConsoleFilterProvider {
}
private boolean isGradleProject() {
for (Module module : ModuleManager.getInstance(project).getModules()) {
if (ExternalSystemApiUtil.isExternalSystemAwareModule(GradleConstants.SYSTEM_ID, module)) return true;
}
return false;
return !GradleSettings.getInstance(project).getLinkedProjectsSettings().isEmpty();
}
},
};