ProjectTopics.MODULES broadcast direction changed to NONE — mostly all clients already subscribes to project message bus and not on module

GitOrigin-RevId: ffe95fda1dfb04520d7f8181aed5b50d3529940a
This commit is contained in:
Vladimir Krivosheev
2020-06-18 11:35:57 +03:00
committed by intellij-monorepo-bot
parent 2c1baf3e34
commit 24dd950d83
4 changed files with 7 additions and 6 deletions
@@ -70,7 +70,7 @@ internal class ModuleStoreRenameTest {
ModuleRootModificationUtil.addDependency(dependentModule, module)
}
module.messageBus.connect().subscribe(ProjectTopics.MODULES, object : ModuleListener {
projectRule.project.messageBus.connect(module).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))
@@ -42,7 +42,7 @@ public final class ModuleRunConfigurationManager implements PersistentStateCompo
public ModuleRunConfigurationManager(@NotNull Module module) {
myModule = module;
myModule.getMessageBus().connect().subscribe(ProjectTopics.MODULES, new ModuleListener() {
myModule.getProject().getMessageBus().connect(myModule).subscribe(ProjectTopics.MODULES, new ModuleListener() {
@Override
public void beforeModuleRemoved(@NotNull Project project, @NotNull Module module) {
if (myModule.equals(module)) {
@@ -49,7 +49,7 @@ public final class ClasspathStorage extends StateStorageBase<Boolean> {
private final PathMacroSubstitutor myPathMacroSubstitutor;
public ClasspathStorage(@NotNull final Module module, @NotNull StateStorageManager storageManager) {
public ClasspathStorage(@NotNull Module module, @NotNull StateStorageManager storageManager) {
String storageType = module.getOptionValue(JpsProjectLoader.CLASSPATH_ATTRIBUTE);
if (storageType == null) {
throw new IllegalStateException("Classpath storage requires non-default storage type");
@@ -67,7 +67,8 @@ public final class ClasspathStorage extends StateStorageBase<Boolean> {
}
myConverter = new MissingClasspathConverter();
} else {
}
else {
myConverter = provider.createConverter(module);
}
@@ -100,7 +101,7 @@ public final class ClasspathStorage extends StateStorageBase<Boolean> {
}
});
busConnection.subscribe(ProjectTopics.MODULES, new ModuleListener() {
module.getProject().getMessageBus().connect(module).subscribe(ProjectTopics.MODULES, new ModuleListener() {
@Override
public void modulesRenamed(@NotNull Project project,
@NotNull List<Module> modules,
@@ -16,7 +16,7 @@ public final class ProjectTopics {
* Modules added or removed from project.
*/
@Topic.ProjectLevel
public static final Topic<ModuleListener> MODULES = new Topic<>(ModuleListener.class);
public static final Topic<ModuleListener> MODULES = new Topic<>(ModuleListener.class, Topic.BroadcastDirection.NONE);
private ProjectTopics() {
}