MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

cleanup — ModuleListener

Browse Source
This commit is contained in:
Vladimir Krivosheev
2016-12-18 18:17:00 +01:00
parent a7b0203b63
commit 8cddb9a432
16 changed files with 37 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/compiler/impl/src/com/intellij/compiler/CompilerConfigurationImpl.java
+2 -2
View File
@@ -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());
java/java-tests/testSrc/com/intellij/roots/MultiModuleEditingTest.java
+2 -2
View File
@@ -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<String> myLog = new ArrayList<>();
@Override
platform/configuration-store-impl/testSrc/ModuleStoreRenameTest.kt
+2 -2
View File
@@ -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<Module>, oldNameProvider: Function<Module, String>) {
assertThat(modules).containsOnly(module)
oldModuleNames.add(oldNameProvider.`fun`(module))
platform/lang-impl/src/com/intellij/execution/impl/ModuleRunConfigurationManager.java
+2 -2
View File
@@ -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<Element> {
public final class ModuleRunConfigurationManager implements ModuleComponent, ModuleListener, PersistentStateComponent<Element> {
private static final Logger LOG = Logger.getInstance(ModuleRunConfigurationManager.class);
@NonNls static final String COMPONENT_NAME = "ModuleRunConfigurationManager";
@NotNull
platform/lang-impl/src/com/intellij/facet/impl/ProjectWideFacetListenersRegistryImpl.java
+2 -2
View File
@@ -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);
platform/lang-impl/src/com/intellij/facet/impl/pointers/FacetPointersManagerImpl.java
+2 -2
View File
@@ -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);
platform/projectModel-api/src/com/intellij/openapi/project/ModuleAdapter.java
+1 -18
View File
@@ -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<Module> modules, @NotNull Function<Module, String> oldNameProvider) { }
}
platform/projectModel-api/src/com/intellij/openapi/project/ModuleListener.java
+8 -4
View File
@@ -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<Module> modules, @NotNull Function<Module, String> oldNameProvider);
default void modulesRenamed(@NotNull Project project, @NotNull List<Module> modules, @NotNull Function<Module, String> oldNameProvider) {
}
}
platform/projectModel-impl/src/com/intellij/openapi/module/impl/ModulePointerManagerImpl.java
+2 -2
View File
@@ -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);
platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java
+2 -2
View File
@@ -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.");
platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ModuleVcsDetector.java
+2 -2
View File
@@ -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<Pair<String, VcsDirectoryMapping>> myMappingsForRemovedModules = new ArrayList<>();
@Override
plugins/git4idea/remote-servers-git-java/src/com/intellij/remoteServer/util/importProject/CloudGitChooseAccountStepImpl.java
+2 -2
View File
@@ -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) {
plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleResourceCompilerConfigurationGenerator.java
+2 -2
View File
@@ -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());
plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcModuleStructureSynchronizer.java
+2 -2
View File
@@ -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);
plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManagerWatcher.java
+2 -2
View File
@@ -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);
python/ide/src/com/jetbrains/python/PyModuleListener.java
+2 -2
View File
@@ -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);