diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/FSOperations.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/FSOperations.java index 979ae3d68004..f20963439f49 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/incremental/FSOperations.java +++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/FSOperations.java @@ -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 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); diff --git a/jps/jps-builders/src/org/jetbrains/jps/incremental/Utils.java b/jps/jps-builders/src/org/jetbrains/jps/incremental/Utils.java index f99ced20ef71..4f0938f61ee6 100644 --- a/jps/jps-builders/src/org/jetbrains/jps/incremental/Utils.java +++ b/jps/jps-builders/src/org/jetbrains/jps/incremental/Utils.java @@ -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 set1, Set set2) { - if (set1.size() < set2.size()) { - return new HashSet(set1).removeAll(set2); - } - return new HashSet(set2).removeAll(set1); - } - public static boolean errorsDetected(CompileContext context) { return ERRORS_DETECTED_KEY.get(context, Boolean.FALSE); }