From 5e48524081b234072c30186b0d13d03245bc85e9 Mon Sep 17 00:00:00 2001 From: peter Date: Thu, 14 Nov 2013 15:44:39 +0100 Subject: [PATCH] remove external annotation root duplicates resulting by several modules using the same sdk --- .../codeInsight/ReadableExternalAnnotationsManager.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/java/java-indexing-impl/src/com/intellij/codeInsight/ReadableExternalAnnotationsManager.java b/java/java-indexing-impl/src/com/intellij/codeInsight/ReadableExternalAnnotationsManager.java index 9e99f850a1b7..d9b74d6700ef 100644 --- a/java/java-indexing-impl/src/com/intellij/codeInsight/ReadableExternalAnnotationsManager.java +++ b/java/java-indexing-impl/src/com/intellij/codeInsight/ReadableExternalAnnotationsManager.java @@ -23,9 +23,7 @@ import com.intellij.psi.PsiManager; import com.intellij.util.ThreeState; import org.jetbrains.annotations.NotNull; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; +import java.util.*; public class ReadableExternalAnnotationsManager extends BaseExternalAnnotationsManager { @NotNull private volatile ThreeState myHasAnyAnnotationsRoots = ThreeState.UNSURE; @@ -56,13 +54,13 @@ public class ReadableExternalAnnotationsManager extends BaseExternalAnnotationsM @NotNull protected List getExternalAnnotationsRoots(@NotNull VirtualFile libraryFile) { ProjectFileIndex fileIndex = ProjectRootManager.getInstance(myPsiManager.getProject()).getFileIndex(); - List result = new ArrayList(); + Set result = new LinkedHashSet(); for (OrderEntry entry : fileIndex.getOrderEntriesForFile(libraryFile)) { if (!(entry instanceof ModuleOrderEntry)) { Collections.addAll(result, AnnotationOrderRootType.getFiles(entry)); } } - return result; + return new ArrayList(result); } @Override