diff --git a/java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java b/java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java index 09ab3995dc41..7815ab2d4d6e 100644 --- a/java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java +++ b/java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java @@ -38,7 +38,7 @@ import com.intellij.openapi.extensions.Extensions; import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; -import com.intellij.openapi.project.ModuleAdapter; +import com.intellij.openapi.project.ModuleListener; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ProjectRootManager; import com.intellij.openapi.ui.InputValidator; @@ -114,7 +114,7 @@ public class CompilerConfigurationImpl extends CompilerConfiguration implements myExcludesConfiguration = new ExcludesConfigNotificationsWrapper<>(project, new ExcludedEntriesConfiguration()); Disposer.register(project, myExcludesConfiguration.getDelegate()); MessageBusConnection connection = project.getMessageBus().connect(project); - connection.subscribe(ProjectTopics.MODULES, new ModuleAdapter() { + connection.subscribe(ProjectTopics.MODULES, new ModuleListener() { @Override public void beforeModuleRemoved(@NotNull Project project, @NotNull Module module) { getAnnotationProcessingConfiguration(module).removeModuleName(module.getName()); diff --git a/java/java-tests/testSrc/com/intellij/roots/MultiModuleEditingTest.java b/java/java-tests/testSrc/com/intellij/roots/MultiModuleEditingTest.java index 4cb6f86dfd03..3d68da397085 100644 --- a/java/java-tests/testSrc/com/intellij/roots/MultiModuleEditingTest.java +++ b/java/java-tests/testSrc/com/intellij/roots/MultiModuleEditingTest.java @@ -23,7 +23,7 @@ import com.intellij.openapi.module.ModifiableModuleModel; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; import com.intellij.openapi.module.StdModuleTypes; -import com.intellij.openapi.project.ModuleAdapter; +import com.intellij.openapi.project.ModuleListener; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ContentEntry; import com.intellij.openapi.roots.ModifiableRootModel; @@ -189,7 +189,7 @@ public class MultiModuleEditingTest extends ModuleTestCase { } - private static class MyModuleListener extends ModuleAdapter { + private static class MyModuleListener implements ModuleListener { private final List myLog = new ArrayList<>(); @Override diff --git a/platform/configuration-store-impl/testSrc/ModuleStoreRenameTest.kt b/platform/configuration-store-impl/testSrc/ModuleStoreRenameTest.kt index 105cfb8e35ad..cf0797c25888 100644 --- a/platform/configuration-store-impl/testSrc/ModuleStoreRenameTest.kt +++ b/platform/configuration-store-impl/testSrc/ModuleStoreRenameTest.kt @@ -7,7 +7,7 @@ import com.intellij.openapi.application.runWriteAction import com.intellij.openapi.components.StoragePathMacros import com.intellij.openapi.components.stateStore import com.intellij.openapi.module.Module -import com.intellij.openapi.project.ModuleAdapter +import com.intellij.openapi.project.ModuleListener import com.intellij.openapi.project.Project import com.intellij.openapi.vfs.LocalFileSystem import com.intellij.project.modifyModules @@ -49,7 +49,7 @@ internal class ModuleStoreRenameTest { module = projectRule.createModule(tempDirManager.newPath(refreshVfs = true).resolve("m.iml")) } - module.messageBus.connect().subscribe(ProjectTopics.MODULES, object : ModuleAdapter() { + module.messageBus.connect().subscribe(ProjectTopics.MODULES, object : ModuleListener { override fun modulesRenamed(project: Project, modules: MutableList, oldNameProvider: Function) { assertThat(modules).containsOnly(module) oldModuleNames.add(oldNameProvider.`fun`(module)) diff --git a/platform/lang-impl/src/com/intellij/execution/impl/ModuleRunConfigurationManager.java b/platform/lang-impl/src/com/intellij/execution/impl/ModuleRunConfigurationManager.java index 77680aec1db4..c0c01209af7f 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/ModuleRunConfigurationManager.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/ModuleRunConfigurationManager.java @@ -24,7 +24,7 @@ import com.intellij.openapi.components.State; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleComponent; -import com.intellij.openapi.project.ModuleAdapter; +import com.intellij.openapi.project.ModuleListener; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.Condition; @@ -43,7 +43,7 @@ import java.util.List; import java.util.Set; @State(name = ModuleRunConfigurationManager.COMPONENT_NAME) -public final class ModuleRunConfigurationManager extends ModuleAdapter implements ModuleComponent, PersistentStateComponent { +public final class ModuleRunConfigurationManager implements ModuleComponent, ModuleListener, PersistentStateComponent { private static final Logger LOG = Logger.getInstance(ModuleRunConfigurationManager.class); @NonNls static final String COMPONENT_NAME = "ModuleRunConfigurationManager"; @NotNull diff --git a/platform/lang-impl/src/com/intellij/facet/impl/ProjectWideFacetListenersRegistryImpl.java b/platform/lang-impl/src/com/intellij/facet/impl/ProjectWideFacetListenersRegistryImpl.java index d0c3e1407e6e..ae0b0cc5c6ad 100644 --- a/platform/lang-impl/src/com/intellij/facet/impl/ProjectWideFacetListenersRegistryImpl.java +++ b/platform/lang-impl/src/com/intellij/facet/impl/ProjectWideFacetListenersRegistryImpl.java @@ -20,7 +20,7 @@ import com.intellij.ProjectTopics; import com.intellij.facet.*; import com.intellij.openapi.Disposable; import com.intellij.openapi.module.Module; -import com.intellij.openapi.project.ModuleAdapter; +import com.intellij.openapi.project.ModuleListener; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Disposer; import com.intellij.util.EventDispatcher; @@ -44,7 +44,7 @@ public class ProjectWideFacetListenersRegistryImpl extends ProjectWideFacetListe public ProjectWideFacetListenersRegistryImpl(MessageBus messageBus) { myFacetListener = new MyFacetManagerAdapter(); - messageBus.connect().subscribe(ProjectTopics.MODULES, new ModuleAdapter() { + messageBus.connect().subscribe(ProjectTopics.MODULES, new ModuleListener() { @Override public void moduleAdded(@NotNull Project project, @NotNull Module module) { onModuleAdded(module); diff --git a/platform/lang-impl/src/com/intellij/facet/impl/pointers/FacetPointersManagerImpl.java b/platform/lang-impl/src/com/intellij/facet/impl/pointers/FacetPointersManagerImpl.java index aa7742d750d2..a8caed31a641 100644 --- a/platform/lang-impl/src/com/intellij/facet/impl/pointers/FacetPointersManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/facet/impl/pointers/FacetPointersManagerImpl.java @@ -28,7 +28,7 @@ import com.intellij.openapi.Disposable; import com.intellij.openapi.components.ProjectComponent; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; -import com.intellij.openapi.project.ModuleAdapter; +import com.intellij.openapi.project.ModuleListener; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.Pair; @@ -95,7 +95,7 @@ public class FacetPointersManagerImpl extends FacetPointersManager implements Pr @Override public void initComponent() { MessageBusConnection connection = myProject.getMessageBus().connect(); - connection.subscribe(ProjectTopics.MODULES, new ModuleAdapter() { + connection.subscribe(ProjectTopics.MODULES, new ModuleListener() { @Override public void moduleAdded(@NotNull Project project, @NotNull Module module) { refreshPointers(module); diff --git a/platform/projectModel-api/src/com/intellij/openapi/project/ModuleAdapter.java b/platform/projectModel-api/src/com/intellij/openapi/project/ModuleAdapter.java index f293b3dc92f4..e469cf3338fd 100644 --- a/platform/projectModel-api/src/com/intellij/openapi/project/ModuleAdapter.java +++ b/platform/projectModel-api/src/com/intellij/openapi/project/ModuleAdapter.java @@ -15,25 +15,8 @@ */ package com.intellij.openapi.project; -import com.intellij.openapi.module.Module; -import com.intellij.util.Function; -import org.jetbrains.annotations.NotNull; - -import java.util.List; - /** - * @author nik + * @deprecated Please use ModuleListener directly. */ public abstract class ModuleAdapter implements ModuleListener { - @Override - public void moduleAdded(@NotNull Project project, @NotNull Module module) { } - - @Override - public void beforeModuleRemoved(@NotNull Project project, @NotNull Module module) { } - - @Override - public void moduleRemoved(@NotNull Project project, @NotNull Module module) { } - - @Override - public void modulesRenamed(@NotNull Project project, @NotNull List modules, @NotNull Function oldNameProvider) { } } diff --git a/platform/projectModel-api/src/com/intellij/openapi/project/ModuleListener.java b/platform/projectModel-api/src/com/intellij/openapi/project/ModuleListener.java index 78ebff886f42..311c7635d72c 100644 --- a/platform/projectModel-api/src/com/intellij/openapi/project/ModuleListener.java +++ b/platform/projectModel-api/src/com/intellij/openapi/project/ModuleListener.java @@ -26,11 +26,15 @@ import java.util.List; * @author max */ public interface ModuleListener extends EventListener { - void moduleAdded(@NotNull Project project, @NotNull Module module); + default void moduleAdded(@NotNull Project project, @NotNull Module module) { + } - void beforeModuleRemoved(@NotNull Project project, @NotNull Module module); + default void beforeModuleRemoved(@NotNull Project project, @NotNull Module module) { + } - void moduleRemoved(@NotNull Project project, @NotNull Module module); + default void moduleRemoved(@NotNull Project project, @NotNull Module module) { + } - void modulesRenamed(@NotNull Project project, @NotNull List modules, @NotNull Function oldNameProvider); + default void modulesRenamed(@NotNull Project project, @NotNull List modules, @NotNull Function oldNameProvider) { + } } diff --git a/platform/projectModel-impl/src/com/intellij/openapi/module/impl/ModulePointerManagerImpl.java b/platform/projectModel-impl/src/com/intellij/openapi/module/impl/ModulePointerManagerImpl.java index b2507ea0860c..0ce85e403320 100644 --- a/platform/projectModel-impl/src/com/intellij/openapi/module/impl/ModulePointerManagerImpl.java +++ b/platform/projectModel-impl/src/com/intellij/openapi/module/impl/ModulePointerManagerImpl.java @@ -21,7 +21,7 @@ import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; import com.intellij.openapi.module.ModulePointer; import com.intellij.openapi.module.ModulePointerManager; -import com.intellij.openapi.project.ModuleAdapter; +import com.intellij.openapi.project.ModuleListener; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Disposer; import com.intellij.util.Function; @@ -41,7 +41,7 @@ public class ModulePointerManagerImpl extends ModulePointerManager { public ModulePointerManagerImpl(Project project) { myProject = project; - project.getMessageBus().connect().subscribe(ProjectTopics.MODULES, new ModuleAdapter() { + project.getMessageBus().connect().subscribe(ProjectTopics.MODULES, new ModuleListener() { @Override public void beforeModuleRemoved(@NotNull Project project, @NotNull Module module) { unregisterPointer(module); diff --git a/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java b/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java index 302b06286973..eae62f7e653c 100644 --- a/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java +++ b/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java @@ -52,7 +52,7 @@ import com.intellij.openapi.module.EmptyModuleType; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.project.DumbService; -import com.intellij.openapi.project.ModuleAdapter; +import com.intellij.openapi.project.ModuleListener; import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ProjectManager; import com.intellij.openapi.project.ex.ProjectManagerEx; @@ -305,7 +305,7 @@ public abstract class LightPlatformTestCase extends UsefulTestCase implements Da } MessageBusConnection connection = ourProject.getMessageBus().connect(parentDisposable); - connection.subscribe(ProjectTopics.MODULES, new ModuleAdapter() { + connection.subscribe(ProjectTopics.MODULES, new ModuleListener() { @Override public void moduleAdded(@NotNull Project project, @NotNull Module module) { fail("Adding modules is not permitted in LightIdeaTestCase."); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ModuleVcsDetector.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ModuleVcsDetector.java index 9a65d8d5debb..9fd464a1f6b7 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ModuleVcsDetector.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ModuleVcsDetector.java @@ -21,7 +21,7 @@ import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.components.ProjectComponent; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; -import com.intellij.openapi.project.ModuleAdapter; +import com.intellij.openapi.project.ModuleListener; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ModuleRootEvent; import com.intellij.openapi.roots.ModuleRootListener; @@ -82,7 +82,7 @@ public class ModuleVcsDetector implements ProjectComponent { }); } - private class MyModulesListener extends ModuleAdapter implements ModuleRootListener { + private class MyModulesListener implements ModuleRootListener, ModuleListener { private final List> myMappingsForRemovedModules = new ArrayList<>(); @Override diff --git a/plugins/git4idea/remote-servers-git-java/src/com/intellij/remoteServer/util/importProject/CloudGitChooseAccountStepImpl.java b/plugins/git4idea/remote-servers-git-java/src/com/intellij/remoteServer/util/importProject/CloudGitChooseAccountStepImpl.java index ba5340e1c362..4e273c4fc9c5 100644 --- a/plugins/git4idea/remote-servers-git-java/src/com/intellij/remoteServer/util/importProject/CloudGitChooseAccountStepImpl.java +++ b/plugins/git4idea/remote-servers-git-java/src/com/intellij/remoteServer/util/importProject/CloudGitChooseAccountStepImpl.java @@ -24,7 +24,7 @@ import com.intellij.ide.util.projectWizard.importSources.DetectedSourceRoot; import com.intellij.ide.util.projectWizard.importSources.ProjectFromSourcesBuilder; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.StdModuleTypes; -import com.intellij.openapi.project.ModuleAdapter; +import com.intellij.openapi.project.ModuleListener; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ModifiableRootModel; import com.intellij.openapi.startup.StartupManager; @@ -111,7 +111,7 @@ public class CloudGitChooseAccountStepImpl extends CloudGitChooseAccountStepBase @Override public void update(final @NotNull Module module, @NotNull ModifiableRootModel rootModel) { final MessageBusConnection connection = module.getProject().getMessageBus().connect(); - connection.subscribe(ProjectTopics.MODULES, new ModuleAdapter() { + connection.subscribe(ProjectTopics.MODULES, new ModuleListener() { @Override public void moduleAdded(@NotNull Project project, @NotNull Module addedModule) { diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleResourceCompilerConfigurationGenerator.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleResourceCompilerConfigurationGenerator.java index 00b8aab44712..14abae3cb9e5 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleResourceCompilerConfigurationGenerator.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleResourceCompilerConfigurationGenerator.java @@ -25,7 +25,7 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.externalSystem.model.project.ExternalSystemSourceType; import com.intellij.openapi.externalSystem.util.ExternalSystemApiUtil; import com.intellij.openapi.module.Module; -import com.intellij.openapi.project.ModuleAdapter; +import com.intellij.openapi.project.ModuleListener; import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ProjectType; import com.intellij.openapi.project.ProjectTypeService; @@ -78,7 +78,7 @@ public class GradleResourceCompilerConfigurationGenerator { externalProjectDataCache = ExternalProjectDataCache.getInstance(project); assert externalProjectDataCache != null; - project.getMessageBus().connect(project).subscribe(ProjectTopics.MODULES, new ModuleAdapter() { + project.getMessageBus().connect(project).subscribe(ProjectTopics.MODULES, new ModuleListener() { @Override public void moduleRemoved(@NotNull Project project, @NotNull Module module) { myModulesConfigurationHash.remove(module.getName()); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcModuleStructureSynchronizer.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcModuleStructureSynchronizer.java index a1f9b8563b36..229c6aadbbad 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcModuleStructureSynchronizer.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcModuleStructureSynchronizer.java @@ -29,7 +29,7 @@ import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.util.ProgressIndicatorUtils; import com.intellij.openapi.progress.util.ReadTask; import com.intellij.openapi.project.DumbAwareRunnable; -import com.intellij.openapi.project.ModuleAdapter; +import com.intellij.openapi.project.ModuleListener; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.*; import com.intellij.openapi.startup.StartupManager; @@ -96,7 +96,7 @@ public class MvcModuleStructureSynchronizer extends AbstractProjectComponent { } }); - connection.subscribe(ProjectTopics.MODULES, new ModuleAdapter() { + connection.subscribe(ProjectTopics.MODULES, new ModuleListener() { @Override public void moduleAdded(@NotNull Project project, @NotNull Module module) { queue(SyncAction.UpdateProjectStructure, module); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManagerWatcher.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManagerWatcher.java index 122bad170bfc..f5c73ea84791 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManagerWatcher.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManagerWatcher.java @@ -26,7 +26,7 @@ import com.intellij.openapi.editor.event.DocumentEvent; import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.fileEditor.impl.FileDocumentManagerImpl; import com.intellij.openapi.module.Module; -import com.intellij.openapi.project.ModuleAdapter; +import com.intellij.openapi.project.ModuleListener; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ModuleRootEvent; import com.intellij.openapi.roots.ModuleRootListener; @@ -115,7 +115,7 @@ public class MavenProjectsManagerWatcher { myChangedDocumentsQueue.makeUserAware(myProject); myChangedDocumentsQueue.activate(); - myBusConnection.subscribe(ProjectTopics.MODULES, new ModuleAdapter() { + myBusConnection.subscribe(ProjectTopics.MODULES, new ModuleListener() { @Override public void moduleRemoved(@NotNull Project project, @NotNull Module module) { MavenProject mavenProject = myManager.findProject(module); diff --git a/python/ide/src/com/jetbrains/python/PyModuleListener.java b/python/ide/src/com/jetbrains/python/PyModuleListener.java index 31ffc87fa056..2646174ac178 100644 --- a/python/ide/src/com/jetbrains/python/PyModuleListener.java +++ b/python/ide/src/com/jetbrains/python/PyModuleListener.java @@ -19,7 +19,7 @@ import com.intellij.ProjectTopics; import com.intellij.execution.RunManagerEx; import com.intellij.execution.RunnerAndConfigurationSettings; import com.intellij.openapi.module.Module; -import com.intellij.openapi.project.ModuleAdapter; +import com.intellij.openapi.project.ModuleListener; import com.intellij.openapi.project.Project; import com.intellij.util.messages.MessageBus; import com.jetbrains.python.run.AbstractPythonRunConfiguration; @@ -33,7 +33,7 @@ import java.util.Collection; */ public class PyModuleListener { public PyModuleListener(MessageBus messageBus) { - messageBus.connect().subscribe(ProjectTopics.MODULES, new ModuleAdapter() { + messageBus.connect().subscribe(ProjectTopics.MODULES, new ModuleListener() { @Override public void beforeModuleRemoved(@NotNull Project project, @NotNull Module module) { final RunManagerEx runManager = RunManagerEx.getInstanceEx(project);