From 69145a1ee51b2f8a556daa57b49aa35c16d24e1e Mon Sep 17 00:00:00 2001 From: Dmitry Jemerov Date: Thu, 10 May 2012 18:55:24 +0200 Subject: [PATCH] delete deprecated listener API; ModuleManager -> projectModel-api --- .../impl/LanguageLevelUsagesCollector.java | 4 +-- .../intellij/facet/impl/FacetFinderImpl.java | 3 +-- .../module/impl/ModuleManagerImpl.java | 18 ------------- .../openapi/module/ModuleManager.java | 27 ------------------- .../model/gotosymbol/GoToSymbolProvider.java | 3 +-- 5 files changed, 3 insertions(+), 52 deletions(-) rename platform/{lang-api => projectModel-api}/src/com/intellij/openapi/module/ModuleManager.java (83%) diff --git a/java/java-impl/src/com/intellij/openapi/roots/impl/LanguageLevelUsagesCollector.java b/java/java-impl/src/com/intellij/openapi/roots/impl/LanguageLevelUsagesCollector.java index f44addaddb8b..4fca08849f17 100644 --- a/java/java-impl/src/com/intellij/openapi/roots/impl/LanguageLevelUsagesCollector.java +++ b/java/java-impl/src/com/intellij/openapi/roots/impl/LanguageLevelUsagesCollector.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2011 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,14 +23,12 @@ import com.intellij.openapi.module.ModuleManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.LanguageLevelModuleExtension; import com.intellij.openapi.roots.LanguageLevelProjectExtension; -import com.intellij.openapi.util.text.StringUtil; import com.intellij.pom.java.LanguageLevel; import com.intellij.util.Function; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.HashSet; import org.jetbrains.annotations.NotNull; -import java.util.Collections; import java.util.Set; public class LanguageLevelUsagesCollector extends AbstractApplicationUsagesCollector { diff --git a/platform/lang-impl/src/com/intellij/facet/impl/FacetFinderImpl.java b/platform/lang-impl/src/com/intellij/facet/impl/FacetFinderImpl.java index fa75429a9f3d..4bf246297b18 100644 --- a/platform/lang-impl/src/com/intellij/facet/impl/FacetFinderImpl.java +++ b/platform/lang-impl/src/com/intellij/facet/impl/FacetFinderImpl.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -25,7 +25,6 @@ import com.intellij.openapi.Disposable; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.module.ModuleManager; import com.intellij.openapi.module.Module; -import com.intellij.psi.PsiManager; import com.intellij.psi.util.CachedValueProvider; import com.intellij.psi.util.CachedValuesManager; import com.intellij.psi.util.CachedValue; diff --git a/platform/lang-impl/src/com/intellij/openapi/module/impl/ModuleManagerImpl.java b/platform/lang-impl/src/com/intellij/openapi/module/impl/ModuleManagerImpl.java index 23d1775a1778..b5954c33278a 100644 --- a/platform/lang-impl/src/com/intellij/openapi/module/impl/ModuleManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/openapi/module/impl/ModuleManagerImpl.java @@ -21,7 +21,6 @@ import com.intellij.ide.highlighter.ModuleFileType; import com.intellij.notification.Notification; import com.intellij.notification.NotificationType; import com.intellij.notification.Notifications; -import com.intellij.openapi.Disposable; import com.intellij.openapi.application.Application; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.components.*; @@ -453,23 +452,6 @@ public class ModuleManagerImpl extends ModuleManager implements ProjectComponent } private final Map myAdapters = new HashMap(); - public void addModuleListener(@NotNull ModuleListener listener) { - final MessageBusConnection connection = myMessageBus.connect(); - connection.subscribe(ProjectTopics.MODULES, listener); - myAdapters.put(listener, connection); - } - - public void addModuleListener(@NotNull ModuleListener listener, Disposable parentDisposable) { - final MessageBusConnection connection = myMessageBus.connect(parentDisposable); - connection.subscribe(ProjectTopics.MODULES, listener); - } - - public void removeModuleListener(@NotNull ModuleListener listener) { - final MessageBusConnection adapter = myAdapters.remove(listener); - if (adapter != null) { - adapter.disconnect(); - } - } @NotNull public Module newModule(@NotNull String filePath, final String moduleTypeId) { diff --git a/platform/lang-api/src/com/intellij/openapi/module/ModuleManager.java b/platform/projectModel-api/src/com/intellij/openapi/module/ModuleManager.java similarity index 83% rename from platform/lang-api/src/com/intellij/openapi/module/ModuleManager.java rename to platform/projectModel-api/src/com/intellij/openapi/module/ModuleManager.java index c6c9c2147dfa..7082647a6444 100644 --- a/platform/lang-api/src/com/intellij/openapi/module/ModuleManager.java +++ b/platform/projectModel-api/src/com/intellij/openapi/module/ModuleManager.java @@ -15,8 +15,6 @@ */ package com.intellij.openapi.module; -import com.intellij.openapi.Disposable; -import com.intellij.openapi.project.ModuleListener; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.InvalidDataException; import com.intellij.util.graph.Graph; @@ -140,31 +138,6 @@ public abstract class ModuleManager { */ @NotNull public abstract Graph moduleGraph(boolean includeTests); - /** - * Adds a listener for receiving notifications to the module structure of the project. - * - * @param listener the listener instance. - * @deprecated Subscribe to {@link com.intellij.ProjectTopics#MODULES} on project bus or lower. - */ - public abstract void addModuleListener(@NotNull ModuleListener listener); - - /** - * Adds a listener for receiving notifications to the module structure of the project. - * - * @param listener the listener instance. - * @param parentDisposable object, after whose disposing the listener should be removed - * @deprecated Subscribe to {@link com.intellij.ProjectTopics#MODULES} on project bus or lower. - */ - public abstract void addModuleListener(@NotNull ModuleListener listener, Disposable parentDisposable); - - /** - * Removes a listener for receiving notifications to the module structure of the project. - * - * @param listener the listener instance. - * @deprecated Subscribe to {@link com.intellij.ProjectTopics#MODULES} on project bus or lower. - */ - public abstract void removeModuleListener(@NotNull ModuleListener listener); - /** * Returns the model for the list of modules in the project, which can be used to add, * remove or modify modules. diff --git a/xml/dom-openapi/src/com/intellij/util/xml/model/gotosymbol/GoToSymbolProvider.java b/xml/dom-openapi/src/com/intellij/util/xml/model/gotosymbol/GoToSymbolProvider.java index bf0dcfe10b2d..2ce8bf501ee8 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/model/gotosymbol/GoToSymbolProvider.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/model/gotosymbol/GoToSymbolProvider.java @@ -1,5 +1,5 @@ /* - * Copyright 2000-2009 JetBrains s.r.o. + * Copyright 2000-2012 JetBrains s.r.o. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,7 +19,6 @@ package com.intellij.util.xml.model.gotosymbol; import com.intellij.navigation.ChooseByNameContributor; import com.intellij.navigation.ItemPresentation; import com.intellij.navigation.NavigationItem; -import com.intellij.openapi.editor.colors.TextAttributesKey; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; import com.intellij.openapi.project.Project;