From 325a0bcfa88aac915a5fb06f496f76f66f36dd70 Mon Sep 17 00:00:00 2001 From: Sergey Ignatov Date: Wed, 4 Sep 2019 22:40:12 +0300 Subject: [PATCH] clarify API: introduce StartupActivity.Background GitOrigin-RevId: abaa567957a7643a649aee8df75bcffd6d89f028 --- .../src/com/intellij/openapi/startup/StartupActivity.java | 3 ++- .../service/ExternalSystemStartupActivity.java | 2 +- .../project/manage/ReprocessContentRootDataActivity.kt | 2 +- .../src/com/intellij/diagnostic/MemorySizeConfigurator.kt | 2 +- .../intellij/diagnostic/WindowsDefenderCheckerActivity.kt | 2 +- .../com/intellij/ide/startup/impl/StartupManagerImpl.java | 6 +++--- .../PluginsAdvertiserStartupActivity.java | 2 +- .../git4idea/src/git4idea/config/GitSetupProjectConfig.kt | 2 +- .../com/jetbrains/python/packaging/PyPackagesUpdater.java | 2 +- python/src/com/jetbrains/python/sdk/PythonSdkUpdater.java | 2 +- 10 files changed, 13 insertions(+), 12 deletions(-) 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 94f4ab1278cf..4541f66fbc26 100644 --- a/platform/core-api/src/com/intellij/openapi/startup/StartupActivity.java +++ b/platform/core-api/src/com/intellij/openapi/startup/StartupActivity.java @@ -26,9 +26,10 @@ public interface StartupActivity { * immediately when this happens, so if you need to access other components, you're responsible for doing this in a * thread-safe way (e.g. by taking a read action to collect all the state you need).

*/ - ExtensionPointName BACKGROUND_POST_STARTUP_ACTIVITY = ExtensionPointName.create("com.intellij.backgroundPostStartupActivity"); + ExtensionPointName BACKGROUND_POST_STARTUP_ACTIVITY = ExtensionPointName.create("com.intellij.backgroundPostStartupActivity"); void runActivity(@NotNull Project project); interface DumbAware extends StartupActivity, com.intellij.openapi.project.DumbAware {} + interface Background extends StartupActivity {} } \ 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 48755c419b1e..a254b16f4952 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.DumbAware { +final class ExternalSystemStartupActivity implements StartupActivity.Background { @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 41cc4091d480..04dd2af6ee57 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.DumbAware { +class ReprocessContentRootDataActivity : StartupActivity.Background { private val LOG = Logger.getInstance(ReprocessContentRootDataActivity::class.java) override fun runActivity(project: Project) { diff --git a/platform/platform-impl/src/com/intellij/diagnostic/MemorySizeConfigurator.kt b/platform/platform-impl/src/com/intellij/diagnostic/MemorySizeConfigurator.kt index a67cbc54743a..31cdf850720e 100644 --- a/platform/platform-impl/src/com/intellij/diagnostic/MemorySizeConfigurator.kt +++ b/platform/platform-impl/src/com/intellij/diagnostic/MemorySizeConfigurator.kt @@ -13,7 +13,7 @@ import java.lang.management.ManagementFactory /** * @author yole */ -class MemorySizeConfigurator : StartupActivity { +class MemorySizeConfigurator : StartupActivity.Background { override fun runActivity(project: Project) { if (ApplicationManager.getApplication().isUnitTestMode) return diff --git a/platform/platform-impl/src/com/intellij/diagnostic/WindowsDefenderCheckerActivity.kt b/platform/platform-impl/src/com/intellij/diagnostic/WindowsDefenderCheckerActivity.kt index 05fed8636732..0d5d3a8e0618 100644 --- a/platform/platform-impl/src/com/intellij/diagnostic/WindowsDefenderCheckerActivity.kt +++ b/platform/platform-impl/src/com/intellij/diagnostic/WindowsDefenderCheckerActivity.kt @@ -17,7 +17,7 @@ import com.intellij.openapi.ui.Messages import com.intellij.util.ui.UIUtil import java.nio.file.Path -class WindowsDefenderCheckerActivity : StartupActivity { +class WindowsDefenderCheckerActivity : StartupActivity.Background { override fun runActivity(project: Project) { val app = ApplicationManager.getApplication() if (app.isUnitTestMode) return diff --git a/platform/platform-impl/src/com/intellij/ide/startup/impl/StartupManagerImpl.java b/platform/platform-impl/src/com/intellij/ide/startup/impl/StartupManagerImpl.java index 3dc017b4221f..7adbd32317af 100644 --- a/platform/platform-impl/src/com/intellij/ide/startup/impl/StartupManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/ide/startup/impl/StartupManagerImpl.java @@ -410,12 +410,12 @@ public class StartupManagerImpl extends StartupManagerEx implements Disposable { } public void scheduleBackgroundPostStartupActivities() { - List backgroundPostStartupActivities = StartupActivity.BACKGROUND_POST_STARTUP_ACTIVITY.getExtensionList(); + List backgroundPostStartupActivities = StartupActivity.BACKGROUND_POST_STARTUP_ACTIVITY.getExtensionList(); Extensions.getRootArea().getExtensionPoint(StartupActivity.BACKGROUND_POST_STARTUP_ACTIVITY).addExtensionPointListener( - new ExtensionPointListener() { + new ExtensionPointListener() { @Override - public void extensionAdded(@NotNull StartupActivity extension, @NotNull PluginDescriptor pluginDescriptor) { + public void extensionAdded(@NotNull StartupActivity.Background extension, @NotNull PluginDescriptor pluginDescriptor) { extension.runActivity(myProject); } }, false, this); diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiserStartupActivity.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiserStartupActivity.java index 1d455462418f..9dc5bf3a12bc 100644 --- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiserStartupActivity.java +++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/pluginsAdvertisement/PluginsAdvertiserStartupActivity.java @@ -26,7 +26,7 @@ import java.io.IOException; import java.net.UnknownHostException; import java.util.*; -final class PluginsAdvertiserStartupActivity implements StartupActivity.DumbAware { +final class PluginsAdvertiserStartupActivity implements StartupActivity.Background { @Override public void runActivity(@NotNull Project project) { Application app = ApplicationManager.getApplication(); diff --git a/plugins/git4idea/src/git4idea/config/GitSetupProjectConfig.kt b/plugins/git4idea/src/git4idea/config/GitSetupProjectConfig.kt index e6999e39e80d..0a0d243e2644 100644 --- a/plugins/git4idea/src/git4idea/config/GitSetupProjectConfig.kt +++ b/plugins/git4idea/src/git4idea/config/GitSetupProjectConfig.kt @@ -12,7 +12,7 @@ import git4idea.repo.GitRepositoryManager const val GC_AUTO = "gc.auto" -class GitSetupProjectConfig: StartupActivity { +class GitSetupProjectConfig: StartupActivity.Background { override fun runActivity(project: Project) { ProjectLevelVcsManagerImpl.getInstanceImpl(project).addInitializationRequest(VcsInitObject.AFTER_COMMON) { if (ApplicationManager.getApplication().isDispatchThread) { diff --git a/python/src/com/jetbrains/python/packaging/PyPackagesUpdater.java b/python/src/com/jetbrains/python/packaging/PyPackagesUpdater.java index cfc7051daefc..36025d1de47a 100644 --- a/python/src/com/jetbrains/python/packaging/PyPackagesUpdater.java +++ b/python/src/com/jetbrains/python/packaging/PyPackagesUpdater.java @@ -32,7 +32,7 @@ import java.io.IOException; * PyPI cache updater * User : catherine */ -public class PyPackagesUpdater implements StartupActivity { +public class PyPackagesUpdater implements StartupActivity.Background { private static final Logger LOG = Logger.getInstance(PyPackagesUpdater.class); private static final long EXPIRATION_TIMEOUT = DateFormatUtil.DAY; diff --git a/python/src/com/jetbrains/python/sdk/PythonSdkUpdater.java b/python/src/com/jetbrains/python/sdk/PythonSdkUpdater.java index 4e9bcbc68204..fe98579c7b6f 100644 --- a/python/src/com/jetbrains/python/sdk/PythonSdkUpdater.java +++ b/python/src/com/jetbrains/python/sdk/PythonSdkUpdater.java @@ -63,7 +63,7 @@ import java.util.concurrent.Future; * @author vlan * @author yole */ -public class PythonSdkUpdater implements StartupActivity { +public class PythonSdkUpdater implements StartupActivity.Background { private static final Logger LOG = Logger.getInstance("#com.jetbrains.python.sdk.PythonSdkUpdater"); private static final Object ourLock = new Object();