From 5f5161cebb3d288f007ba37e6345f3c4e8bcd7f2 Mon Sep 17 00:00:00 2001 From: Nadya Zabrodina Date: Tue, 23 Jul 2013 14:14:35 +0400 Subject: [PATCH] EA-47764 if repository root is invalid (f.e. after renaming) it should not be compared with another and should not be added in ui components. --- .../dvcs/src/com/intellij/dvcs/repo/RepositoryUtil.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/platform/dvcs/src/com/intellij/dvcs/repo/RepositoryUtil.java b/platform/dvcs/src/com/intellij/dvcs/repo/RepositoryUtil.java index 21b898837bd3..4322064ffcac 100644 --- a/platform/dvcs/src/com/intellij/dvcs/repo/RepositoryUtil.java +++ b/platform/dvcs/src/com/intellij/dvcs/repo/RepositoryUtil.java @@ -16,12 +16,14 @@ package com.intellij.dvcs.repo; import com.intellij.openapi.diagnostic.Logger; +import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.Consumer; import com.intellij.util.Processor; +import com.intellij.util.containers.ContainerUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -120,7 +122,12 @@ public class RepositoryUtil { } public static List sortRepositories(@NotNull Collection repositories) { - List repos = new ArrayList(repositories); + List repos = ContainerUtil.filter(repositories, new Condition() { + @Override + public boolean value(T t) { + return t.getRoot().isValid(); + } + }); Collections.sort(repos, new Comparator() { @Override public int compare(Repository o1, Repository o2) {