diff --git a/idea/src/org/jetbrains/jet/plugin/framework/LibraryPresentationProviderUtil.java b/idea/src/org/jetbrains/jet/plugin/framework/LibraryPresentationProviderUtil.java index 5a6cd31d66c..b395f3ee1df 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/LibraryPresentationProviderUtil.java +++ b/idea/src/org/jetbrains/jet/plugin/framework/LibraryPresentationProviderUtil.java @@ -17,14 +17,13 @@ package org.jetbrains.jet.plugin.framework; import com.intellij.openapi.roots.OrderRootType; -import com.intellij.openapi.roots.libraries.*; -import com.intellij.openapi.util.Ref; -import com.intellij.openapi.vfs.VirtualFile; +import com.intellij.openapi.roots.libraries.Library; +import com.intellij.openapi.roots.libraries.LibraryPresentationProvider; +import com.intellij.openapi.roots.libraries.LibraryProperties; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import java.util.Arrays; -import java.util.List; public class LibraryPresentationProviderUtil { private LibraryPresentationProviderUtil() {} @@ -33,34 +32,8 @@ public class LibraryPresentationProviderUtil { return getLibraryProperties(provider, library) != null; } - public static boolean isDetected(@NotNull LibraryPresentationProvider provider, @NotNull List classesRoots) { - return cachedDetect(provider, classesRoots) != null; - } - @Nullable public static LP getLibraryProperties(@NotNull LibraryPresentationProvider provider, @NotNull Library library) { - return cachedDetect(provider, Arrays.asList(library.getFiles(OrderRootType.CLASSES))); - } - - @Nullable - private static LP cachedDetect(@NotNull final LibraryPresentationProvider provider, @NotNull List classesRoots) { - final Ref propertiesRef = new Ref(); - - LibraryDetectionManager.getInstance().processProperties( - classesRoots, - new LibraryDetectionManager.LibraryPropertiesProcessor() { - @Override - public

boolean processProperties(@NotNull LibraryKind processedKind, @NotNull P properties) { - if (provider.getKind().equals(processedKind)) { - //noinspection unchecked - propertiesRef.set((LP)properties); - return false; - } - - return true; - } - }); - - return propertiesRef.get(); + return provider.detect(Arrays.asList(library.getFiles(OrderRootType.CLASSES))); } }