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 build: inefficient 'intersects' method removed

Browse Source
This commit is contained in:
nik
2014-12-16 10:37:33 +03:00
parent 148c5da120
commit 7d62e86b64
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jps/jps-builders/src/org/jetbrains/jps/incremental/FSOperations.java
+2 -1
View File
@@ -17,6 +17,7 @@ package org.jetbrains.jps.incremental;
import com.intellij.openapi.util.io.FileSystemUtil;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.util.containers.ContainerUtil;
import gnu.trove.THashSet;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
@@ -151,7 +152,7 @@ public class FSOperations {
for (final BuildTarget<?> target : targetChunk.getTargets()) {
if (target instanceof ModuleBuildTarget) {
final Set<JpsModule> deps = getDependentModulesRecursively(((ModuleBuildTarget)target).getModule(), classpathKind);
if (Utils.intersects(deps, modules)) {
if (ContainerUtil.intersects(deps, modules)) {
for (BuildTarget<?> buildTarget : targetChunk.getTargets()) {
if (buildTarget instanceof ModuleBuildTarget) {
dirtyTargets.add((ModuleBuildTarget)buildTarget);
jps/jps-builders/src/org/jetbrains/jps/incremental/Utils.java
+3 -9
View File
@@ -22,14 +22,15 @@ import com.intellij.openapi.util.text.StringUtil;
import com.intellij.util.PathUtilRt;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.jps.builders.BuildTarget;
import org.jetbrains.jps.model.module.JpsModule;
import org.jetbrains.jps.model.serialization.JpsProjectLoader;
import org.jetbrains.jps.model.serialization.PathMacroUtil;
import java.io.File;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.*;
import java.util.Collection;
import java.util.Locale;
import java.util.Map;
/**
* @author Eugene Zhuravlev
@@ -122,13 +123,6 @@ public class Utils {
return new File(toURI(path));
}
public static boolean intersects(Set<JpsModule> set1, Set<JpsModule> set2) {
if (set1.size() < set2.size()) {
return new HashSet<JpsModule>(set1).removeAll(set2);
}
return new HashSet<JpsModule>(set2).removeAll(set1);
}
public static boolean errorsDetected(CompileContext context) {
return ERRORS_DETECTED_KEY.get(context, Boolean.FALSE);
}