From 257b4fcb07e8593401c21d6b94c4b275e1d28bd7 Mon Sep 17 00:00:00 2001 From: nik Date: Sat, 5 May 2012 11:44:00 +0400 Subject: [PATCH] ModuleRootListeners cleanup --- .../compiler/server/BuildManager.java | 11 ++----- .../AttachSourcesNotificationProvider.java | 6 +--- .../AnalyzeDependenciesComponent.java | 10 ++----- .../ExternalAnnotationsManagerImpl.java | 6 +--- .../intellij/psi/impl/PackagePrefixIndex.java | 6 +--- .../impl/file/impl/JavaFileManagerImpl.java | 6 +--- .../openapi/roots/ModuleRootAdapter.java | 29 +++++++++++++++++++ .../daemon/impl/DaemonListeners.java | 7 ++--- .../FavoritesViewTreeBuilder.java | 6 ++-- .../projectView/impl/ProjectTreeBuilder.java | 7 ++--- .../ide/projectView/impl/ProjectViewImpl.java | 5 +--- .../ide/scopeView/ScopeTreeViewPanel.java | 6 ++-- .../roots/impl/DirectoryIndexImpl.java | 6 +--- .../impl/PushedFilePropertiesUpdater.java | 5 +--- .../openapi/vcs/changes/VcsEventWatcher.java | 7 ++--- .../util/LogicalRootsManagerImpl.java | 8 ++--- .../impl/FileEditorManagerImpl.java | 6 ++-- .../testFramework/LightPlatformTestCase.java | 6 +--- .../android/designer/profile/ProfileList.java | 9 ++---- .../jetbrains/android/facet/AndroidFacet.java | 10 ++----- .../AndroidLogcatToolWindowFactory.java | 8 ++--- ...AndroidLayoutPreviewToolWindowManager.java | 7 ++--- ...GradleProjectStructureChangesDetector.java | 8 ++--- .../gradle/ui/GradleToolWindowFactory.java | 8 ++--- ...gureGroovyLibraryNotificationProvider.java | 6 ++-- .../lang/psi/impl/GroovyPsiManager.java | 6 ++-- .../mvc/MvcModuleStructureSynchronizer.java | 5 +--- .../project/MavenProjectsManagerWatcher.java | 8 ++--- .../project/MavenFoldersImporterTest.java | 17 ++--------- .../intellij/uiDesigner/LoaderFactory.java | 3 +- .../uiDesigner/StringDescriptorManager.java | 6 ++-- 31 files changed, 80 insertions(+), 164 deletions(-) create mode 100644 platform/lang-api/src/com/intellij/openapi/roots/ModuleRootAdapter.java diff --git a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java index ceadac438ea4..bd55ab50ea52 100644 --- a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java +++ b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java @@ -37,10 +37,7 @@ import com.intellij.openapi.project.ProjectManager; import com.intellij.openapi.project.ProjectManagerAdapter; import com.intellij.openapi.projectRoots.*; import com.intellij.openapi.projectRoots.impl.JavaAwareProjectJdkTableImpl; -import com.intellij.openapi.roots.ModuleRootEvent; -import com.intellij.openapi.roots.ModuleRootListener; -import com.intellij.openapi.roots.ModuleRootManager; -import com.intellij.openapi.roots.OrderRootType; +import com.intellij.openapi.roots.*; import com.intellij.openapi.roots.libraries.Library; import com.intellij.openapi.roots.libraries.LibraryTablesRegistrar; import com.intellij.openapi.util.JDOMUtil; @@ -768,11 +765,7 @@ public class BuildManager implements ApplicationComponent{ public void projectOpened(final Project project) { final MessageBusConnection conn = project.getMessageBus().connect(); myConnections.put(project, conn); - conn.subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootListener() { - @Override - public void beforeRootsChange(final ModuleRootEvent event) { - } - + conn.subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootAdapter() { @Override public void rootsChanged(final ModuleRootEvent event) { final Object source = event.getSource(); diff --git a/java/idea-ui/src/com/intellij/codeInsight/daemon/impl/AttachSourcesNotificationProvider.java b/java/idea-ui/src/com/intellij/codeInsight/daemon/impl/AttachSourcesNotificationProvider.java index ad3cb2ad810f..e4b759da8080 100644 --- a/java/idea-ui/src/com/intellij/codeInsight/daemon/impl/AttachSourcesNotificationProvider.java +++ b/java/idea-ui/src/com/intellij/codeInsight/daemon/impl/AttachSourcesNotificationProvider.java @@ -70,11 +70,7 @@ public class AttachSourcesNotificationProvider implements EditorNotifications.Pr public AttachSourcesNotificationProvider(Project project, final EditorNotifications notifications) { myProject = project; - myProject.getMessageBus().connect(project).subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootListener() { - - public void beforeRootsChange(ModuleRootEvent event) { - } - + myProject.getMessageBus().connect(project).subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootAdapter() { public void rootsChanged(ModuleRootEvent event) { notifications.updateAllNotifications(); } diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/dependencyAnalysis/AnalyzeDependenciesComponent.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/dependencyAnalysis/AnalyzeDependenciesComponent.java index c0e3997ccafd..25949c8c8366 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/dependencyAnalysis/AnalyzeDependenciesComponent.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/dependencyAnalysis/AnalyzeDependenciesComponent.java @@ -23,10 +23,7 @@ import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.project.DumbAwareAction; -import com.intellij.openapi.roots.ModuleRootEvent; -import com.intellij.openapi.roots.ModuleRootListener; -import com.intellij.openapi.roots.ModuleSourceOrderEntry; -import com.intellij.openapi.roots.OrderEntry; +import com.intellij.openapi.roots.*; import com.intellij.openapi.roots.ui.CellAppearanceEx; import com.intellij.openapi.roots.ui.OrderEntryAppearanceService; import com.intellij.openapi.roots.ui.configuration.ProjectStructureConfigurable; @@ -94,10 +91,7 @@ public class AnalyzeDependenciesComponent extends MasterDetailsComponent { init(); getSplitter().setProportion(0.3f); myMessageBusConnection = myModule.getProject().getMessageBus().connect(); - myMessageBusConnection.subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootListener() { - public void beforeRootsChange(ModuleRootEvent event) { - } - + myMessageBusConnection.subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootAdapter() { public void rootsChanged(ModuleRootEvent event) { myClasspaths.clear(); updateTree(); diff --git a/java/java-impl/src/com/intellij/codeInsight/ExternalAnnotationsManagerImpl.java b/java/java-impl/src/com/intellij/codeInsight/ExternalAnnotationsManagerImpl.java index 04d683ff2540..1b183c36d6de 100644 --- a/java/java-impl/src/com/intellij/codeInsight/ExternalAnnotationsManagerImpl.java +++ b/java/java-impl/src/com/intellij/codeInsight/ExternalAnnotationsManagerImpl.java @@ -93,11 +93,7 @@ public class ExternalAnnotationsManagerImpl extends ExternalAnnotationsManager { public ExternalAnnotationsManagerImpl(@NotNull final Project project, final PsiManager psiManager) { myPsiManager = psiManager; final MessageBusConnection connection = project.getMessageBus().connect(project); - connection.subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootListener() { - @Override - public void beforeRootsChange(ModuleRootEvent event) { - } - + connection.subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootAdapter() { @Override public void rootsChanged(ModuleRootEvent event) { myExternalAnnotations.clear(); diff --git a/java/java-impl/src/com/intellij/psi/impl/PackagePrefixIndex.java b/java/java-impl/src/com/intellij/psi/impl/PackagePrefixIndex.java index 4fa5fc4d332a..49483ecbe8ee 100644 --- a/java/java-impl/src/com/intellij/psi/impl/PackagePrefixIndex.java +++ b/java/java-impl/src/com/intellij/psi/impl/PackagePrefixIndex.java @@ -39,11 +39,7 @@ public class PackagePrefixIndex { public PackagePrefixIndex(Project project) { myProject = project; - project.getMessageBus().connect(project).subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootListener() { - @Override - public void beforeRootsChange(final ModuleRootEvent event) { - } - + project.getMessageBus().connect(project).subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootAdapter() { @Override public void rootsChanged(final ModuleRootEvent event) { synchronized (LOCK) { diff --git a/java/java-impl/src/com/intellij/psi/impl/file/impl/JavaFileManagerImpl.java b/java/java-impl/src/com/intellij/psi/impl/file/impl/JavaFileManagerImpl.java index 502d61385538..7a63930c04de 100644 --- a/java/java-impl/src/com/intellij/psi/impl/file/impl/JavaFileManagerImpl.java +++ b/java/java-impl/src/com/intellij/psi/impl/file/impl/JavaFileManagerImpl.java @@ -84,11 +84,7 @@ public class JavaFileManagerImpl implements JavaFileManager, Disposable { }); final MessageBusConnection connection = bus.connect(); - connection.subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootListener() { - @Override - public void beforeRootsChange(final ModuleRootEvent event) { - } - + connection.subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootAdapter() { @Override public void rootsChanged(final ModuleRootEvent event) { myNontrivialPackagePrefixes = null; diff --git a/platform/lang-api/src/com/intellij/openapi/roots/ModuleRootAdapter.java b/platform/lang-api/src/com/intellij/openapi/roots/ModuleRootAdapter.java new file mode 100644 index 000000000000..b143b9b79212 --- /dev/null +++ b/platform/lang-api/src/com/intellij/openapi/roots/ModuleRootAdapter.java @@ -0,0 +1,29 @@ +/* + * 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.intellij.openapi.roots; + +/** + * @author nik + */ +public abstract class ModuleRootAdapter implements ModuleRootListener { + @Override + public void beforeRootsChange(ModuleRootEvent event) { + } + + @Override + public void rootsChanged(ModuleRootEvent event) { + } +} diff --git a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonListeners.java b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonListeners.java index 92a23259e39b..9a0914871313 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonListeners.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/DaemonListeners.java @@ -49,6 +49,7 @@ import com.intellij.openapi.module.ModuleUtil; import com.intellij.openapi.project.DumbService; import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ProjectUtil; +import com.intellij.openapi.roots.ModuleRootAdapter; import com.intellij.openapi.roots.ModuleRootEvent; import com.intellij.openapi.roots.ModuleRootListener; import com.intellij.openapi.util.Disposer; @@ -191,11 +192,7 @@ class DaemonListeners implements Disposable { Disposer.register(this, changeHandler); PsiManager.getInstance(myProject).addPsiTreeChangeListener(changeHandler, changeHandler); - connection.subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootListener() { - @Override - public void beforeRootsChange(ModuleRootEvent event) { - } - + connection.subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootAdapter() { @Override public void rootsChanged(ModuleRootEvent event) { final FileEditor[] editors = FileEditorManager.getInstance(myProject).getSelectedEditors(); diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesViewTreeBuilder.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesViewTreeBuilder.java index b41d580f49d5..0fa219926195 100644 --- a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesViewTreeBuilder.java +++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesViewTreeBuilder.java @@ -28,6 +28,7 @@ import com.intellij.ide.util.treeView.NodeDescriptor; import com.intellij.openapi.fileTypes.StdFileTypes; import com.intellij.openapi.ide.CopyPasteManager; import com.intellij.openapi.project.Project; +import com.intellij.openapi.roots.ModuleRootAdapter; import com.intellij.openapi.roots.ModuleRootEvent; import com.intellij.openapi.roots.ModuleRootListener; import com.intellij.openapi.util.ActionCallback; @@ -88,10 +89,7 @@ public class FavoritesViewTreeBuilder extends BaseProjectTreeBuilder { } } }; - bus.subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootListener() { - public void beforeRootsChange(ModuleRootEvent event) { - } - + bus.subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootAdapter() { public void rootsChanged(ModuleRootEvent event) { queueUpdate(true); } diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectTreeBuilder.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectTreeBuilder.java index 6d2ef559b21a..64611f1397f9 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectTreeBuilder.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectTreeBuilder.java @@ -28,8 +28,8 @@ import com.intellij.ide.util.treeView.NodeDescriptor; import com.intellij.openapi.application.ModalityState; import com.intellij.openapi.ide.CopyPasteManager; import com.intellij.openapi.project.Project; +import com.intellij.openapi.roots.ModuleRootAdapter; import com.intellij.openapi.roots.ModuleRootEvent; -import com.intellij.openapi.roots.ModuleRootListener; import com.intellij.openapi.vcs.FileStatusListener; import com.intellij.openapi.vcs.FileStatusManager; import com.intellij.openapi.vfs.VirtualFile; @@ -63,10 +63,7 @@ public class ProjectTreeBuilder extends BaseProjectTreeBuilder { final MessageBusConnection connection = project.getMessageBus().connect(this); myPsiTreeChangeListener = createPsiTreeChangeListener(myProject); - connection.subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootListener() { - @Override - public void beforeRootsChange(ModuleRootEvent event) { - } + connection.subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootAdapter() { @Override public void rootsChanged(ModuleRootEvent event) { queueUpdate(); diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java index b3c4c44bb8de..765a32e8afb3 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java @@ -198,10 +198,7 @@ public class ProjectViewImpl extends ProjectView implements PersistentStateCompo myFileEditorManager = fileEditorManager; myConnection = project.getMessageBus().connect(); - myConnection.subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootListener() { - public void beforeRootsChange(ModuleRootEvent event) { - } - + myConnection.subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootAdapter() { public void rootsChanged(ModuleRootEvent event) { refresh(); } diff --git a/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeTreeViewPanel.java b/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeTreeViewPanel.java index aba5982da7b3..70192025406e 100644 --- a/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeTreeViewPanel.java +++ b/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeTreeViewPanel.java @@ -47,6 +47,7 @@ import com.intellij.openapi.ide.CopyPasteManager; import com.intellij.openapi.module.Module; import com.intellij.openapi.project.IndexNotReadyException; import com.intellij.openapi.project.Project; +import com.intellij.openapi.roots.ModuleRootAdapter; import com.intellij.openapi.roots.ModuleRootEvent; import com.intellij.openapi.roots.ModuleRootListener; import com.intellij.openapi.roots.ui.configuration.actions.ModuleDeleteProvider; @@ -742,10 +743,7 @@ public class ScopeTreeViewPanel extends JPanel implements Disposable { } } - private class MyModuleRootListener implements ModuleRootListener { - public void beforeRootsChange(ModuleRootEvent event) { - } - + private class MyModuleRootListener extends ModuleRootAdapter { public void rootsChanged(ModuleRootEvent event) { myUpdateQueue.cancelAllUpdates(); myUpdateQueue.queue(new Update("RootsChanged") { diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/impl/DirectoryIndexImpl.java b/platform/lang-impl/src/com/intellij/openapi/roots/impl/DirectoryIndexImpl.java index 8c0e4765a243..ec22187d028a 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/impl/DirectoryIndexImpl.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/impl/DirectoryIndexImpl.java @@ -176,11 +176,7 @@ public class DirectoryIndexImpl extends DirectoryIndex implements ProjectCompone } }); - myConnection.subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootListener() { - @Override - public void beforeRootsChange(ModuleRootEvent event) { - } - + myConnection.subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootAdapter() { @Override public void rootsChanged(ModuleRootEvent event) { doInitialize(); diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/impl/PushedFilePropertiesUpdater.java b/platform/lang-impl/src/com/intellij/openapi/roots/impl/PushedFilePropertiesUpdater.java index 828e2a5f37fb..a4ba71ce1bec 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/impl/PushedFilePropertiesUpdater.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/impl/PushedFilePropertiesUpdater.java @@ -63,10 +63,7 @@ public class PushedFilePropertiesUpdater { LOG.info("File properties pushed in " + (System.currentTimeMillis() - l) + " ms"); final MessageBusConnection connection = bus.connect(); - connection.subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootListener() { - public void beforeRootsChange(final ModuleRootEvent event) { - } - + connection.subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootAdapter() { public void rootsChanged(final ModuleRootEvent event) { pushAll(myPushers); for (FilePropertyPusher pusher : myPushers) { diff --git a/platform/lang-impl/src/com/intellij/openapi/vcs/changes/VcsEventWatcher.java b/platform/lang-impl/src/com/intellij/openapi/vcs/changes/VcsEventWatcher.java index d02e1fd3628e..20e5bdc496c9 100644 --- a/platform/lang-impl/src/com/intellij/openapi/vcs/changes/VcsEventWatcher.java +++ b/platform/lang-impl/src/com/intellij/openapi/vcs/changes/VcsEventWatcher.java @@ -21,8 +21,8 @@ import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ModalityState; import com.intellij.openapi.components.AbstractProjectComponent; import com.intellij.openapi.project.Project; +import com.intellij.openapi.roots.ModuleRootAdapter; import com.intellij.openapi.roots.ModuleRootEvent; -import com.intellij.openapi.roots.ModuleRootListener; import com.intellij.openapi.roots.impl.DirectoryIndex; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.problems.WolfTheProblemSolver; @@ -40,10 +40,7 @@ public class VcsEventWatcher extends AbstractProjectComponent { public void projectOpened() { MessageBusConnection connection = myProject.getMessageBus().connect(myProject); - connection.subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootListener() { - public void beforeRootsChange(ModuleRootEvent event) { - } - + connection.subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootAdapter() { public void rootsChanged(ModuleRootEvent event) { ApplicationManager.getApplication().invokeLater(new Runnable() { public void run() { diff --git a/platform/lang-impl/src/com/intellij/util/LogicalRootsManagerImpl.java b/platform/lang-impl/src/com/intellij/util/LogicalRootsManagerImpl.java index 6cdc1ba945ac..d7413543e96c 100644 --- a/platform/lang-impl/src/com/intellij/util/LogicalRootsManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/util/LogicalRootsManagerImpl.java @@ -22,8 +22,8 @@ import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; import com.intellij.openapi.module.ModuleUtil; import com.intellij.openapi.project.Project; +import com.intellij.openapi.roots.ModuleRootAdapter; import com.intellij.openapi.roots.ModuleRootEvent; -import com.intellij.openapi.roots.ModuleRootListener; import com.intellij.openapi.roots.ModuleRootManager; import com.intellij.openapi.util.MultiValuesMap; import com.intellij.openapi.vfs.VfsUtil; @@ -59,11 +59,7 @@ public class LogicalRootsManagerImpl extends LogicalRootsManager { //updateCache(moduleManager); } }); - connection.subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootListener() { - @Override - public void beforeRootsChange(ModuleRootEvent event) { - } - + connection.subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootAdapter() { @Override public void rootsChanged(ModuleRootEvent event) { bus.asyncPublisher(LOGICAL_ROOTS).logicalRootsChanged(); diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java index a471fe111e5e..200a0496a195 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/FileEditorManagerImpl.java @@ -47,6 +47,7 @@ import com.intellij.openapi.project.DumbAwareRunnable; import com.intellij.openapi.project.DumbService; import com.intellij.openapi.project.Project; import com.intellij.openapi.project.impl.ProjectImpl; +import com.intellij.openapi.roots.ModuleRootAdapter; import com.intellij.openapi.roots.ModuleRootEvent; import com.intellij.openapi.roots.ModuleRootListener; import com.intellij.openapi.startup.StartupManager; @@ -1622,10 +1623,7 @@ public class FileEditorManagerImpl extends FileEditorManagerEx implements Projec } } - private class MyRootsListener implements ModuleRootListener { - public void beforeRootsChange(ModuleRootEvent event) { - } - + private class MyRootsListener extends ModuleRootAdapter { public void rootsChanged(ModuleRootEvent event) { EditorFileSwapper[] swappers = Extensions.getExtensions(EditorFileSwapper.EP_NAME); diff --git a/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java b/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java index f4e051cf3f87..65b307d1fe36 100644 --- a/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java +++ b/platform/testFramework/src/com/intellij/testFramework/LightPlatformTestCase.java @@ -269,17 +269,13 @@ public abstract class LightPlatformTestCase extends UsefulTestCase implements Da rootModel.commit(); final MessageBusConnection connection = ourProject.getMessageBus().connect(); - connection.subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootListener() { + connection.subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootAdapter() { @Override public void beforeRootsChange(ModuleRootEvent event) { if (!event.isCausedByFileTypesChange()) { //TODO: uncomment fail("Root modification in LightIdeaTestCase is not allowed."); } } - - @Override - public void rootsChanged(ModuleRootEvent event) { - } }); connection.subscribe(ProjectTopics.MODULES, new ModuleListener() { diff --git a/plugins/android-designer/src/com/intellij/android/designer/profile/ProfileList.java b/plugins/android-designer/src/com/intellij/android/designer/profile/ProfileList.java index be70b23013e3..1c7abf562aa3 100644 --- a/plugins/android-designer/src/com/intellij/android/designer/profile/ProfileList.java +++ b/plugins/android-designer/src/com/intellij/android/designer/profile/ProfileList.java @@ -20,13 +20,12 @@ import com.intellij.android.designer.designSurface.AndroidDesignerEditorPanel; import com.intellij.designer.DesignerToolWindowManager; import com.intellij.designer.designSurface.DesignerEditorPanel; import com.intellij.openapi.components.*; -import com.intellij.openapi.components.StoragePathMacros; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.projectRoots.Sdk; +import com.intellij.openapi.roots.ModuleRootAdapter; import com.intellij.openapi.roots.ModuleRootEvent; -import com.intellij.openapi.roots.ModuleRootListener; import com.intellij.openapi.roots.ModuleRootManager; import com.intellij.util.xmlb.annotations.AbstractCollection; import com.intellij.util.xmlb.annotations.Tag; @@ -52,11 +51,7 @@ public class ProfileList implements PersistentStateComponent { } }); - getModule().getMessageBus().connect(this).subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootListener() { + getModule().getMessageBus().connect(this).subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootAdapter() { private Sdk myPrevSdk; private String[] myDependencies; - public void beforeRootsChange(final ModuleRootEvent event) { - } - public void rootsChanged(final ModuleRootEvent event) { ApplicationManager.getApplication().invokeLater(new Runnable() { @Override diff --git a/plugins/android/src/org/jetbrains/android/logcat/AndroidLogcatToolWindowFactory.java b/plugins/android/src/org/jetbrains/android/logcat/AndroidLogcatToolWindowFactory.java index 5cd77fa44745..49926ecd6171 100644 --- a/plugins/android/src/org/jetbrains/android/logcat/AndroidLogcatToolWindowFactory.java +++ b/plugins/android/src/org/jetbrains/android/logcat/AndroidLogcatToolWindowFactory.java @@ -26,8 +26,8 @@ import com.intellij.facet.ProjectFacetManager; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; +import com.intellij.openapi.roots.ModuleRootAdapter; import com.intellij.openapi.roots.ModuleRootEvent; -import com.intellij.openapi.roots.ModuleRootListener; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.wm.ToolWindow; import com.intellij.openapi.wm.ToolWindowFactory; @@ -208,7 +208,7 @@ public class AndroidLogcatToolWindowFactory implements ToolWindowFactory { } } - private static class MyAndroidPlatformListener implements ModuleRootListener { + private static class MyAndroidPlatformListener extends ModuleRootAdapter { private final Project myProject; private final AndroidLogcatToolWindowView myView; @@ -220,10 +220,6 @@ public class AndroidLogcatToolWindowFactory implements ToolWindowFactory { myPrevPlatform = getPlatform(); } - @Override - public void beforeRootsChange(ModuleRootEvent event) { - } - @Override public void rootsChanged(ModuleRootEvent event) { final ToolWindow window = ToolWindowManager.getInstance(myProject).getToolWindow(TOOL_WINDOW_ID); diff --git a/plugins/android/src/org/jetbrains/android/uipreview/AndroidLayoutPreviewToolWindowManager.java b/plugins/android/src/org/jetbrains/android/uipreview/AndroidLayoutPreviewToolWindowManager.java index e2a7c9a01916..00bfdc286ab8 100644 --- a/plugins/android/src/org/jetbrains/android/uipreview/AndroidLayoutPreviewToolWindowManager.java +++ b/plugins/android/src/org/jetbrains/android/uipreview/AndroidLayoutPreviewToolWindowManager.java @@ -21,6 +21,7 @@ import com.intellij.openapi.progress.ProgressManager; import com.intellij.openapi.project.DumbService; import com.intellij.openapi.project.Project; import com.intellij.openapi.projectRoots.Sdk; +import com.intellij.openapi.roots.ModuleRootAdapter; import com.intellij.openapi.roots.ModuleRootEvent; import com.intellij.openapi.roots.ModuleRootListener; import com.intellij.openapi.roots.ModuleRootManager; @@ -551,7 +552,7 @@ public class AndroidLayoutPreviewToolWindowManager implements ProjectComponent { } } - private class MyAndroidPlatformListener implements ModuleRootListener { + private class MyAndroidPlatformListener extends ModuleRootAdapter { private final Map myModule2Sdk = new HashMap(); private final Project myProject; @@ -560,10 +561,6 @@ public class AndroidLayoutPreviewToolWindowManager implements ProjectComponent { updateMap(); } - @Override - public void beforeRootsChange(ModuleRootEvent event) { - } - @Override public void rootsChanged(ModuleRootEvent event) { if (myToolWindowForm == null || !myToolWindowReady || myToolWindowDisposed) { diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesDetector.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesDetector.java index e24cb991d556..856714ea8ac7 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesDetector.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/sync/GradleProjectStructureChangesDetector.java @@ -6,8 +6,8 @@ import com.intellij.openapi.application.ModalityState; import com.intellij.openapi.components.AbstractProjectComponent; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.project.Project; +import com.intellij.openapi.roots.ModuleRootAdapter; import com.intellij.openapi.roots.ModuleRootEvent; -import com.intellij.openapi.roots.ModuleRootListener; import com.intellij.util.Alarm; import com.intellij.util.messages.MessageBusConnection; import com.intellij.util.ui.UIUtil; @@ -61,11 +61,7 @@ public class GradleProjectStructureChangesDetector extends AbstractProjectCompon } private void subscribeToRootChanges(@NotNull Project project) { - project.getMessageBus().connect(project).subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootListener() { - @Override - public void beforeRootsChange(ModuleRootEvent event) { - } - + project.getMessageBus().connect(project).subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootAdapter() { @Override public void rootsChanged(ModuleRootEvent event) { if (myImportCounter.get() <= 0) { diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/ui/GradleToolWindowFactory.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/ui/GradleToolWindowFactory.java index e6eccd487aa0..9895a2152102 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/ui/GradleToolWindowFactory.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/ui/GradleToolWindowFactory.java @@ -3,8 +3,8 @@ package org.jetbrains.plugins.gradle.ui; import com.intellij.ProjectTopics; import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.Project; +import com.intellij.openapi.roots.ModuleRootAdapter; import com.intellij.openapi.roots.ModuleRootEvent; -import com.intellij.openapi.roots.ModuleRootListener; import com.intellij.openapi.wm.ToolWindow; import com.intellij.openapi.wm.ToolWindowFactory; import com.intellij.ui.content.impl.ContentImpl; @@ -20,11 +20,7 @@ public class GradleToolWindowFactory implements ToolWindowFactory, DumbAware { final GradleProjectStructureChangesPanel panel = new GradleProjectStructureChangesPanel(project, context); final String syncTitle = GradleBundle.message("gradle.sync.title.tab"); toolWindow.getContentManager().addContent(new ContentImpl(panel, syncTitle, true)); - project.getMessageBus().connect(project).subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootListener() { - @Override - public void beforeRootsChange(ModuleRootEvent event) { - } - + project.getMessageBus().connect(project).subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootAdapter() { @Override public void rootsChanged(ModuleRootEvent event) { // The general idea is to change dependencies order at the UI if they are changed at the module settings. diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/ConfigureGroovyLibraryNotificationProvider.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/ConfigureGroovyLibraryNotificationProvider.java index 7c1da4df2ae3..28569da51c34 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/ConfigureGroovyLibraryNotificationProvider.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/annotator/ConfigureGroovyLibraryNotificationProvider.java @@ -23,6 +23,7 @@ import com.intellij.openapi.module.ModuleUtil; import com.intellij.openapi.progress.ProcessCanceledException; import com.intellij.openapi.project.IndexNotReadyException; import com.intellij.openapi.project.Project; +import com.intellij.openapi.roots.ModuleRootAdapter; import com.intellij.openapi.roots.ModuleRootEvent; import com.intellij.openapi.roots.ModuleRootListener; import com.intellij.openapi.roots.ModuleRootManager; @@ -49,10 +50,7 @@ public class ConfigureGroovyLibraryNotificationProvider implements EditorNotific public ConfigureGroovyLibraryNotificationProvider(Project project, final EditorNotifications notifications) { myProject = project; - project.getMessageBus().connect(project).subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootListener() { - @Override - public void beforeRootsChange(ModuleRootEvent event) {} - + project.getMessageBus().connect(project).subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootAdapter() { @Override public void rootsChanged(ModuleRootEvent event) { notifications.updateAllNotifications(); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyPsiManager.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyPsiManager.java index f012fa1a6223..5b7c998fa22e 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyPsiManager.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/GroovyPsiManager.java @@ -21,6 +21,7 @@ import com.intellij.ProjectTopics; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; +import com.intellij.openapi.roots.ModuleRootAdapter; import com.intellij.openapi.roots.ModuleRootEvent; import com.intellij.openapi.roots.ModuleRootListener; import com.intellij.openapi.util.Computable; @@ -82,10 +83,7 @@ public class GroovyPsiManager { } }); - myProject.getMessageBus().connect().subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootListener() { - public void beforeRootsChange(ModuleRootEvent event) { - } - + myProject.getMessageBus().connect().subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootAdapter() { public void rootsChanged(ModuleRootEvent event) { dropTypesCache(); myClassCache.clear(); 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 ab8d74c85344..1f91d8252631 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcModuleStructureSynchronizer.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcModuleStructureSynchronizer.java @@ -76,10 +76,7 @@ public class MvcModuleStructureSynchronizer extends AbstractProjectComponent { public void initComponent() { final MessageBusConnection connection = myProject.getMessageBus().connect(); - connection.subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootListener() { - public void beforeRootsChange(ModuleRootEvent event) { - } - + connection.subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootAdapter() { public void rootsChanged(ModuleRootEvent event) { queue(SyncAction.SyncLibrariesInPluginsModule, myProject); queue(SyncAction.UpgradeFramework, myProject); 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 254ca383b648..2b5d4c68a5d4 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 @@ -27,8 +27,8 @@ import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.module.Module; import com.intellij.openapi.project.ModuleAdapter; import com.intellij.openapi.project.Project; +import com.intellij.openapi.roots.ModuleRootAdapter; import com.intellij.openapi.roots.ModuleRootEvent; -import com.intellij.openapi.roots.ModuleRootListener; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.Key; @@ -302,11 +302,7 @@ public class MavenProjectsManagerWatcher { // onSettingsChange() will be called indirectly by pathsChanged listener on GeneralSettings object } - private class MyRootChangesListener implements ModuleRootListener { - @Override - public void beforeRootsChange(ModuleRootEvent event) { - } - + private class MyRootChangesListener extends ModuleRootAdapter { @Override public void rootsChanged(ModuleRootEvent event) { // todo is this logic necessary? diff --git a/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenFoldersImporterTest.java b/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenFoldersImporterTest.java index 30748a00478e..4dd24aa7d313 100644 --- a/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenFoldersImporterTest.java +++ b/plugins/maven/src/test/java/org/jetbrains/idea/maven/project/MavenFoldersImporterTest.java @@ -17,10 +17,7 @@ package org.jetbrains.idea.maven.project; import com.intellij.ProjectTopics; import com.intellij.openapi.application.ApplicationManager; -import com.intellij.openapi.roots.CompilerModuleExtension; -import com.intellij.openapi.roots.ModuleRootEvent; -import com.intellij.openapi.roots.ModuleRootListener; -import com.intellij.openapi.roots.ModuleRootManager; +import com.intellij.openapi.roots.*; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.idea.maven.MavenImportingTestCase; import org.jetbrains.idea.maven.importing.MavenDefaultModifiableModelsProvider; @@ -168,11 +165,7 @@ public class MavenFoldersImporterTest extends MavenImportingTestCase { "1"); final int[] count = new int[]{0}; - myProject.getMessageBus().connect().subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootListener() { - @Override - public void beforeRootsChange(ModuleRootEvent event) { - } - + myProject.getMessageBus().connect().subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootAdapter() { @Override public void rootsChanged(ModuleRootEvent event) { count[0]++; @@ -208,11 +201,7 @@ public class MavenFoldersImporterTest extends MavenImportingTestCase { importProject(); final int[] count = new int[]{0}; - myProject.getMessageBus().connect().subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootListener() { - @Override - public void beforeRootsChange(ModuleRootEvent event) { - } - + myProject.getMessageBus().connect().subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootAdapter() { @Override public void rootsChanged(ModuleRootEvent event) { count[0]++; diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/LoaderFactory.java b/plugins/ui-designer/src/com/intellij/uiDesigner/LoaderFactory.java index cf15bb7d9e15..6af3e1f4077f 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/LoaderFactory.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/LoaderFactory.java @@ -59,8 +59,7 @@ public final class LoaderFactory { myProject = project; myModule2ClassLoader = new WeakHashMap(); myConnection = myProject.getMessageBus().connect(); - myConnection.subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootListener() { - public void beforeRootsChange(final ModuleRootEvent event) {} + myConnection.subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootAdapter() { public void rootsChanged(final ModuleRootEvent event) { clearClassLoaderCache(); } diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/StringDescriptorManager.java b/plugins/ui-designer/src/com/intellij/uiDesigner/StringDescriptorManager.java index 026ab2ad48cb..b2b3741d41b4 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/StringDescriptorManager.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/StringDescriptorManager.java @@ -21,6 +21,7 @@ import com.intellij.lang.properties.PropertiesUtil; import com.intellij.lang.properties.psi.PropertiesFile; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleServiceManager; +import com.intellij.openapi.roots.ModuleRootAdapter; import com.intellij.openapi.util.Pair; import com.intellij.openapi.roots.ModuleRootListener; import com.intellij.openapi.roots.ModuleRootEvent; @@ -46,10 +47,7 @@ public class StringDescriptorManager { public StringDescriptorManager(final Module module, MessageBus bus) { myModule = module; - bus.connect().subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootListener() { - public void beforeRootsChange(final ModuleRootEvent event) { - } - + bus.connect().subscribe(ProjectTopics.PROJECT_ROOTS, new ModuleRootAdapter() { public void rootsChanged(final ModuleRootEvent event) { synchronized(myPropertiesFileCache) { myPropertiesFileCache.clear();