From ffcc579bbedca9223259487bba714d02e81e038d Mon Sep 17 00:00:00 2001 From: Alexey Kudravtsev Date: Tue, 11 Dec 2018 15:48:54 +0300 Subject: [PATCH] cleanup --- .../RepositoryLibrarySynchronizer.java | 46 +++++++++---------- .../psi/util/PsiModificationTracker.java | 2 +- .../containers/ConcurrentWeakHashMap.java | 2 + .../util/containers/ContainerUtil.java | 2 +- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/java/idea-ui/src/com/intellij/jarRepository/RepositoryLibrarySynchronizer.java b/java/idea-ui/src/com/intellij/jarRepository/RepositoryLibrarySynchronizer.java index 48031992c11b..2f99274968e9 100644 --- a/java/idea-ui/src/com/intellij/jarRepository/RepositoryLibrarySynchronizer.java +++ b/java/idea-ui/src/com/intellij/jarRepository/RepositoryLibrarySynchronizer.java @@ -15,7 +15,6 @@ */ package com.intellij.jarRepository; -import com.google.common.base.Predicate; import com.intellij.ProjectTopics; import com.intellij.notification.Notification; import com.intellij.notification.NotificationType; @@ -46,6 +45,7 @@ import org.jetbrains.idea.maven.utils.library.RepositoryLibraryProperties; import org.jetbrains.idea.maven.utils.library.RepositoryUtils; import java.util.*; +import java.util.function.Predicate; /** * @author gregsh @@ -69,21 +69,21 @@ public class RepositoryLibrarySynchronizer implements StartupActivity, DumbAware return false; } - public static Set collectLibraries(final @NotNull Project project, final @NotNull Predicate predicate) { + public static Set collectLibraries(@NotNull final Project project, @NotNull final Predicate predicate) { final Set result = new LinkedHashSet<>(); ApplicationManager.getApplication().runReadAction(() -> { if (project.isDisposed()) return; for (final Module module : ModuleManager.getInstance(project).getModules()) { OrderEnumerator.orderEntries(module).withoutSdk().forEachLibrary(library -> { - if (predicate.apply(library)) { + if (predicate.test(library)) { result.add(library); } return true; }); } for (Library library : ProjectLibraryTable.getInstance(project).getLibraries()) { - if (predicate.apply(library)) { + if (predicate.test(library)) { result.add(library); } } @@ -145,27 +145,25 @@ public class RepositoryLibrarySynchronizer implements StartupActivity, DumbAware @Override public void runActivity(@NotNull final Project project) { - final Runnable syncTask = () -> { - final Collection toSync = collectLibraries(project, library -> { - if (library instanceof LibraryEx) { - final LibraryEx libraryEx = (LibraryEx)library; - return libraryEx.getProperties() instanceof RepositoryLibraryProperties && - isLibraryNeedToBeReloaded(libraryEx, (RepositoryLibraryProperties)libraryEx.getProperties()); - } - return false; - }); - - ApplicationManager.getApplication().invokeLater((DumbAwareRunnable)() -> { - for (Library library : toSync) { - if (LibraryTableImplUtil.isValidLibrary(library)) { - RepositoryUtils.reloadDependencies(project, (LibraryEx)library); - } - } - }, project.getDisposed()); - }; - - if (!ApplicationManager.getApplication().isUnitTestMode()) { + final Runnable syncTask = () -> { + final Collection toSync = collectLibraries(project, library -> { + if (library instanceof LibraryEx) { + final LibraryEx libraryEx = (LibraryEx)library; + return libraryEx.getProperties() instanceof RepositoryLibraryProperties && + isLibraryNeedToBeReloaded(libraryEx, (RepositoryLibraryProperties)libraryEx.getProperties()); + } + return false; + }); + + ApplicationManager.getApplication().invokeLater((DumbAwareRunnable)() -> { + for (Library library : toSync) { + if (LibraryTableImplUtil.isValidLibrary(library)) { + RepositoryUtils.reloadDependencies(project, (LibraryEx)library); + } + } + }, project.getDisposed()); + }; project.getMessageBus().connect().subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootListener() { private final Alarm myAlarm = new Alarm(Alarm.ThreadToUse.POOLED_THREAD, project); @Override diff --git a/platform/core-api/src/com/intellij/psi/util/PsiModificationTracker.java b/platform/core-api/src/com/intellij/psi/util/PsiModificationTracker.java index 80ec171559ae..9abda5f7822f 100644 --- a/platform/core-api/src/com/intellij/psi/util/PsiModificationTracker.java +++ b/platform/core-api/src/com/intellij/psi/util/PsiModificationTracker.java @@ -50,7 +50,6 @@ public interface PsiModificationTracker extends ModificationTracker { } /** - * @param project * @return The instance of {@link PsiModificationTracker} corresponding to the given project. */ public static PsiModificationTracker getInstance(Project project) { @@ -127,6 +126,7 @@ public interface PsiModificationTracker extends ModificationTracker { * A listener to be notified on any PSI modification count change (which happens on any physical PSI change). * @see #TOPIC */ + @FunctionalInterface interface Listener { /** diff --git a/platform/util/src/com/intellij/util/containers/ConcurrentWeakHashMap.java b/platform/util/src/com/intellij/util/containers/ConcurrentWeakHashMap.java index 875be7188e9a..47e1c02c8112 100644 --- a/platform/util/src/com/intellij/util/containers/ConcurrentWeakHashMap.java +++ b/platform/util/src/com/intellij/util/containers/ConcurrentWeakHashMap.java @@ -72,11 +72,13 @@ public final class ConcurrentWeakHashMap extends ConcurrentRefHashMap(key, hashingStrategy.computeHashCode(key), hashingStrategy, value, myReferenceQueue); } + @Deprecated public ConcurrentWeakHashMap(int initialCapacity) { super(initialCapacity); DeprecatedMethodException.report("Use com.intellij.util.containers.ConcurrentFactoryMap.createConcurrentWeakMap instead"); } + @Deprecated public ConcurrentWeakHashMap() { DeprecatedMethodException.report("Use com.intellij.util.containers.ConcurrentFactoryMap.createConcurrentWeakMap instead"); } diff --git a/platform/util/src/com/intellij/util/containers/ContainerUtil.java b/platform/util/src/com/intellij/util/containers/ContainerUtil.java index 462d254806a9..cb65db4aadd9 100644 --- a/platform/util/src/com/intellij/util/containers/ContainerUtil.java +++ b/platform/util/src/com/intellij/util/containers/ContainerUtil.java @@ -1900,7 +1900,7 @@ public class ContainerUtil extends ContainerUtilRt { @NotNull @Contract(pure=true) public static List map(@NotNull Iterable iterable, @NotNull Function mapping) { - List result = new ArrayList(iterable instanceof Collection ? ((Collection)iterable).size() : 10); + List result = new ArrayList(iterable instanceof Collection ? ((Collection)iterable).size() : 10); for (T t : iterable) { result.add(mapping.fun(t)); }