diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/CleanStaleModuleOutputsActivity.kt b/java/compiler/impl/src/com/intellij/compiler/impl/CleanStaleModuleOutputsActivity.kt index d92422785ed1..49604542daff 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/CleanStaleModuleOutputsActivity.kt +++ b/java/compiler/impl/src/com/intellij/compiler/impl/CleanStaleModuleOutputsActivity.kt @@ -28,7 +28,7 @@ import java.io.File * Shows notification which suggests to delete stale output directories corresponding to renamed or deleted modules. Such directories may * be kept on disk because of a bug (https://youtrack.jetbrains.com/issue/IDEA-185574) in previous IntelliJ IDEA versions. */ -class CleanStaleModuleOutputsActivity : StartupActivity.Backgroundable { +class CleanStaleModuleOutputsActivity : StartupActivity.DumbAware { override fun runActivity(project: Project) { val markerFile = File(BuildManager.getInstance().getProjectSystemDirectory(project), "stale_outputs_checked") if (markerFile.exists()) return diff --git a/java/idea-ui/src/com/intellij/jarRepository/RepositoryLibrarySynchronizer.java b/java/idea-ui/src/com/intellij/jarRepository/RepositoryLibrarySynchronizer.java index 025f5732f486..ae5b9ece0bfd 100644 --- a/java/idea-ui/src/com/intellij/jarRepository/RepositoryLibrarySynchronizer.java +++ b/java/idea-ui/src/com/intellij/jarRepository/RepositoryLibrarySynchronizer.java @@ -48,7 +48,7 @@ import java.util.function.Predicate; /** * @author gregsh */ -public class RepositoryLibrarySynchronizer implements StartupActivity.Backgroundable{ +public class RepositoryLibrarySynchronizer implements StartupActivity.DumbAware { private static boolean isLibraryNeedToBeReloaded(LibraryEx library, RepositoryLibraryProperties properties) { String version = properties.getVersion(); if (version == null) { diff --git a/platform/analysis-impl/src/com/intellij/profile/codeInspection/ProjectInspectionProfileManager.kt b/platform/analysis-impl/src/com/intellij/profile/codeInspection/ProjectInspectionProfileManager.kt index df84b55fc651..d1239fdb83c0 100644 --- a/platform/analysis-impl/src/com/intellij/profile/codeInspection/ProjectInspectionProfileManager.kt +++ b/platform/analysis-impl/src/com/intellij/profile/codeInspection/ProjectInspectionProfileManager.kt @@ -129,7 +129,7 @@ class ProjectInspectionProfileManager(val project: Project) : BaseInspectionProf } @Suppress("unused") - private class ProjectInspectionProfileStartUpActivity : StartupActivity.Backgroundable { + private class ProjectInspectionProfileStartUpActivity : StartupActivity.DumbAware { override fun runActivity(project: Project) { val profileManager = getInstance(project) profileManager.initialLoadSchemesFuture diff --git a/platform/core-api/src/com/intellij/openapi/startup/StartupActivity.java b/platform/core-api/src/com/intellij/openapi/startup/StartupActivity.java index 9722765305f9..94f4ab1278cf 100644 --- a/platform/core-api/src/com/intellij/openapi/startup/StartupActivity.java +++ b/platform/core-api/src/com/intellij/openapi/startup/StartupActivity.java @@ -2,14 +2,13 @@ package com.intellij.openapi.startup; import com.intellij.openapi.extensions.ExtensionPointName; -import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; /** *
Runs an activity on project open.
* - *If the activity implements {@link DumbAware} interface, e.g. {@link Backgroundable}, it will be started in a pooled thread + *
If the activity implements {@link com.intellij.openapi.project.DumbAware} interface, e.g. {@link DumbAware}, it will be started in a pooled thread * under 'Loading Project' dialog, otherwise it will be started in the dispatch thread after the initialization.
* * @author Dmitry Avdeev @@ -31,5 +30,5 @@ public interface StartupActivity { void runActivity(@NotNull Project project); - interface Backgroundable extends StartupActivity, DumbAware {} + interface DumbAware extends StartupActivity, com.intellij.openapi.project.DumbAware {} } \ No newline at end of file diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ExternalSystemStartupActivity.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ExternalSystemStartupActivity.java index 73946710bc01..48755c419b1e 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ExternalSystemStartupActivity.java +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/ExternalSystemStartupActivity.java @@ -13,7 +13,7 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.startup.StartupActivity; import org.jetbrains.annotations.NotNull; -final class ExternalSystemStartupActivity implements StartupActivity.Backgroundable { +final class ExternalSystemStartupActivity implements StartupActivity.DumbAware { @Override public void runActivity(@NotNull final Project project) { ExternalProjectsManagerImpl.getInstance(project).init(); diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/ReprocessContentRootDataActivity.kt b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/ReprocessContentRootDataActivity.kt index 33eb8755ae07..41cc4091d480 100644 --- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/ReprocessContentRootDataActivity.kt +++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/ReprocessContentRootDataActivity.kt @@ -12,7 +12,7 @@ import com.intellij.openapi.module.ModuleManager import com.intellij.openapi.project.Project import com.intellij.openapi.startup.StartupActivity -class ReprocessContentRootDataActivity : StartupActivity.Backgroundable { +class ReprocessContentRootDataActivity : StartupActivity.DumbAware { private val LOG = Logger.getInstance(ReprocessContentRootDataActivity::class.java) override fun runActivity(project: Project) { diff --git a/platform/lang-impl/src/com/intellij/execution/startup/ProjectStartupRunner.java b/platform/lang-impl/src/com/intellij/execution/startup/ProjectStartupRunner.java index 2738df42ee96..bd8c0d1d5241 100644 --- a/platform/lang-impl/src/com/intellij/execution/startup/ProjectStartupRunner.java +++ b/platform/lang-impl/src/com/intellij/execution/startup/ProjectStartupRunner.java @@ -20,7 +20,7 @@ import java.util.List; /** * @author Irina.Chernushina on 8/19/2015. */ -public class ProjectStartupRunner implements StartupActivity.Backgroundable { +public class ProjectStartupRunner implements StartupActivity.DumbAware { @Override public void runActivity(@NotNull final Project project) { final ProjectStartupTaskManager projectStartupTaskManager = ProjectStartupTaskManager.getInstance(project); diff --git a/platform/lang-impl/src/com/intellij/ide/actions/PowerSaveModeNotifier.java b/platform/lang-impl/src/com/intellij/ide/actions/PowerSaveModeNotifier.java index 5a42fd1f95e3..087fb55de6d4 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/PowerSaveModeNotifier.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/PowerSaveModeNotifier.java @@ -18,7 +18,7 @@ import com.intellij.util.messages.MessageBusConnection; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -public final class PowerSaveModeNotifier implements StartupActivity.Backgroundable { +public final class PowerSaveModeNotifier implements StartupActivity.DumbAware { private static final NotificationGroup POWER_SAVE_MODE = NotificationGroup.balloonGroup("Power Save Mode"); private static final String IGNORE_POWER_SAVE_MODE = "ignore.power.save.mode"; diff --git a/platform/platform-impl/src/com/intellij/diagnostic/startUpPerformanceReporter/StartUpPerformanceReporter.kt b/platform/platform-impl/src/com/intellij/diagnostic/startUpPerformanceReporter/StartUpPerformanceReporter.kt index 86b5606fbe74..0ec53bcd8195 100644 --- a/platform/platform-impl/src/com/intellij/diagnostic/startUpPerformanceReporter/StartUpPerformanceReporter.kt +++ b/platform/platform-impl/src/com/intellij/diagnostic/startUpPerformanceReporter/StartUpPerformanceReporter.kt @@ -26,7 +26,7 @@ import java.util.concurrent.atomic.AtomicLong import java.util.function.Consumer import kotlin.Comparator -class StartUpPerformanceReporter : StartupActivity.Backgroundable { +class StartUpPerformanceReporter : StartupActivity.DumbAware { private val activationCount = AtomicInteger() // questions like "what if we have several projects to open? what if no projects at all?" are out of scope for now private val isLastEdtOptionTopHitProviderFinished = AtomicBoolean() diff --git a/platform/platform-impl/src/com/intellij/externalDependencies/impl/CheckRequiredPluginsActivity.java b/platform/platform-impl/src/com/intellij/externalDependencies/impl/CheckRequiredPluginsActivity.java index 21b6551e5e1b..a76d7408d969 100644 --- a/platform/platform-impl/src/com/intellij/externalDependencies/impl/CheckRequiredPluginsActivity.java +++ b/platform/platform-impl/src/com/intellij/externalDependencies/impl/CheckRequiredPluginsActivity.java @@ -26,7 +26,7 @@ import java.util.Set; /** * @author nik */ -public class CheckRequiredPluginsActivity implements StartupActivity.Backgroundable { +public class CheckRequiredPluginsActivity implements StartupActivity.DumbAware { private static final NotificationGroup NOTIFICATION_GROUP = new NotificationGroup("Required Plugins", NotificationDisplayType.BALLOON, true); @Override diff --git a/platform/platform-impl/src/com/intellij/ide/TipOfTheDayStartupActivity.java b/platform/platform-impl/src/com/intellij/ide/TipOfTheDayStartupActivity.java index 805ecbc044c2..34ef3241cd58 100644 --- a/platform/platform-impl/src/com/intellij/ide/TipOfTheDayStartupActivity.java +++ b/platform/platform-impl/src/com/intellij/ide/TipOfTheDayStartupActivity.java @@ -8,7 +8,7 @@ import com.intellij.openapi.startup.StartupActivity; import com.intellij.openapi.wm.ToolWindowManager; import org.jetbrains.annotations.NotNull; -public final class TipOfTheDayStartupActivity implements StartupActivity.Backgroundable { +public final class TipOfTheDayStartupActivity implements StartupActivity.DumbAware { private boolean myVeryFirstProjectOpening = true; @Override diff --git a/platform/platform-impl/src/com/intellij/ide/ui/OptionsTopHitProvider.java b/platform/platform-impl/src/com/intellij/ide/ui/OptionsTopHitProvider.java index f8536c854518..bf894c7f1ac0 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/OptionsTopHitProvider.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/OptionsTopHitProvider.java @@ -231,7 +231,7 @@ public abstract class OptionsTopHitProvider implements OptionsSearchTopHitProvid } } - static final class Activity extends PreloadingActivity implements StartupActivity.Backgroundable { + static final class Activity extends PreloadingActivity implements StartupActivity.DumbAware { Activity() { if (ApplicationManager.getApplication().isUnitTestMode()) { throw ExtensionNotApplicableException.INSTANCE; diff --git a/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/fileTypes/FileTypeExtensionUsagesCollectorStartupActivity.java b/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/fileTypes/FileTypeExtensionUsagesCollectorStartupActivity.java index f313d674c7a4..29cd961770fc 100644 --- a/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/fileTypes/FileTypeExtensionUsagesCollectorStartupActivity.java +++ b/platform/platform-impl/src/com/intellij/internal/statistic/collectors/fus/fileTypes/FileTypeExtensionUsagesCollectorStartupActivity.java @@ -20,7 +20,7 @@ import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.messages.MessageBusConnection; import org.jetbrains.annotations.NotNull; -public class FileTypeExtensionUsagesCollectorStartupActivity implements StartupActivity.Backgroundable { +public class FileTypeExtensionUsagesCollectorStartupActivity implements StartupActivity.DumbAware { private static final Key