azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't use caching LibraryDetectionManager because it isn't updated properly

Browse Source
This commit is contained in:
Nikolay Krasko
2013-03-25 14:31:21 +04:00
parent 14a6cf3c8f
commit 314efa3372
1 changed files with 4 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/src/org/jetbrains/jet/plugin/framework/LibraryPresentationProviderUtil.java
+4 -31
View File
@@ -17,14 +17,13 @@
package org.jetbrains.jet.plugin.framework; package org.jetbrains.jet.plugin.framework;
import com.intellij.openapi.roots.OrderRootType; import com.intellij.openapi.roots.OrderRootType;
import com.intellij.openapi.roots.libraries.*; import com.intellij.openapi.roots.libraries.Library;
import com.intellij.openapi.util.Ref; import com.intellij.openapi.roots.libraries.LibraryPresentationProvider;
import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.roots.libraries.LibraryProperties;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.Nullable;
import java.util.Arrays; import java.util.Arrays;
import java.util.List;
public class LibraryPresentationProviderUtil { public class LibraryPresentationProviderUtil {
private LibraryPresentationProviderUtil() {} private LibraryPresentationProviderUtil() {}
@@ -33,34 +32,8 @@ public class LibraryPresentationProviderUtil {
return getLibraryProperties(provider, library) != null; return getLibraryProperties(provider, library) != null;
} }
public static <LP extends LibraryProperties> boolean isDetected(@NotNull LibraryPresentationProvider<LP> provider, @NotNull List<VirtualFile> classesRoots) {
return cachedDetect(provider, classesRoots) != null;
}
@Nullable @Nullable
public static <LP extends LibraryProperties> LP getLibraryProperties(@NotNull LibraryPresentationProvider<LP> provider, @NotNull Library library) { public static <LP extends LibraryProperties> LP getLibraryProperties(@NotNull LibraryPresentationProvider<LP> provider, @NotNull Library library) {
return cachedDetect(provider, Arrays.asList(library.getFiles(OrderRootType.CLASSES))); return provider.detect(Arrays.asList(library.getFiles(OrderRootType.CLASSES)));
}
@Nullable
private static <LP extends LibraryProperties> LP cachedDetect(@NotNull final LibraryPresentationProvider<LP> provider, @NotNull List<VirtualFile> classesRoots) {
final Ref<LP> propertiesRef = new Ref<LP>();
LibraryDetectionManager.getInstance().processProperties(
classesRoots,
new LibraryDetectionManager.LibraryPropertiesProcessor() {
@Override
public <P extends LibraryProperties> 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();
} }
} }